Topoprocessing - Adjust tests for blueprint on carbon

* Instead of pushing configuration XML, now push the .cfg
* Requires https://git.opendaylight.org/gerrit/#/c/44504/

Change-Id: Ieeadfbb43512526737c0f51e8a19081b667a70c1
Signed-off-by: Martin Dindoffer <martin.dindoffer@pantheon.tech>

diff --git a/csit/libraries/TopoprocessingKeywords.robot b/csit/libraries/TopoprocessingKeywords.robot
index 6633a76e04a7b80f79ca8e2fb4f34110ee383616..698aa9a28ff2a81de113b435885f4001f060faf9 100644 (file)
--- a/csit/libraries/TopoprocessingKeywords.robot
+++ b/csit/libraries/TopoprocessingKeywords.robot
@@ -11,7 +11,10 @@ Resource          Utils.robot
 *** Variables ***
 ${CONFIGURATION_XML}    ${CURDIR}/../suites/topoprocessing/configuration.xml
 ${OPERATIONAL_XML}    ${CURDIR}/../suites/topoprocessing/operational.xml
-${REMOTE_FILE}    ${WORKSPACE}/${BUNDLEFOLDER}/etc/opendaylight/karaf/80-topoprocessing-config.xml
+${CONFIGURATION_CFG}    ${CURDIR}/../suites/topoprocessing/configuration.cfg
+${OPERATIONAL_CFG}    ${CURDIR}/../suites/topoprocessing/operational.cfg
+${REMOTE_XML_FILE}    ${WORKSPACE}/${BUNDLEFOLDER}/etc/opendaylight/karaf/80-topoprocessing-config.xml
+${REMOTE_CFG_FILE}    ${WORKSPACE}/${BUNDLEFOLDER}/etc/org.opendaylight.topoprocessing.cfg
 ${OUTPUT_TOPO_NAME}    topo:1
 ${OVERLAY_TOPO_URL}    ${TOPOLOGY_URL}/${OUTPUT_TOPO_NAME}
 
@@ -62,7 +65,8 @@ Setup Environment
     Log    ---- Setup Environment ----
     Open Connection    ${ODL_SYSTEM_IP}
     Flexible Controller Login
-    Put File    ${CONFIGURATION_XML}    ${REMOTE_FILE}
+    Run Keyword If    '${ODL_STREAM}' == 'carbon'    Put File    ${CONFIGURATION_CFG}    ${REMOTE_CFG_FILE}
+    Run Keyword Unless    '${ODL_STREAM}' == 'carbon'    Put File    ${CONFIGURATION_XML}    ${REMOTE_XML_FILE}
     Close Connection
     Wait Until Keyword Succeeds    2x    2s    Issue Command On Karaf Console    log:set DEBUG org.opendaylight.topoprocessing
     Install a Feature    odl-restconf-noauth    timeout=30
@@ -99,7 +103,8 @@ Clean Environment
     Log    ---- Clean Environment ----
     Open Connection    ${ODL_SYSTEM_IP}
     Flexible Controller Login
-    Put File    ${OPERATIONAL_XML}    ${REMOTE_FILE}
+    Run Keyword If    '${ODL_STREAM}' == 'carbon'    Put File    ${OPERATIONAL_CFG}    ${REMOTE_CFG_FILE}
+    Run Keyword Unless    '${ODL_STREAM}' == 'carbon'    Put File    ${OPERATIONAL_XML}    ${REMOTE_XML_FILE}
     Close Connection
     Delete All Sessions
 

diff --git a/csit/suites/topoprocessing/configuration.cfg b/csit/suites/topoprocessing/configuration.cfg
new file mode 100644 (file)
index 0000000..ca3fac4
--- /dev/null
+++ b/csit/suites/topoprocessing/configuration.cfg
@@ -0,0 +1 @@
+data-store-type=CONFIGURATION

diff --git a/csit/suites/topoprocessing/operational.cfg b/csit/suites/topoprocessing/operational.cfg
new file mode 100644 (file)
index 0000000..abba480
--- /dev/null
+++ b/csit/suites/topoprocessing/operational.cfg
@@ -0,0 +1 @@
+data-store-type=OPERATIONAL
\ No newline at end of file