Correcting networking-odl to mitaka/stable + app topology patch

Change-Id: Iddcd8dda2d49fcdd8e0f37a1d052a6fa8a24b035
Signed-off-by: Wojciech Dec <wdec@cisco.com>

16 files changed, 63 insertions, 49 deletions

diff --git a/networking-odl/devstack/odl-releases/beryllium-0.4.0 b/networking-odl/devstack/odl-releases/beryllium-0.4.0
index 4ed5b73..b7f996a 100644
--- a/networking-odl/devstack/odl-releases/beryllium-0.4.0
+++ b/networking-odl/devstack/odl-releases/beryllium-0.4.0
@@ -1,4 +1,9 @@
-export ODL_BUNDLEVERSION='0.4.0-Beryllium'
+export BUNDLEVERSION='0.4.0-Beryllium'
+export ODL_NAME=distribution-karaf-${BUNDLEVERSION}
 
 # Java major version required to run OpenDaylight: 7, 8, ...
 ODL_REQUIRED_JAVA_VERSION=${ODL_REQUIRED_JAVA_VERSION:-8}
+
+function setup_opendaylight_package {
+    odl_export_release_url_pkg ${ODL_URL_PREFIX} ${BUNDLEVERSION}
+}
diff --git a/networking-odl/devstack/odl-releases/beryllium-0.4.1-SR1 b/networking-odl/devstack/odl-releases/beryllium-0.4.1-SR1
index f659a38..b71dd0a 100644
--- a/networking-odl/devstack/odl-releases/beryllium-0.4.1-SR1
+++ b/networking-odl/devstack/odl-releases/beryllium-0.4.1-SR1
@@ -1,4 +1,9 @@
-export ODL_BUNDLEVERSION='0.4.1-Beryllium-SR1'
+export BUNDLEVERSION='0.4.1-Beryllium-SR1'
+export ODL_NAME=distribution-karaf-${BUNDLEVERSION}
 
 # Java major version required to run OpenDaylight: 7, 8, ...
 ODL_REQUIRED_JAVA_VERSION=${ODL_REQUIRED_JAVA_VERSION:-8}
+
+function setup_opendaylight_package {
+    odl_export_release_url_pkg ${ODL_URL_PREFIX} ${BUNDLEVERSION}
+}
diff --git a/networking-odl/devstack/odl-releases/beryllium-0.4.2-SR2 b/networking-odl/devstack/odl-releases/beryllium-0.4.2-SR2
deleted file mode 100644
index 230682b..0000000
--- a/networking-odl/devstack/odl-releases/beryllium-0.4.2-SR2
+++ /dev/null
@@ -1,4 +0,0 @@
-export ODL_BUNDLEVERSION='0.4.2-Beryllium-SR2'
-
-# Java major version required to run OpenDaylight: 7, 8, ...
-ODL_REQUIRED_JAVA_VERSION=${ODL_REQUIRED_JAVA_VERSION:-8}
diff --git a/networking-odl/devstack/odl-releases/beryllium-0.4.3-SR3 b/networking-odl/devstack/odl-releases/beryllium-0.4.3-SR3
deleted file mode 100644
index 2edebc0..0000000
--- a/networking-odl/devstack/odl-releases/beryllium-0.4.3-SR3
+++ /dev/null
@@ -1,4 +0,0 @@
-export ODL_BUNDLEVERSION='0.4.3-Beryllium-SR3'
-
-# Java major version required to run OpenDaylight: 7, 8, ...
-ODL_REQUIRED_JAVA_VERSION=${ODL_REQUIRED_JAVA_VERSION:-8}
diff --git a/networking-odl/devstack/odl-releases/beryllium-snapshot-0.4.2 b/networking-odl/devstack/odl-releases/beryllium-snapshot-0.4.2
new file mode 100644
index 0000000..9d2d823
--- /dev/null
+++ b/networking-odl/devstack/odl-releases/beryllium-snapshot-0.4.2
@@ -0,0 +1,9 @@
+BUNDLEVERSION='0.4.2-SNAPSHOT'
+export ODL_NAME=distribution-karaf-${BUNDLEVERSION}
+
+# Java major version required to run OpenDaylight: 7, 8, ...
+ODL_REQUIRED_JAVA_VERSION=${ODL_REQUIRED_JAVA_VERSION:-8}
+
+function setup_opendaylight_package {
+    odl_export_snapshot_url_pkg ${ODL_DIR} ${ODL_URL_PREFIX} ${BUNDLEVERSION} ${OFFLINE}
+}
diff --git a/networking-odl/devstack/odl-releases/beryllium-snapshot-0.4.3 b/networking-odl/devstack/odl-releases/beryllium-snapshot-0.4.3
deleted file mode 100644
index a0d8ecc..0000000
--- a/networking-odl/devstack/odl-releases/beryllium-snapshot-0.4.3
+++ /dev/null
@@ -1,5 +0,0 @@
-ODL_BUNDLEVERSION='0.4.3-SNAPSHOT'
-ODL_SNAPSHOT_VERSION=${ODL_SNAPSHOT_VERSION:-latest}
-
-# Java major version required to run OpenDaylight: 7, 8, ...
-ODL_REQUIRED_JAVA_VERSION=${ODL_REQUIRED_JAVA_VERSION:-8}
diff --git a/networking-odl/devstack/odl-releases/beryllium-snapshot-0.4.4 b/networking-odl/devstack/odl-releases/beryllium-snapshot-0.4.4
deleted file mode 100644
index 3ea7fac..0000000
--- a/networking-odl/devstack/odl-releases/beryllium-snapshot-0.4.4
+++ /dev/null
@@ -1,5 +0,0 @@
-ODL_BUNDLEVERSION='0.4.4-SNAPSHOT'
-ODL_SNAPSHOT_VERSION=${ODL_SNAPSHOT_VERSION:-latest}
-
-# Java major version required to run OpenDaylight: 7, 8, ...
-ODL_REQUIRED_JAVA_VERSION=${ODL_REQUIRED_JAVA_VERSION:-8}
diff --git a/networking-odl/devstack/odl-releases/boron-snapshot-0.5.0 b/networking-odl/devstack/odl-releases/boron-snapshot-0.5.0
index 1afdb92..31a042a 100644
--- a/networking-odl/devstack/odl-releases/boron-snapshot-0.5.0
+++ b/networking-odl/devstack/odl-releases/boron-snapshot-0.5.0
@@ -1,5 +1,9 @@
-ODL_BUNDLEVERSION='0.5.0-SNAPSHOT'
-ODL_SNAPSHOT_VERSION=${ODL_SNAPSHOT_VERSION:-latest}
+BUNDLEVERSION='0.5.0-SNAPSHOT'
+export ODL_NAME=distribution-karaf-${BUNDLEVERSION}
 
 # Java major version required to run OpenDaylight: 7, 8, ...
 ODL_REQUIRED_JAVA_VERSION=${ODL_REQUIRED_JAVA_VERSION:-8}
+
+function setup_opendaylight_package {
+    odl_export_snapshot_url_pkg ${ODL_DIR} ${ODL_URL_PREFIX} ${BUNDLEVERSION} ${OFFLINE}
+}
diff --git a/networking-odl/devstack/odl-releases/carbon-snapshot-0.6.0 b/networking-odl/devstack/odl-releases/carbon-snapshot-0.6.0
deleted file mode 100644
index 102de66..0000000
--- a/networking-odl/devstack/odl-releases/carbon-snapshot-0.6.0
+++ /dev/null
@@ -1,5 +0,0 @@
-ODL_BUNDLEVERSION='0.6.0-SNAPSHOT'
-ODL_SNAPSHOT_VERSION=${ODL_SNAPSHOT_VERSION:-latest}
-
-# Java major version required to run OpenDaylight: 7, 8, ...
-ODL_REQUIRED_JAVA_VERSION=${ODL_REQUIRED_JAVA_VERSION:-8}
diff --git a/networking-odl/devstack/odl-releases/common b/networking-odl/devstack/odl-releases/common
deleted file mode 100644
index ec57dd9..0000000
--- a/networking-odl/devstack/odl-releases/common
+++ /dev/null
@@ -1,14 +0,0 @@
-# karaf distribution name of ODL to download
-export ODL_NAME=${ODL_NAME:-distribution-karaf-${ODL_BUNDLEVERSION}}
-
-# The network virtualization older feature name (ovsdb based)
-export ODL_NETVIRT_KARAF_FEATURE_OVSDB=${ODL_NETVIRT_KARAF_FEATURE_OVSDB:-odl-ovsdb-openstack}
-
-# The network virtualization newer feature name (vpnservice based)
-export ODL_NETVIRT_KARAF_FEATURE_VPNSERVICE=${ODL_NETVIRT_KARAF_FEATURE_VPNSERVICE:-odl-netvirt-openstack}
-
-# The network virtualization feature used by opendaylight loaded by Karaf
-export ODL_NETVIRT_KARAF_FEATURE=${ODL_NETVIRT_KARAF_FEATURE:-odl-neutron-service,odl-restconf-all,odl-aaa-authn,odl-dlux-core,odl-mdsal-apidocs,$ODL_NETVIRT_KARAF_FEATURE_OVSDB}
-
-# The url that this version of ODL netvirt can use to know ODL is fully up
-export ODL_BOOT_WAIT_URL=${ODL_BOOT_WAIT_URL:-restconf/operational/network-topology:network-topology/topology/netvirt:1}
diff --git a/networking-odl/devstack/odl-releases/helium-0.2.3-SR3 b/networking-odl/devstack/odl-releases/helium-0.2.3-SR3
index 70149e9..ca51cf2 100644
--- a/networking-odl/devstack/odl-releases/helium-0.2.3-SR3
+++ b/networking-odl/devstack/odl-releases/helium-0.2.3-SR3
@@ -4,14 +4,13 @@ export ODL_NAME=distribution-karaf-0.2.3-Helium-SR3
 # Java major version required to run OpenDaylight: 7, 8, ...
 ODL_REQUIRED_JAVA_VERSION=${ODL_REQUIRED_JAVA_VERSION:-7}
 
-# overwrite this function
 function setup_opendaylight_package {
     # The OpenDaylight URL
     export ODL_URL=${ODL_URL_PREFIX}/content/repositories/public/org/opendaylight/integration/distribution-karaf/0.2.3-Helium-SR3
 
     # The OpenDaylight Package
     export ODL_PKG=distribution-karaf-0.2.3-Helium-SR3.zip
-}
 
-# The network virtualization feature used by opendaylight loaded by Karaf
-ODL_NETVIRT_KARAF_FEATURE=${ODL_NETVIRT_KARAF_FEATURE:-odl-base-all,odl-restconf-all,odl-aaa-authn,odl-dlux-core,odl-mdsal-apidocs,odl-adsal-northbound,odl-nsf-all,odl-ovsdb-northbound,odl-ovsdb-openstack}
+    # The network virtualization feature used by opendaylight loaded by Karaf
+    ODL_NETVIRT_KARAF_FEATURE=${ODL_NETVIRT_KARAF_FEATURE:-odl-base-all,odl-restconf-all,odl-aaa-authn,odl-dlux-core,odl-mdsal-apidocs,odl-adsal-northbound,odl-nsf-all,odl-ovsdb-northbound,odl-ovsdb-openstack}
+}
diff --git a/networking-odl/devstack/odl-releases/lithium-0.3.1-SR1 b/networking-odl/devstack/odl-releases/lithium-0.3.1-SR1
index 81283a7..ff23095 100644
--- a/networking-odl/devstack/odl-releases/lithium-0.3.1-SR1
+++ b/networking-odl/devstack/odl-releases/lithium-0.3.1-SR1
@@ -1,4 +1,9 @@
-export ODL_BUNDLEVERSION='0.3.1-Lithium-SR1'
+export BUNDLEVERSION='0.3.1-Lithium-SR1'
+export ODL_NAME=distribution-karaf-${BUNDLEVERSION}
 
 # Java major version required to run OpenDaylight: 7, 8, ...
 ODL_REQUIRED_JAVA_VERSION=${ODL_REQUIRED_JAVA_VERSION:-7}
+
+function setup_opendaylight_package {
+    odl_export_release_url_pkg ${ODL_URL_PREFIX} ${BUNDLEVERSION}
+}
diff --git a/networking-odl/devstack/odl-releases/lithium-0.3.2-SR2 b/networking-odl/devstack/odl-releases/lithium-0.3.2-SR2
index ff52cad..d603409 100644
--- a/networking-odl/devstack/odl-releases/lithium-0.3.2-SR2
+++ b/networking-odl/devstack/odl-releases/lithium-0.3.2-SR2
@@ -1,4 +1,9 @@
-export ODL_BUNDLEVERSION='0.3.2-Lithium-SR2'
+export BUNDLEVERSION='0.3.2-Lithium-SR2'
+export ODL_NAME=distribution-karaf-${BUNDLEVERSION}
 
 # Java major version required to run OpenDaylight: 7, 8, ...
 ODL_REQUIRED_JAVA_VERSION=${ODL_REQUIRED_JAVA_VERSION:-7}
+
+function setup_opendaylight_package {
+    odl_export_release_url_pkg ${ODL_URL_PREFIX} ${BUNDLEVERSION}
+}
diff --git a/networking-odl/devstack/odl-releases/lithium-0.3.3-SR3 b/networking-odl/devstack/odl-releases/lithium-0.3.3-SR3
index a1ff407..2480d07 100644
--- a/networking-odl/devstack/odl-releases/lithium-0.3.3-SR3
+++ b/networking-odl/devstack/odl-releases/lithium-0.3.3-SR3
@@ -1,4 +1,9 @@
-export ODL_BUNDLEVERSION='0.3.3-Lithium-SR3'
+export BUNDLEVERSION='0.3.3-Lithium-SR3'
+export ODL_NAME=distribution-karaf-${BUNDLEVERSION}
 
 # Java major version required to run OpenDaylight: 7, 8, ...
 ODL_REQUIRED_JAVA_VERSION=${ODL_REQUIRED_JAVA_VERSION:-7}
+
+function setup_opendaylight_package {
+    odl_export_release_url_pkg ${ODL_URL_PREFIX} ${BUNDLEVERSION}
+}
diff --git a/networking-odl/devstack/odl-releases/lithium-0.3.4-SR4 b/networking-odl/devstack/odl-releases/lithium-0.3.4-SR4
index da2f692..6dc5cd6 100644
--- a/networking-odl/devstack/odl-releases/lithium-0.3.4-SR4
+++ b/networking-odl/devstack/odl-releases/lithium-0.3.4-SR4
@@ -1,4 +1,9 @@
-export ODL_BUNDLEVERSION='0.3.4-Lithium-SR4'
+export BUNDLEVERSION='0.3.4-Lithium-SR4'
+export ODL_NAME=distribution-karaf-${BUNDLEVERSION}
 
 # Java major version required to run OpenDaylight: 7, 8, ...
 ODL_REQUIRED_JAVA_VERSION=${ODL_REQUIRED_JAVA_VERSION:-7}
+
+function setup_opendaylight_package {
+    odl_export_release_url_pkg ${ODL_URL_PREFIX} ${BUNDLEVERSION}
+}
diff --git a/networking-odl/devstack/odl-releases/lithium-snapshot-0.3.5 b/networking-odl/devstack/odl-releases/lithium-snapshot-0.3.5
new file mode 100644
index 0000000..73aa50f
--- /dev/null
+++ b/networking-odl/devstack/odl-releases/lithium-snapshot-0.3.5
@@ -0,0 +1,9 @@
+BUNDLEVERSION='0.3.5-SNAPSHOT'
+export ODL_NAME=distribution-karaf-${BUNDLEVERSION}
+
+# Java major version required to run OpenDaylight: 7, 8, ...
+ODL_REQUIRED_JAVA_VERSION=${ODL_REQUIRED_JAVA_VERSION:-7}
+
+function setup_opendaylight_package {
+    odl_export_snapshot_url_pkg ${ODL_DIR} ${ODL_URL_PREFIX} ${BUNDLEVERSION} ${OFFLINE}
+}