From 041a6230b8f44ceb8e1bf91f56242f41a928f687 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Martin=20Mih=C3=A1lek?= Date: Thu, 5 Nov 2015 13:45:59 +0100 Subject: [PATCH] Bug 4567 - CSIT config xml contains outdated config MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit For Lithium branch notification-service option is added to config file Change-Id: If3b45cb0e6305b5941fd190417d77e8257004c7d Signed-off-by: Martin Mihálek --- .../22-sxp-controller-one-node-lithium.xml | 113 +++ csit/suites/sxp/scripts/basic_node_setup.sh | 6 +- .../suites/sxp/scripts/topology_node_setup.sh | 6 +- .../22-sxp-controller-one-node-lithium.xml | 701 ++++++++++++++++++ 4 files changed, 824 insertions(+), 2 deletions(-) create mode 100644 csit/suites/sxp/basic/22-sxp-controller-one-node-lithium.xml create mode 100644 csit/suites/sxp/topology/22-sxp-controller-one-node-lithium.xml 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 new file mode 100644 index 0000000000..1012992594 --- /dev/null +++ b/csit/suites/sxp/basic/22-sxp-controller-one-node-lithium.xml @@ -0,0 +1,113 @@ + + + + urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&revision=2013-10-28 + urn:opendaylight:params:xml:ns:yang:controller:sxp:controller:conf?module=sxp-controller-conf&revision=2014-10-02 + + + + + + + binding:sxp-controller + + sxp-controller + + + + binding:binding-broker-osgi-registry + + binding-osgi-broker + + + + + binding:binding-rpc-registry + + binding-rpc-broker + + + + + binding:binding-async-data-broker + + binding-data-broker + + + + + binding:binding-notification-service + + binding-notification-broker + + + + + true + 127.0.0.1 + 127.0.0.1 + 64999 + version4 + + kavabonga + + 5 + ODL SXP Controller + + + 5 + 120 + 30 + 90 + 90 + 180 + + + + true + 127.0.0.2 + 127.0.0.2 + 64999 + version4 + + kavabonga + + 5 + ODL SXP Controller + + + 5 + 120 + 30 + 90 + 90 + 180 + + + + true + 127.0.0.3 + 127.0.0.3 + 64999 + version4 + + kavabonga + + 5 + ODL SXP Controller + + + 5 + 120 + 30 + 90 + 90 + 180 + + + + + + + + diff --git a/csit/suites/sxp/scripts/basic_node_setup.sh b/csit/suites/sxp/scripts/basic_node_setup.sh index 6ec909a599..ed8d173d96 100644 --- a/csit/suites/sxp/scripts/basic_node_setup.sh +++ b/csit/suites/sxp/scripts/basic_node_setup.sh @@ -3,4 +3,8 @@ echo "Setup config to ${ODL_SYSTEM_IP}" ssh ${ODL_SYSTEM_IP} "mkdir -p /tmp/${BUNDLEFOLDER}/etc/opendaylight/karaf/" -scp ${WORKSPACE}/test/csit/suites/sxp/basic/22-sxp-controller-one-node.xml ${ODL_SYSTEM_IP}:/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 +else + scp ${WORKSPACE}/test/csit/suites/sxp/basic/22-sxp-controller-one-node.xml ${ODL_SYSTEM_IP}:/tmp/${BUNDLEFOLDER}/etc/opendaylight/karaf/ +fi diff --git a/csit/suites/sxp/scripts/topology_node_setup.sh b/csit/suites/sxp/scripts/topology_node_setup.sh index 93519dc229..27a2c2f2ef 100644 --- a/csit/suites/sxp/scripts/topology_node_setup.sh +++ b/csit/suites/sxp/scripts/topology_node_setup.sh @@ -3,4 +3,8 @@ echo "Setup config to ${ODL_SYSTEM_IP}" ssh ${ODL_SYSTEM_IP} "mkdir -p /tmp/${BUNDLEFOLDER}/etc/opendaylight/karaf/" -scp ${WORKSPACE}/test/csit/suites/sxp/topology/22-sxp-controller-one-node.xml ${ODL_SYSTEM_IP}:/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 +else + scp ${WORKSPACE}/test/csit/suites/sxp/topology/22-sxp-controller-one-node.xml ${ODL_SYSTEM_IP}:/tmp/${BUNDLEFOLDER}/etc/opendaylight/karaf/ +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 new file mode 100644 index 0000000000..fbdd501ca5 --- /dev/null +++ b/csit/suites/sxp/topology/22-sxp-controller-one-node-lithium.xml @@ -0,0 +1,701 @@ + + + + urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&revision=2013-10-28 + urn:opendaylight:params:xml:ns:yang:controller:sxp:controller:conf?module=sxp-controller-conf&revision=2014-10-02 + + + + + + + binding:sxp-controller + + sxp-controller + + + + binding:binding-broker-osgi-registry + + binding-osgi-broker + + + + + binding:binding-rpc-registry + + binding-rpc-broker + + + + + binding:binding-async-data-broker + + binding-data-broker + + + + + binding:binding-notification-service + + binding-notification-broker + + + + + true + 127.0.0.1 + 127.0.0.1 + 64999 + version4 + + kavabonga + + 5 + ODL SXP Controller + + + 5 + 120 + 30 + 90 + 90 + 180 + + + + true + 127.0.0.2 + 127.0.0.2 + 64999 + version4 + + kavabonga + + 5 + ODL SXP Controller + + + 5 + 120 + 30 + 90 + 90 + 180 + + + + true + 127.0.0.3 + 127.0.0.3 + 64999 + version4 + + kavabonga + + 5 + ODL SXP Controller + + + 5 + 120 + 30 + 90 + 90 + 180 + + + + true + 127.0.0.4 + 127.0.0.4 + 64999 + version4 + + kavabonga + + 5 + ODL SXP Controller + + + 5 + 120 + 30 + 90 + 90 + 180 + + + + true + 127.0.0.5 + 127.0.0.5 + 64999 + version4 + + kavabonga + + 5 + ODL SXP Controller + + + 5 + 120 + 30 + 90 + 90 + 180 + + + + true + 127.0.0.6 + 127.0.0.6 + 64999 + version4 + + kavabonga + + 5 + ODL SXP Controller + + + 5 + 120 + 30 + 90 + 90 + 180 + + + + true + 127.0.0.7 + 127.0.0.7 + 64999 + version4 + + kavabonga + + 5 + ODL SXP Controller + + + 5 + 120 + 30 + 90 + 90 + 180 + + + + true + 127.0.0.8 + 127.0.0.8 + 64999 + version4 + + kavabonga + + 5 + ODL SXP Controller + + + 5 + 120 + 30 + 90 + 90 + 180 + + + + true + 127.0.0.9 + 127.0.0.9 + 64999 + version4 + + kavabonga + + 5 + ODL SXP Controller + + + 5 + 120 + 30 + 90 + 90 + 180 + + + + true + 127.0.0.10 + 127.0.0.10 + 64999 + version4 + + kavabonga + + 5 + ODL SXP Controller + + + 5 + 120 + 30 + 90 + 90 + 180 + + + + true + 127.0.0.11 + 127.0.0.11 + 64999 + version4 + + kavabonga + + 5 + ODL SXP Controller + + + 5 + 120 + 30 + 90 + 90 + 180 + + + + true + 127.0.0.12 + 127.0.0.12 + 64999 + version4 + + kavabonga + + 5 + ODL SXP Controller + + + 5 + 120 + 30 + 90 + 90 + 180 + + + + true + 127.0.0.13 + 127.0.0.13 + 64999 + version4 + + kavabonga + + 5 + ODL SXP Controller + + + 5 + 120 + 30 + 90 + 90 + 180 + + + + true + 127.0.0.14 + 127.0.0.14 + 64999 + version4 + + kavabonga + + 5 + ODL SXP Controller + + + 5 + 120 + 30 + 90 + 90 + 180 + + + + true + 127.0.0.15 + 127.0.0.15 + 64999 + version4 + + kavabonga + + 5 + ODL SXP Controller + + + 5 + 120 + 30 + 90 + 90 + 180 + + + + true + 127.0.0.16 + 127.0.0.16 + 64999 + version4 + + kavabonga + + 5 + ODL SXP Controller + + + 5 + 120 + 30 + 90 + 90 + 180 + + + + true + 127.0.0.17 + 127.0.0.17 + 64999 + version4 + + kavabonga + + 5 + ODL SXP Controller + + + 5 + 120 + 30 + 90 + 90 + 180 + + + + true + 127.0.0.18 + 127.0.0.18 + 64999 + version4 + + kavabonga + + 5 + ODL SXP Controller + + + 5 + 120 + 30 + 90 + 90 + 180 + + + + true + 127.0.0.19 + 127.0.0.19 + 64999 + version4 + + kavabonga + + 5 + ODL SXP Controller + + + 5 + 120 + 30 + 90 + 90 + 180 + + + + true + 127.0.0.20 + 127.0.0.20 + 64999 + version4 + + kavabonga + + 5 + ODL SXP Controller + + + 5 + 120 + 30 + 90 + 90 + 180 + + + + true + 127.0.0.21 + 127.0.0.21 + 64999 + version4 + + kavabonga + + 5 + ODL SXP Controller + + + 5 + 120 + 30 + 90 + 90 + 180 + + + + true + 127.0.0.22 + 127.0.0.22 + 64999 + version4 + + kavabonga + + 5 + ODL SXP Controller + + + 5 + 120 + 30 + 90 + 90 + 180 + + + + true + 127.0.0.23 + 127.0.0.23 + 64999 + version4 + + kavabonga + + 5 + ODL SXP Controller + + + 5 + 120 + 30 + 90 + 90 + 180 + + + + true + 127.0.0.24 + 127.0.0.24 + 64999 + version4 + + kavabonga + + 5 + ODL SXP Controller + + + 5 + 120 + 30 + 90 + 90 + 180 + + + + true + 127.0.0.25 + 127.0.0.25 + 64999 + version4 + + kavabonga + + 5 + ODL SXP Controller + + + 5 + 120 + 30 + 90 + 90 + 180 + + + + true + 127.0.0.26 + 127.0.0.26 + 64999 + version4 + + kavabonga + + 5 + ODL SXP Controller + + + 5 + 120 + 30 + 90 + 90 + 180 + + + + true + 127.0.0.27 + 127.0.0.27 + 64999 + version4 + + kavabonga + + 5 + ODL SXP Controller + + + 5 + 120 + 30 + 90 + 90 + 180 + + + + true + 127.0.0.28 + 127.0.0.28 + 64999 + version4 + + kavabonga + + 5 + ODL SXP Controller + + + 5 + 120 + 30 + 90 + 90 + 180 + + + + true + 127.0.0.29 + 127.0.0.29 + 64999 + version4 + + kavabonga + + 5 + ODL SXP Controller + + + 5 + 120 + 30 + 90 + 90 + 180 + + + + true + 127.0.0.30 + 127.0.0.30 + 64999 + version4 + + kavabonga + + 5 + ODL SXP Controller + + + 5 + 120 + 30 + 90 + 90 + 180 + + + + true + 127.0.0.31 + 127.0.0.31 + 64999 + version4 + + kavabonga + + 5 + ODL SXP Controller + + + 5 + 120 + 30 + 90 + 90 + 180 + + + + + + + + -- 2.36.6