[BGPVPN] Uplift plugin to Mitaka

Change-Id: I9db366806ec97b44b0e537ee2d4beb3c8a968b92
Signed-off-by: Nikolas Hermanns <nikolas.hermanns@ericsson.com>

6 files changed, 40 insertions, 18 deletions

diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile
index e80b95e72..51b8f26fa 100644
--- a/build/f_isoroot/Makefile
+++ b/build/f_isoroot/Makefile
@@ -11,7 +11,7 @@
 # Add Fuel plugin build targets here
 # Plugins disabled for the Fuel Mitaka uplift. Please re-enable your plugin as you have
 # verified it!
-PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_vsperfpluginbuild f_ovs-nsh-dpdk-pluginbuild f_yardstick-pluginbuild f_kvm-pluginbuild
+PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_vsperfpluginbuild f_ovs-nsh-dpdk-pluginbuild f_yardstick-pluginbuild f_kvm-pluginbuild f_bgpvpn-pluginbuild
 #PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_ovsnfv-dpdk-pluginbuild f_vsperfpluginbuild f_ovs-nsh-dpdk-pluginbuild f_bgpvpn-pluginbuild
 export PLUGINS
 #NON_8-0_REBASED_PLUGINS = f_bgpvpn-pluginbuild
diff --git a/build/f_isoroot/f_bgpvpn-pluginbuild/config.mk b/build/f_isoroot/f_bgpvpn-pluginbuild/config.mk
index a5f9ad966..e0e7b57df 100644
--- a/build/f_isoroot/f_bgpvpn-pluginbuild/config.mk
+++ b/build/f_isoroot/f_bgpvpn-pluginbuild/config.mk
@@ -9,4 +9,4 @@
 
 BGPVPN_BRANCH=master
 BGPVPN_REPO="https://github.com/openstack/fuel-plugin-bgpvpn.git"
-BGPVPN_CHANGE=fb8a9ad29f85bd0902db6701f31810aa8015a4fc
+BGPVPN_CHANGE=31cffef955f855c817eb3c960532e2ed1442c32c
diff --git a/build/f_isoroot/f_odlpluginbuild/config.mk b/build/f_isoroot/f_odlpluginbuild/config.mk
index 7e68245c3..9a11ffa6b 100644
--- a/build/f_isoroot/f_odlpluginbuild/config.mk
+++ b/build/f_isoroot/f_odlpluginbuild/config.mk
@@ -8,7 +8,7 @@
 ##############################################################################
 
 ODL_BRANCH ?= master
-ODL_CHANGE ?= ae7f56df70acb92f78150c5461d84896e6aef1b4
+ODL_CHANGE ?= c539dc87d905e9c9992d6624c11814c4eda4c5ca
 ODL_REPO ?= https://github.com/openstack/fuel-plugin-opendaylight.git
 
 FPB_BRANCH ?= master
diff --git a/deploy/config/plugins/fuel-bgpvpn_0.9.0.yaml b/deploy/config/plugins/fuel-bgpvpn_0.9.0.yaml
new file mode 100644
index 000000000..bbdefaf6e
--- /dev/null
+++ b/deploy/config/plugins/fuel-bgpvpn_0.9.0.yaml
@@ -0,0 +1,22 @@
+plugin-config-metadata:
+  title: BGPVPN fuel Plugin configuration template
+  version: 0.9.0
+  created: 29.06.2016
+  comment: None
+
+bgpvpn:
+  metadata:
+    class: plugin
+    default: false
+    enabled: true
+    label: BGPVPN plugin
+    toggleable: true
+    versions:
+    - metadata:
+        always_editable: false
+        label: BGPVPN plugin
+        plugin_version: 0.9.0
+        restrictions:
+        - cluster:net_provider != 'neutron': Only neutron is supported by BGPVPN-plugin
+        weight: 90
+    weight: 70
diff --git a/deploy/scenario/ha_odl-bgpvpn_scenario.yaml b/deploy/scenario/ha_odl-bgpvpn_scenario.yaml
index c0343a617..2257cbb70 100644
--- a/deploy/scenario/ha_odl-bgpvpn_scenario.yaml
+++ b/deploy/scenario/ha_odl-bgpvpn_scenario.yaml
@@ -22,9 +22,9 @@
 # deployment configuration meta-data
 deployment-scenario-metadata:
    title: ODL HA BGPVPN deployment
-   version: 0.0.1
-   created: 04.03.2016
-   comment: Fuel ODL HA with BGPVPN, Ceph, Ceilometer and Heat Rebased for Fuel8
+   version: 0.9.0
+   created: 29.06.2016
+   comment: Fuel ODL HA with BGPVPN, Ceph, Ceilometer and Heat Rebased for Fuel9
 
 ##############################################################################
 # Stack extentions are opnfv added value features in form of a fuel-plugin
@@ -34,22 +34,22 @@ deployment-scenario-metadata:
 stack-extensions:
   - module: opendaylight
     module-config-name: fuel-odl
-    module-config-version: 0.0.3
+    module-config-version: 0.9.0
     module-config-override:
       metadata:
         versions:
           - enable_bgpvpn:
               value: true
             metadata:
-              plugin_version: 0.8.1
+              plugin_version: 0.9.0
 
   - module: bgpvpn
     module-config-name: fuel-bgpvpn
-    module-config-version: 0.0.3
+    module-config-version: 0.9.0
 
   - module: fuel-plugin-ovs
     module-config-name: fuel-nshovs
-    module-config-version: 0.0.1
+    module-config-version: 0.9.0
 
 ##############################################################################
 # By editing the override-config sections below, you can override arbitrary
diff --git a/deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml b/deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml
index 067da4761..333ff5af5 100644
--- a/deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml
+++ b/deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml
@@ -21,10 +21,10 @@
 ##############################################################################
 # deployment configuration meta-data
 deployment-scenario-metadata:
-   title: ODL No-HA BGPVPN deployment
-   version: 0.0.1
-   created: 04.03.2016
-   comment: Fuel ODL No HA with BGPVPN, Ceph, Ceilometer and Heat Rebased for Fuel8
+   title: ODL HA BGPVPN deployment
+   version: 0.9.0
+   created: 29.06.2016
+   comment: Fuel ODL No HA with BGPVPN, Ceph, Ceilometer and Heat Rebased for Fuel9
 
 ##############################################################################
 # Stack extentions are opnfv added value features in form of a fuel-plugin
@@ -34,22 +34,22 @@ deployment-scenario-metadata:
 stack-extensions:
   - module: opendaylight
     module-config-name: fuel-odl
-    module-config-version: 0.0.3
+    module-config-version: 0.9.0
     module-config-override:
       metadata:
         versions:
           - enable_bgpvpn:
               value: true
             metadata:
-              plugin_version: 0.8.1
+              plugin_version: 0.9.0
 
   - module: bgpvpn
     module-config-name: fuel-bgpvpn
-    module-config-version: 0.0.3
+    module-config-version: 0.9.0
 
   - module: fuel-plugin-ovs
     module-config-name: fuel-nshovs
-    module-config-version: 0.0.1
+    module-config-version: 0.9.0
 
 ##############################################################################
 # By editing the override-config sections below, you can override arbitrary