Remove Lithium only resources from SXP

Removes lithium test plans, configuration files and checks in scripts.

Change-Id: Ia12a82259f5bed2f0aea154f22bea8a0652fe57d
Signed-off-by: Martin Mihálek <mamihale@cisco.com>

diff --git a/csit/suites/sxp/basic/22-sxp-controller-one-node-lithium.xml b/csit/suites/sxp/basic/22-sxp-controller-one-node-lithium.xml
deleted file mode 100644 (file)
index c5bf2a1..0000000
--- a/csit/suites/sxp/basic/22-sxp-controller-one-node-lithium.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<snapshot>
-    <required-capabilities>
-        <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&amp;revision=2013-10-28</capability>
-        <capability>urn:opendaylight:params:xml:ns:yang:controller:sxp:controller:conf?module=sxp-controller-conf&amp;revision=2014-10-02</capability>
-    </required-capabilities>
-    <configuration>
-        <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-            <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-                <module>
-                    <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:sxp:controller:conf">
-                        binding:sxp-controller
-                    </type>
-                    <name>sxp-controller</name>
-
-                    <binding-broker>
-                        <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">
-                            binding:binding-broker-osgi-registry
-                        </type>
-                        <name>binding-osgi-broker</name>
-                    </binding-broker>
-
-                    <rpc-registry>
-                        <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">
-                            binding:binding-rpc-registry
-                        </type>
-                        <name>binding-rpc-broker</name>
-                    </rpc-registry>
-
-                    <data-broker>
-                        <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">
-                            binding:binding-async-data-broker
-                        </type>
-                        <name>binding-data-broker</name>
-                    </data-broker>
-
-                    <notification-service>
-                        <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">
-                            binding:binding-notification-service
-                        </type>
-                        <name>binding-notification-broker</name>
-                    </notification-service>
-
-                    <sxp-controller>
-                        <sxp-node>
-                            <enabled>true</enabled>
-                            <node-id>127.0.0.1</node-id>
-                            <source-ip>127.0.0.1</source-ip>
-                            <tcp-port>64999</tcp-port>
-                            <version>version4</version>
-                            <security>
-                                <password>kavabonga</password>
-                            </security>
-                            <mapping-expanded>5</mapping-expanded>
-                            <description>ODL SXP Controller</description>
-                            <master-database></master-database>
-                            <timers>
-                                <retry-open-time>1</retry-open-time>
-                                <hold-time-min-acceptable>120</hold-time-min-acceptable>
-                                <keep-alive-time>30</keep-alive-time>
-                                <hold-time>90</hold-time>
-                                <hold-time-min>90</hold-time-min>
-                                <hold-time-max>180</hold-time-max>
-                            </timers>
-                        </sxp-node>
-                        <sxp-node>
-                            <enabled>true</enabled>
-                            <node-id>127.0.0.2</node-id>
-                            <source-ip>127.0.0.2</source-ip>
-                            <tcp-port>64999</tcp-port>
-                            <version>version4</version>
-                            <security>
-                                <password>kavabonga</password>
-                            </security>
-                            <mapping-expanded>5</mapping-expanded>
-                            <description>ODL SXP Controller</description>
-                            <master-database></master-database>
-                            <timers>
-                                <retry-open-time>1</retry-open-time>
-                                <hold-time-min-acceptable>120</hold-time-min-acceptable>
-                                <keep-alive-time>30</keep-alive-time>
-                                <hold-time>90</hold-time>
-                                <hold-time-min>90</hold-time-min>
-                                <hold-time-max>180</hold-time-max>
-                            </timers>
-                        </sxp-node>
-                        <sxp-node>
-                            <enabled>true</enabled>
-                            <node-id>127.0.0.3</node-id>
-                            <source-ip>127.0.0.3</source-ip>
-                            <tcp-port>64999</tcp-port>
-                            <version>version4</version>
-                            <security>
-                                <password>kavabonga</password>
-                            </security>
-                            <mapping-expanded>5</mapping-expanded>
-                            <description>ODL SXP Controller</description>
-                            <master-database></master-database>
-                            <timers>
-                                <retry-open-time>1</retry-open-time>
-                                <hold-time-min-acceptable>120</hold-time-min-acceptable>
-                                <keep-alive-time>30</keep-alive-time>
-                                <hold-time>90</hold-time>
-                                <hold-time-min>90</hold-time-min>
-                                <hold-time-max>180</hold-time-max>
-                            </timers>
-                        </sxp-node>
-                    </sxp-controller>
-                </module>
-            </modules>
-        </data>
-    </configuration>
-</snapshot>

diff --git a/csit/suites/sxp/scripts/basic_node_setup.sh b/csit/suites/sxp/scripts/basic_node_setup.sh
index d4976dc9b6dd665b050fea903f9b18565b5a03b5..84606d799eabd8d8774ff501c0a2ac81c84ad142 100644 (file)
--- a/csit/suites/sxp/scripts/basic_node_setup.sh
+++ b/csit/suites/sxp/scripts/basic_node_setup.sh
@@ -3,8 +3,6 @@
 echo "Setup config to ${ODL_SYSTEM_IP}"
 ssh ${ODL_SYSTEM_IP} "mkdir -p /tmp/${BUNDLEFOLDER}/etc/opendaylight/karaf/"
 
-if [ "${BRANCH#*/}" == "lithium" ]; then
-    scp ${WORKSPACE}/test/csit/suites/sxp/basic/22-sxp-controller-one-node-lithium.xml ${ODL_SYSTEM_IP}:/tmp/${BUNDLEFOLDER}/etc/opendaylight/karaf/22-sxp-controller-one-node.xml
-elif [ "${BRANCH#*/}" == "beryllium" ]; then
+if [ "${BRANCH#*/}" == "beryllium" ]; then
     scp ${WORKSPACE}/test/csit/suites/sxp/basic/22-sxp-controller-one-node-beryllium.xml ${ODL_SYSTEM_IP}:/tmp/${BUNDLEFOLDER}/etc/opendaylight/karaf/22-sxp-controller-one-node.xml
 fi

diff --git a/csit/suites/sxp/scripts/topology_node_setup.sh b/csit/suites/sxp/scripts/topology_node_setup.sh
index 5219b74777814ede2711e21930a7764aed39f63d..d29f7227823c8203801d076d8d751b83e692f314 100644 (file)
--- a/csit/suites/sxp/scripts/topology_node_setup.sh
+++ b/csit/suites/sxp/scripts/topology_node_setup.sh
@@ -3,8 +3,6 @@
 echo "Setup config to ${ODL_SYSTEM_IP}"
 ssh ${ODL_SYSTEM_IP} "mkdir -p /tmp/${BUNDLEFOLDER}/etc/opendaylight/karaf/"
 
-if [ "${BRANCH#*/}" == "lithium" ]; then
-    scp ${WORKSPACE}/test/csit/suites/sxp/topology/22-sxp-controller-one-node-lithium.xml ${ODL_SYSTEM_IP}:/tmp/${BUNDLEFOLDER}/etc/opendaylight/karaf/22-sxp-controller-one-node.xml
-elif [ "${BRANCH#*/}" == "beryllium" ]; then
+if [ "${BRANCH#*/}" == "beryllium" ]; then
     scp ${WORKSPACE}/test/csit/suites/sxp/topology/22-sxp-controller-one-node-beryllium.xml ${ODL_SYSTEM_IP}:/tmp/${BUNDLEFOLDER}/etc/opendaylight/karaf/22-sxp-controller-one-node.xml
 fi

diff --git a/csit/suites/sxp/topology/22-sxp-controller-one-node-lithium.xml b/csit/suites/sxp/topology/22-sxp-controller-one-node-lithium.xml
deleted file mode 100644 (file)
index 10737f3..0000000
--- a/csit/suites/sxp/topology/22-sxp-controller-one-node-lithium.xml
+++ /dev/null
@@ -1,701 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<snapshot>
-    <required-capabilities>
-        <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&amp;revision=2013-10-28</capability>
-        <capability>urn:opendaylight:params:xml:ns:yang:controller:sxp:controller:conf?module=sxp-controller-conf&amp;revision=2014-10-02</capability>
-    </required-capabilities>
-    <configuration>
-        <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-            <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-                <module>
-                    <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:sxp:controller:conf">
-                        binding:sxp-controller
-                    </type>
-                    <name>sxp-controller</name>
-
-                    <binding-broker>
-                        <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">
-                            binding:binding-broker-osgi-registry
-                        </type>
-                        <name>binding-osgi-broker</name>
-                    </binding-broker>
-
-                    <rpc-registry>
-                        <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">
-                            binding:binding-rpc-registry
-                        </type>
-                        <name>binding-rpc-broker</name>
-                    </rpc-registry>
-
-                    <data-broker>
-                        <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">
-                            binding:binding-async-data-broker
-                        </type>
-                        <name>binding-data-broker</name>
-                    </data-broker>
-
-                    <notification-service>
-                        <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">
-                            binding:binding-notification-service
-                        </type>
-                        <name>binding-notification-broker</name>
-                    </notification-service>
-
-                    <sxp-controller>
-                        <sxp-node>
-                            <enabled>true</enabled>
-                            <node-id>127.0.0.1</node-id>
-                            <source-ip>127.0.0.1</source-ip>
-                            <tcp-port>64999</tcp-port>
-                            <version>version4</version>
-                            <security>
-                                <password>kavabonga</password>
-                            </security>
-                            <mapping-expanded>5</mapping-expanded>
-                            <description>ODL SXP Controller</description>
-                            <master-database></master-database>
-                            <timers>
-                                <retry-open-time>1</retry-open-time>
-                                <hold-time-min-acceptable>120</hold-time-min-acceptable>
-                                <keep-alive-time>30</keep-alive-time>
-                                <hold-time>90</hold-time>
-                                <hold-time-min>90</hold-time-min>
-                                <hold-time-max>180</hold-time-max>
-                            </timers>
-                        </sxp-node>
-                        <sxp-node>
-                            <enabled>true</enabled>
-                            <node-id>127.0.0.2</node-id>
-                            <source-ip>127.0.0.2</source-ip>
-                            <tcp-port>64999</tcp-port>
-                            <version>version4</version>
-                            <security>
-                                <password>kavabonga</password>
-                            </security>
-                            <mapping-expanded>5</mapping-expanded>
-                            <description>ODL SXP Controller</description>
-                            <master-database></master-database>
-                            <timers>
-                                <retry-open-time>1</retry-open-time>
-                                <hold-time-min-acceptable>120</hold-time-min-acceptable>
-                                <keep-alive-time>30</keep-alive-time>
-                                <hold-time>90</hold-time>
-                                <hold-time-min>90</hold-time-min>
-                                <hold-time-max>180</hold-time-max>
-                            </timers>
-                        </sxp-node>
-                        <sxp-node>
-                            <enabled>true</enabled>
-                            <node-id>127.0.0.3</node-id>
-                            <source-ip>127.0.0.3</source-ip>
-                            <tcp-port>64999</tcp-port>
-                            <version>version4</version>
-                            <security>
-                                <password>kavabonga</password>
-                            </security>
-                            <mapping-expanded>5</mapping-expanded>
-                            <description>ODL SXP Controller</description>
-                            <master-database></master-database>
-                            <timers>
-                                <retry-open-time>1</retry-open-time>
-                                <hold-time-min-acceptable>120</hold-time-min-acceptable>
-                                <keep-alive-time>30</keep-alive-time>
-                                <hold-time>90</hold-time>
-                                <hold-time-min>90</hold-time-min>
-                                <hold-time-max>180</hold-time-max>
-                            </timers>
-                        </sxp-node>
-                        <sxp-node>
-                            <enabled>true</enabled>
-                            <node-id>127.0.0.4</node-id>
-                            <source-ip>127.0.0.4</source-ip>
-                            <tcp-port>64999</tcp-port>
-                            <version>version4</version>
-                            <security>
-                                <password>kavabonga</password>
-                            </security>
-                            <mapping-expanded>5</mapping-expanded>
-                            <description>ODL SXP Controller</description>
-                            <master-database></master-database>
-                            <timers>
-                                <retry-open-time>1</retry-open-time>
-                                <hold-time-min-acceptable>120</hold-time-min-acceptable>
-                                <keep-alive-time>30</keep-alive-time>
-                                <hold-time>90</hold-time>
-                                <hold-time-min>90</hold-time-min>
-                                <hold-time-max>180</hold-time-max>
-                            </timers>
-                        </sxp-node>
-                        <sxp-node>
-                            <enabled>true</enabled>
-                            <node-id>127.0.0.5</node-id>
-                            <source-ip>127.0.0.5</source-ip>
-                            <tcp-port>64999</tcp-port>
-                            <version>version4</version>
-                            <security>
-                                <password>kavabonga</password>
-                            </security>
-                            <mapping-expanded>5</mapping-expanded>
-                            <description>ODL SXP Controller</description>
-                            <master-database></master-database>
-                            <timers>
-                                <retry-open-time>1</retry-open-time>
-                                <hold-time-min-acceptable>120</hold-time-min-acceptable>
-                                <keep-alive-time>30</keep-alive-time>
-                                <hold-time>90</hold-time>
-                                <hold-time-min>90</hold-time-min>
-                                <hold-time-max>180</hold-time-max>
-                            </timers>
-                        </sxp-node>
-                        <sxp-node>
-                            <enabled>true</enabled>
-                            <node-id>127.0.0.6</node-id>
-                            <source-ip>127.0.0.6</source-ip>
-                            <tcp-port>64999</tcp-port>
-                            <version>version4</version>
-                            <security>
-                                <password>kavabonga</password>
-                            </security>
-                            <mapping-expanded>5</mapping-expanded>
-                            <description>ODL SXP Controller</description>
-                            <master-database></master-database>
-                            <timers>
-                                <retry-open-time>1</retry-open-time>
-                                <hold-time-min-acceptable>120</hold-time-min-acceptable>
-                                <keep-alive-time>30</keep-alive-time>
-                                <hold-time>90</hold-time>
-                                <hold-time-min>90</hold-time-min>
-                                <hold-time-max>180</hold-time-max>
-                            </timers>
-                        </sxp-node>
-                        <sxp-node>
-                            <enabled>true</enabled>
-                            <node-id>127.0.0.7</node-id>
-                            <source-ip>127.0.0.7</source-ip>
-                            <tcp-port>64999</tcp-port>
-                            <version>version4</version>
-                            <security>
-                                <password>kavabonga</password>
-                            </security>
-                            <mapping-expanded>5</mapping-expanded>
-                            <description>ODL SXP Controller</description>
-                            <master-database></master-database>
-                            <timers>
-                                <retry-open-time>1</retry-open-time>
-                                <hold-time-min-acceptable>120</hold-time-min-acceptable>
-                                <keep-alive-time>30</keep-alive-time>
-                                <hold-time>90</hold-time>
-                                <hold-time-min>90</hold-time-min>
-                                <hold-time-max>180</hold-time-max>
-                            </timers>
-                        </sxp-node>
-                        <sxp-node>
-                            <enabled>true</enabled>
-                            <node-id>127.0.0.8</node-id>
-                            <source-ip>127.0.0.8</source-ip>
-                            <tcp-port>64999</tcp-port>
-                            <version>version4</version>
-                            <security>
-                                <password>kavabonga</password>
-                            </security>
-                            <mapping-expanded>5</mapping-expanded>
-                            <description>ODL SXP Controller</description>
-                            <master-database></master-database>
-                            <timers>
-                                <retry-open-time>1</retry-open-time>
-                                <hold-time-min-acceptable>120</hold-time-min-acceptable>
-                                <keep-alive-time>30</keep-alive-time>
-                                <hold-time>90</hold-time>
-                                <hold-time-min>90</hold-time-min>
-                                <hold-time-max>180</hold-time-max>
-                            </timers>
-                        </sxp-node>
-                        <sxp-node>
-                            <enabled>true</enabled>
-                            <node-id>127.0.0.9</node-id>
-                            <source-ip>127.0.0.9</source-ip>
-                            <tcp-port>64999</tcp-port>
-                            <version>version4</version>
-                            <security>
-                                <password>kavabonga</password>
-                            </security>
-                            <mapping-expanded>5</mapping-expanded>
-                            <description>ODL SXP Controller</description>
-                            <master-database></master-database>
-                            <timers>
-                                <retry-open-time>1</retry-open-time>
-                                <hold-time-min-acceptable>120</hold-time-min-acceptable>
-                                <keep-alive-time>30</keep-alive-time>
-                                <hold-time>90</hold-time>
-                                <hold-time-min>90</hold-time-min>
-                                <hold-time-max>180</hold-time-max>
-                            </timers>
-                        </sxp-node>
-                        <sxp-node>
-                            <enabled>true</enabled>
-                            <node-id>127.0.0.10</node-id>
-                            <source-ip>127.0.0.10</source-ip>
-                            <tcp-port>64999</tcp-port>
-                            <version>version4</version>
-                            <security>
-                                <password>kavabonga</password>
-                            </security>
-                            <mapping-expanded>5</mapping-expanded>
-                            <description>ODL SXP Controller</description>
-                            <master-database></master-database>
-                            <timers>
-                                <retry-open-time>1</retry-open-time>
-                                <hold-time-min-acceptable>120</hold-time-min-acceptable>
-                                <keep-alive-time>30</keep-alive-time>
-                                <hold-time>90</hold-time>
-                                <hold-time-min>90</hold-time-min>
-                                <hold-time-max>180</hold-time-max>
-                            </timers>
-                        </sxp-node>
-                        <sxp-node>
-                            <enabled>true</enabled>
-                            <node-id>127.0.0.11</node-id>
-                            <source-ip>127.0.0.11</source-ip>
-                            <tcp-port>64999</tcp-port>
-                            <version>version4</version>
-                            <security>
-                                <password>kavabonga</password>
-                            </security>
-                            <mapping-expanded>5</mapping-expanded>
-                            <description>ODL SXP Controller</description>
-                            <master-database></master-database>
-                            <timers>
-                                <retry-open-time>1</retry-open-time>
-                                <hold-time-min-acceptable>120</hold-time-min-acceptable>
-                                <keep-alive-time>30</keep-alive-time>
-                                <hold-time>90</hold-time>
-                                <hold-time-min>90</hold-time-min>
-                                <hold-time-max>180</hold-time-max>
-                            </timers>
-                        </sxp-node>
-                        <sxp-node>
-                            <enabled>true</enabled>
-                            <node-id>127.0.0.12</node-id>
-                            <source-ip>127.0.0.12</source-ip>
-                            <tcp-port>64999</tcp-port>
-                            <version>version4</version>
-                            <security>
-                                <password>kavabonga</password>
-                            </security>
-                            <mapping-expanded>5</mapping-expanded>
-                            <description>ODL SXP Controller</description>
-                            <master-database></master-database>
-                            <timers>
-                                <retry-open-time>1</retry-open-time>
-                                <hold-time-min-acceptable>120</hold-time-min-acceptable>
-                                <keep-alive-time>30</keep-alive-time>
-                                <hold-time>90</hold-time>
-                                <hold-time-min>90</hold-time-min>
-                                <hold-time-max>180</hold-time-max>
-                            </timers>
-                        </sxp-node>
-                        <sxp-node>
-                            <enabled>true</enabled>
-                            <node-id>127.0.0.13</node-id>
-                            <source-ip>127.0.0.13</source-ip>
-                            <tcp-port>64999</tcp-port>
-                            <version>version4</version>
-                            <security>
-                                <password>kavabonga</password>
-                            </security>
-                            <mapping-expanded>5</mapping-expanded>
-                            <description>ODL SXP Controller</description>
-                            <master-database></master-database>
-                            <timers>
-                                <retry-open-time>1</retry-open-time>
-                                <hold-time-min-acceptable>120</hold-time-min-acceptable>
-                                <keep-alive-time>30</keep-alive-time>
-                                <hold-time>90</hold-time>
-                                <hold-time-min>90</hold-time-min>
-                                <hold-time-max>180</hold-time-max>
-                            </timers>
-                        </sxp-node>
-                        <sxp-node>
-                            <enabled>true</enabled>
-                            <node-id>127.0.0.14</node-id>
-                            <source-ip>127.0.0.14</source-ip>
-                            <tcp-port>64999</tcp-port>
-                            <version>version4</version>
-                            <security>
-                                <password>kavabonga</password>
-                            </security>
-                            <mapping-expanded>5</mapping-expanded>
-                            <description>ODL SXP Controller</description>
-                            <master-database></master-database>
-                            <timers>
-                                <retry-open-time>1</retry-open-time>
-                                <hold-time-min-acceptable>120</hold-time-min-acceptable>
-                                <keep-alive-time>30</keep-alive-time>
-                                <hold-time>90</hold-time>
-                                <hold-time-min>90</hold-time-min>
-                                <hold-time-max>180</hold-time-max>
-                            </timers>
-                        </sxp-node>
-                        <sxp-node>
-                            <enabled>true</enabled>
-                            <node-id>127.0.0.15</node-id>
-                            <source-ip>127.0.0.15</source-ip>
-                            <tcp-port>64999</tcp-port>
-                            <version>version4</version>
-                            <security>
-                                <password>kavabonga</password>
-                            </security>
-                            <mapping-expanded>5</mapping-expanded>
-                            <description>ODL SXP Controller</description>
-                            <master-database></master-database>
-                            <timers>
-                                <retry-open-time>1</retry-open-time>
-                                <hold-time-min-acceptable>120</hold-time-min-acceptable>
-                                <keep-alive-time>30</keep-alive-time>
-                                <hold-time>90</hold-time>
-                                <hold-time-min>90</hold-time-min>
-                                <hold-time-max>180</hold-time-max>
-                            </timers>
-                        </sxp-node>
-                        <sxp-node>
-                            <enabled>true</enabled>
-                            <node-id>127.0.0.16</node-id>
-                            <source-ip>127.0.0.16</source-ip>
-                            <tcp-port>64999</tcp-port>
-                            <version>version4</version>
-                            <security>
-                                <password>kavabonga</password>
-                            </security>
-                            <mapping-expanded>5</mapping-expanded>
-                            <description>ODL SXP Controller</description>
-                            <master-database></master-database>
-                            <timers>
-                                <retry-open-time>1</retry-open-time>
-                                <hold-time-min-acceptable>120</hold-time-min-acceptable>
-                                <keep-alive-time>30</keep-alive-time>
-                                <hold-time>90</hold-time>
-                                <hold-time-min>90</hold-time-min>
-                                <hold-time-max>180</hold-time-max>
-                            </timers>
-                        </sxp-node>
-                        <sxp-node>
-                            <enabled>true</enabled>
-                            <node-id>127.0.0.17</node-id>
-                            <source-ip>127.0.0.17</source-ip>
-                            <tcp-port>64999</tcp-port>
-                            <version>version4</version>
-                            <security>
-                                <password>kavabonga</password>
-                            </security>
-                            <mapping-expanded>5</mapping-expanded>
-                            <description>ODL SXP Controller</description>
-                            <master-database></master-database>
-                            <timers>
-                                <retry-open-time>1</retry-open-time>
-                                <hold-time-min-acceptable>120</hold-time-min-acceptable>
-                                <keep-alive-time>30</keep-alive-time>
-                                <hold-time>90</hold-time>
-                                <hold-time-min>90</hold-time-min>
-                                <hold-time-max>180</hold-time-max>
-                            </timers>
-                        </sxp-node>
-                        <sxp-node>
-                            <enabled>true</enabled>
-                            <node-id>127.0.0.18</node-id>
-                            <source-ip>127.0.0.18</source-ip>
-                            <tcp-port>64999</tcp-port>
-                            <version>version4</version>
-                            <security>
-                                <password>kavabonga</password>
-                            </security>
-                            <mapping-expanded>5</mapping-expanded>
-                            <description>ODL SXP Controller</description>
-                            <master-database></master-database>
-                            <timers>
-                                <retry-open-time>1</retry-open-time>
-                                <hold-time-min-acceptable>120</hold-time-min-acceptable>
-                                <keep-alive-time>30</keep-alive-time>
-                                <hold-time>90</hold-time>
-                                <hold-time-min>90</hold-time-min>
-                                <hold-time-max>180</hold-time-max>
-                            </timers>
-                        </sxp-node>
-                        <sxp-node>
-                            <enabled>true</enabled>
-                            <node-id>127.0.0.19</node-id>
-                            <source-ip>127.0.0.19</source-ip>
-                            <tcp-port>64999</tcp-port>
-                            <version>version4</version>
-                            <security>
-                                <password>kavabonga</password>
-                            </security>
-                            <mapping-expanded>5</mapping-expanded>
-                            <description>ODL SXP Controller</description>
-                            <master-database></master-database>
-                            <timers>
-                                <retry-open-time>1</retry-open-time>
-                                <hold-time-min-acceptable>120</hold-time-min-acceptable>
-                                <keep-alive-time>30</keep-alive-time>
-                                <hold-time>90</hold-time>
-                                <hold-time-min>90</hold-time-min>
-                                <hold-time-max>180</hold-time-max>
-                            </timers>
-                        </sxp-node>
-                        <sxp-node>
-                            <enabled>true</enabled>
-                            <node-id>127.0.0.20</node-id>
-                            <source-ip>127.0.0.20</source-ip>
-                            <tcp-port>64999</tcp-port>
-                            <version>version4</version>
-                            <security>
-                                <password>kavabonga</password>
-                            </security>
-                            <mapping-expanded>5</mapping-expanded>
-                            <description>ODL SXP Controller</description>
-                            <master-database></master-database>
-                            <timers>
-                                <retry-open-time>1</retry-open-time>
-                                <hold-time-min-acceptable>120</hold-time-min-acceptable>
-                                <keep-alive-time>30</keep-alive-time>
-                                <hold-time>90</hold-time>
-                                <hold-time-min>90</hold-time-min>
-                                <hold-time-max>180</hold-time-max>
-                            </timers>
-                        </sxp-node>
-                        <sxp-node>
-                            <enabled>true</enabled>
-                            <node-id>127.0.0.21</node-id>
-                            <source-ip>127.0.0.21</source-ip>
-                            <tcp-port>64999</tcp-port>
-                            <version>version4</version>
-                            <security>
-                                <password>kavabonga</password>
-                            </security>
-                            <mapping-expanded>5</mapping-expanded>
-                            <description>ODL SXP Controller</description>
-                            <master-database></master-database>
-                            <timers>
-                                <retry-open-time>1</retry-open-time>
-                                <hold-time-min-acceptable>120</hold-time-min-acceptable>
-                                <keep-alive-time>30</keep-alive-time>
-                                <hold-time>90</hold-time>
-                                <hold-time-min>90</hold-time-min>
-                                <hold-time-max>180</hold-time-max>
-                            </timers>
-                        </sxp-node>
-                        <sxp-node>
-                            <enabled>true</enabled>
-                            <node-id>127.0.0.22</node-id>
-                            <source-ip>127.0.0.22</source-ip>
-                            <tcp-port>64999</tcp-port>
-                            <version>version4</version>
-                            <security>
-                                <password>kavabonga</password>
-                            </security>
-                            <mapping-expanded>5</mapping-expanded>
-                            <description>ODL SXP Controller</description>
-                            <master-database></master-database>
-                            <timers>
-                                <retry-open-time>1</retry-open-time>
-                                <hold-time-min-acceptable>120</hold-time-min-acceptable>
-                                <keep-alive-time>30</keep-alive-time>
-                                <hold-time>90</hold-time>
-                                <hold-time-min>90</hold-time-min>
-                                <hold-time-max>180</hold-time-max>
-                            </timers>
-                        </sxp-node>
-                        <sxp-node>
-                            <enabled>true</enabled>
-                            <node-id>127.0.0.23</node-id>
-                            <source-ip>127.0.0.23</source-ip>
-                            <tcp-port>64999</tcp-port>
-                            <version>version4</version>
-                            <security>
-                                <password>kavabonga</password>
-                            </security>
-                            <mapping-expanded>5</mapping-expanded>
-                            <description>ODL SXP Controller</description>
-                            <master-database></master-database>
-                            <timers>
-                                <retry-open-time>1</retry-open-time>
-                                <hold-time-min-acceptable>120</hold-time-min-acceptable>
-                                <keep-alive-time>30</keep-alive-time>
-                                <hold-time>90</hold-time>
-                                <hold-time-min>90</hold-time-min>
-                                <hold-time-max>180</hold-time-max>
-                            </timers>
-                        </sxp-node>
-                        <sxp-node>
-                            <enabled>true</enabled>
-                            <node-id>127.0.0.24</node-id>
-                            <source-ip>127.0.0.24</source-ip>
-                            <tcp-port>64999</tcp-port>
-                            <version>version4</version>
-                            <security>
-                                <password>kavabonga</password>
-                            </security>
-                            <mapping-expanded>5</mapping-expanded>
-                            <description>ODL SXP Controller</description>
-                            <master-database></master-database>
-                            <timers>
-                                <retry-open-time>1</retry-open-time>
-                                <hold-time-min-acceptable>120</hold-time-min-acceptable>
-                                <keep-alive-time>30</keep-alive-time>
-                                <hold-time>90</hold-time>
-                                <hold-time-min>90</hold-time-min>
-                                <hold-time-max>180</hold-time-max>
-                            </timers>
-                        </sxp-node>
-                        <sxp-node>
-                            <enabled>true</enabled>
-                            <node-id>127.0.0.25</node-id>
-                            <source-ip>127.0.0.25</source-ip>
-                            <tcp-port>64999</tcp-port>
-                            <version>version4</version>
-                            <security>
-                                <password>kavabonga</password>
-                            </security>
-                            <mapping-expanded>5</mapping-expanded>
-                            <description>ODL SXP Controller</description>
-                            <master-database></master-database>
-                            <timers>
-                                <retry-open-time>1</retry-open-time>
-                                <hold-time-min-acceptable>120</hold-time-min-acceptable>
-                                <keep-alive-time>30</keep-alive-time>
-                                <hold-time>90</hold-time>
-                                <hold-time-min>90</hold-time-min>
-                                <hold-time-max>180</hold-time-max>
-                            </timers>
-                        </sxp-node>
-                        <sxp-node>
-                            <enabled>true</enabled>
-                            <node-id>127.0.0.26</node-id>
-                            <source-ip>127.0.0.26</source-ip>
-                            <tcp-port>64999</tcp-port>
-                            <version>version4</version>
-                            <security>
-                                <password>kavabonga</password>
-                            </security>
-                            <mapping-expanded>5</mapping-expanded>
-                            <description>ODL SXP Controller</description>
-                            <master-database></master-database>
-                            <timers>
-                                <retry-open-time>1</retry-open-time>
-                                <hold-time-min-acceptable>120</hold-time-min-acceptable>
-                                <keep-alive-time>30</keep-alive-time>
-                                <hold-time>90</hold-time>
-                                <hold-time-min>90</hold-time-min>
-                                <hold-time-max>180</hold-time-max>
-                            </timers>
-                        </sxp-node>
-                        <sxp-node>
-                            <enabled>true</enabled>
-                            <node-id>127.0.0.27</node-id>
-                            <source-ip>127.0.0.27</source-ip>
-                            <tcp-port>64999</tcp-port>
-                            <version>version4</version>
-                            <security>
-                                <password>kavabonga</password>
-                            </security>
-                            <mapping-expanded>5</mapping-expanded>
-                            <description>ODL SXP Controller</description>
-                            <master-database></master-database>
-                            <timers>
-                                <retry-open-time>1</retry-open-time>
-                                <hold-time-min-acceptable>120</hold-time-min-acceptable>
-                                <keep-alive-time>30</keep-alive-time>
-                                <hold-time>90</hold-time>
-                                <hold-time-min>90</hold-time-min>
-                                <hold-time-max>180</hold-time-max>
-                            </timers>
-                        </sxp-node>
-                        <sxp-node>
-                            <enabled>true</enabled>
-                            <node-id>127.0.0.28</node-id>
-                            <source-ip>127.0.0.28</source-ip>
-                            <tcp-port>64999</tcp-port>
-                            <version>version4</version>
-                            <security>
-                                <password>kavabonga</password>
-                            </security>
-                            <mapping-expanded>5</mapping-expanded>
-                            <description>ODL SXP Controller</description>
-                            <master-database></master-database>
-                            <timers>
-                                <retry-open-time>1</retry-open-time>
-                                <hold-time-min-acceptable>120</hold-time-min-acceptable>
-                                <keep-alive-time>30</keep-alive-time>
-                                <hold-time>90</hold-time>
-                                <hold-time-min>90</hold-time-min>
-                                <hold-time-max>180</hold-time-max>
-                            </timers>
-                        </sxp-node>
-                        <sxp-node>
-                            <enabled>true</enabled>
-                            <node-id>127.0.0.29</node-id>
-                            <source-ip>127.0.0.29</source-ip>
-                            <tcp-port>64999</tcp-port>
-                            <version>version4</version>
-                            <security>
-                                <password>kavabonga</password>
-                            </security>
-                            <mapping-expanded>5</mapping-expanded>
-                            <description>ODL SXP Controller</description>
-                            <master-database></master-database>
-                            <timers>
-                                <retry-open-time>1</retry-open-time>
-                                <hold-time-min-acceptable>120</hold-time-min-acceptable>
-                                <keep-alive-time>30</keep-alive-time>
-                                <hold-time>90</hold-time>
-                                <hold-time-min>90</hold-time-min>
-                                <hold-time-max>180</hold-time-max>
-                            </timers>
-                        </sxp-node>
-                        <sxp-node>
-                            <enabled>true</enabled>
-                            <node-id>127.0.0.30</node-id>
-                            <source-ip>127.0.0.30</source-ip>
-                            <tcp-port>64999</tcp-port>
-                            <version>version4</version>
-                            <security>
-                                <password>kavabonga</password>
-                            </security>
-                            <mapping-expanded>5</mapping-expanded>
-                            <description>ODL SXP Controller</description>
-                            <master-database></master-database>
-                            <timers>
-                                <retry-open-time>1</retry-open-time>
-                                <hold-time-min-acceptable>120</hold-time-min-acceptable>
-                                <keep-alive-time>30</keep-alive-time>
-                                <hold-time>90</hold-time>
-                                <hold-time-min>90</hold-time-min>
-                                <hold-time-max>180</hold-time-max>
-                            </timers>
-                        </sxp-node>
-                        <sxp-node>
-                            <enabled>true</enabled>
-                            <node-id>127.0.0.31</node-id>
-                            <source-ip>127.0.0.31</source-ip>
-                            <tcp-port>64999</tcp-port>
-                            <version>version4</version>
-                            <security>
-                                <password>kavabonga</password>
-                            </security>
-                            <mapping-expanded>5</mapping-expanded>
-                            <description>ODL SXP Controller</description>
-                            <master-database></master-database>
-                            <timers>
-                                <retry-open-time>1</retry-open-time>
-                                <hold-time-min-acceptable>120</hold-time-min-acceptable>
-                                <keep-alive-time>30</keep-alive-time>
-                                <hold-time>90</hold-time>
-                                <hold-time-min>90</hold-time-min>
-                                <hold-time-max>180</hold-time-max>
-                            </timers>
-                        </sxp-node>
-                    </sxp-controller>
-                </module>
-            </modules>
-        </data>
-    </configuration>
-</snapshot>

diff --git a/csit/testplans/sxp-basic-stable-lithium.txt b/csit/testplans/sxp-basic-stable-lithium.txt
deleted file mode 100644 (file)
index 6f724cd..0000000
--- a/csit/testplans/sxp-basic-stable-lithium.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-# Place the suites in run order:
-integration/test/csit/suites/sxp/basic/010_Restconf_OK.robot
-integration/test/csit/suites/sxp/basic/020_Restconf_CRUD.robot
-integration/test/csit/suites/sxp/basic/030_Connectivity.robot
\ No newline at end of file

diff --git a/csit/testplans/sxp-topology-stable-lithium.txt b/csit/testplans/sxp-topology-stable-lithium.txt
deleted file mode 100644 (file)
index d4be5bc..0000000
--- a/csit/testplans/sxp-topology-stable-lithium.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# Place the suites in run order:
-integration/test/csit/suites/sxp/topology/010_Topology_Features.robot
-integration/test/csit/suites/sxp/topology/020_Scalability.robot
\ No newline at end of file