Version bump to 5.1.0

Change-Id: Ie8415c60946b038f3263b333dccc62a8986152d0
Signed-off-by: Illia Polliul <ipolliul@mirantis.com>

README.md

@@ -3,8 +3,8 @@ Mirantis Fuel Contrail plugin
 
 Compatible versions:
 
-- Mirantis Fuel 9.0
-- Juniper Contrail 3.1.0.0
+- Mirantis Fuel 9.2
+- Juniper Contrail 3.2.0.0
 
 How to build plugin:
 
@@ -17,4 +17,5 @@ How to build plugin:
 
     fpb --build .
 
-- Check if file contrail-5.0-5.0.0-1.noarch.rpm was created.
+- Check if file contrail-5.1-5.1.0-1.noarch.rpm was created.
+

doc/source/conf.py

@@ -30,8 +30,8 @@ master_doc = 'index'
 project = u'Contrail plugin for Fuel'
 copyright = u'2016, Mirantis Inc.'
 
-version = '5.0-5.0.0-1'
-release = '5.0-5.0.0-1'
+version = '5.1-5.1.0-1'
+release = '5.1-5.1.0-1'
 
 pygments_style = 'sphinx'
 

doc/source/index.rst

@@ -1,6 +1,6 @@
 .. _fuel-plugin-contrail:
 
-Guide to the Contrail plugin version 5.0-5.0.0-1 for Fuel 9.1
+Guide to the Contrail plugin version 5.1-5.1.0-1 for Fuel 9.2
 =============================================================
 
 .. toctree::

doc/source/install_guide.rst

@@ -18,13 +18,13 @@ To install the Contrail plugin:
 #.  Copy the rpm package downloaded at the previous step to the Fuel Master node and install the plugin
     ::
 
-        scp contrail-5.0-5.0.0-1.noarch.rpm  <Fuel Master node ip>:/tmp/
+        scp contrail-5.1-5.1.0-1.noarch.rpm  <Fuel Master node ip>:/tmp/
 
 #.  Log into the Fuel Master node and install the plugin
     ::
 
         ssh <the Fuel Master node ip>
-        fuel plugins --install contrail-5.0-5.0.0-1.noarch.rpm
+        fuel plugins --install contrail-5.1-5.1.0-1.noarch.rpm
 
     You should get the following output
     ::
@@ -42,15 +42,15 @@ To install the Contrail plugin:
 
     ::
 
-        scp contrail-install-packages_3.0.2.1-4~liberty_all.deb \
-        <Fuel Master node ip>:/var/www/nailgun/plugins/contrail-5.0/
-        ssh <Fuel Master node ip> /var/www/nailgun/plugins/contrail-5.0/install.sh
+        scp contrail-install-packages_3.2.0.0-19~mitaka_all.deb \
+        <Fuel Master node ip>:/var/www/nailgun/plugins/contrail-5.1/
+        ssh <Fuel Master node ip> /var/www/nailgun/plugins/contrail-5.1/install.sh
 
 #.  In case if vmware integration expected, before running *install.sh* copy vcenter plugin package to contrail plugin folder
     ::
 
-        scp contrail-install-vcenter-plugin_3.0.0.0-2723_all.deb \
-        <Fuel Master node ip>:/var/www/nailgun/plugins/contrail-3.0/
+        scp contrail-install-vcenter-plugin_3.2.0.0-19_all.deb \
+        <Fuel Master node ip>:/var/www/nailgun/plugins/contrail-5.1/
 
 .. raw:: latex
 

doc/source/new_features.rst

@@ -1,7 +1,7 @@
-New features in plugin version 5.0-5.0.0-1
+New features in plugin version 5.1-5.1.0-1
 ==========================================
 
-* Fuel 9.1 with OpenStack Mitaka support
+* Fuel 9.2 with OpenStack Mitaka support
 
 * Dedicated Analytics and Analytics DB node roles
 

doc/source/upgrade.rst

@@ -40,23 +40,23 @@ proceed to step 4.
 
    .. code-block:: console
 
-      scp contrail-5.0-5.0.0-1.noarch.rpm <Fuel Master node ip>:/tmp/
+      scp contrail-5.1-5.1.0-1.noarch.rpm <Fuel Master node ip>:/tmp/
 
 #. Log in to the Fuel Master node and upgrade the plugin:
 
    .. code-block:: console
 
       ssh <the Fuel Master node ip>
-      fuel plugins --update /tmp/contrail-5.0-5.0.0-1.noarch.rpm
+      fuel plugins --update /tmp/contrail-5.1-5.1.0-1.noarch.rpm
 
 #. Copy the latest Juniper Contrail installation package to the Fuel Master node and run the installation
    script to unpack the vendor package and populate the plugin repository with up-to-date packages:
 
    .. code-block:: console
 
-      scp contrail-install-packages_3.1.0.0-25~Ubuntu-14.04.4-mitaka_all.deb \
-          <Fuel Master node ip>:/var/www/nailgun/plugins/contrail-5.0/
-      ssh <Fuel Master node ip> /var/www/nailgun/plugins/contrail-5.0/install.sh
+      scp contrail-install-packages_3.2.0.0-19~mitaka_all.deb \
+          <Fuel Master node ip>:/var/www/nailgun/plugins/contrail-5.1/
+      ssh <Fuel Master node ip> /var/www/nailgun/plugins/contrail-5.1/install.sh
 
 .. raw:: latex
 
@@ -78,7 +78,7 @@ starts. The Neutron service will be restarted in case if contrail core plugin wi
    .. code-block:: console
 
       ssh <the Fuel Master node ip>
-      cd /var/www/nailgun/plugins/contrail-5.0/
+      cd /var/www/nailgun/plugins/contrail-5.1/
 
 #. Check ID of contrail plugin:
 
@@ -130,7 +130,7 @@ during the vRouter upgrade, this can take up to 5 min.
    .. code-block:: console
 
       ssh <the Fuel Master node ip>
-      cd /var/www/nailgun/plugins/contrail-5.0/
+      cd /var/www/nailgun/plugins/contrail-5.1/
 
 #. Check ID of contrail plugin:
 
@@ -164,3 +164,4 @@ during the vRouter upgrade, this can take up to 5 min.
 
 #. Log in to compute nodes and verify output of the ``contrail-status`` command.
    You can verify the version of the vRouter package by running ``contrail-version`` command.
+

doc/source/vmware.rst

@@ -52,7 +52,7 @@ To install environment with Contrail and VMWware support you should proceed with
 
     ::
 
-      [root@nailgun ~]# cd /var/www/nailgun/plugins/contrail-5.0/deployment_scripts/
+      [root@nailgun ~]# cd /var/www/nailgun/plugins/contrail-5.1/deployment_scripts/
       [root@nailgun deployment_scripts]# ./spawner.py --env_id 1 --spawn
 
 #. Wait a few minutes when ContrailVM's node will be arrived
@@ -150,7 +150,7 @@ Add and delete ESXi hosts
 
     ::
 
-      [root@nailgun ~]# cd /var/www/nailgun/plugins/contrail-5.0/deployment_scripts/
+      [root@nailgun ~]# cd /var/www/nailgun/plugins/contrail-5.1/deployment_scripts/
       [root@nailgun deployment_scripts]# ./spawner.py --env_id 1 --spawn
 
 #. Wait a few minutes when ContrailVM's node will be arrived

install.sh

@@ -26,7 +26,7 @@
 
 set -ex
 
-PLUGIN_PATH="/var/www/nailgun/plugins/contrail-5.0"
+PLUGIN_PATH="/var/www/nailgun/plugins/contrail-5.1"
 #Now uses the latest package file
 UBUNTU_PKG=$(find $PLUGIN_PATH -maxdepth 1 -name 'contrail-install-packages*.deb' -exec stat -c "%y %n" {} + | sort -r | head -n 1 | cut -d' ' -f 4)
 CENTOS_PKG=$(find $PLUGIN_PATH -maxdepth 1 -name 'contrail-install-packages*.rpm' -exec stat -c "%y %n" {} + | sort -r | head -n 1 | cut -d' ' -f 4)

metadata.yaml

@@ -3,7 +3,7 @@ name: contrail
 # Human-readable name for your plugin
 title: Fuel Contrail plugin
 # Plugin version
-version: 5.0.0
+version: 5.1.0
 # Description
 description: Contrail plugin for Fuel provides the functionality to add Juniper Contrail SDN for Mirantis OpenStack as network backend using Fuel Web UI in a user-friendly manner
 # Required fuel version

plugin_test/helpers/settings.py

@@ -21,7 +21,7 @@ LIBVIRT_NET_PATH = os.environ.get('LIBVIRT_NET_PATH', False)
 
 OSTF_RUN_TIMEOUT = 60 * 60  # 60 minutes
 DEPLOY_CLUSTER_TIMEOUT = 25 * 60  # 25 minutes
-CONTRAIL_PLUGIN_VERSION = os.environ.get('CONTRAIL_PLUGIN_VERSION', '5.0.0')
+CONTRAIL_PLUGIN_VERSION = os.environ.get('CONTRAIL_PLUGIN_VERSION', '5.1.0')
 VSRX_CONFIG_PATH = os.environ.get(
     'VSRX_CONFIG_PATH', '/storage/contrail/config_2nodegroups.conf')
 

plugin_test/tests/test_dpdk.py

@@ -36,8 +36,8 @@ from tests.test_contrail_check import TestContrailCheck
 class DPDKTests(TestBasic):
     """DPDKTests."""
 
-    pack_copy_path = '/var/www/nailgun/plugins/contrail-5.0'
-    add_package = '/var/www/nailgun/plugins/contrail-5.0/'\
+    pack_copy_path = '/var/www/nailgun/plugins/contrail-5.1'
+    add_package = '/var/www/nailgun/plugins/contrail-5.1/'\
                   'repositories/ubuntu/contrail-setup*'
     ostf_msg = 'OSTF tests passed successfully.'
     cluster_id = ''

plugin_test/tests/test_dpdk_on_vf.py

@@ -35,8 +35,8 @@ from tests.test_contrail_check import TestContrailCheck
 class DPDKonVFTests(TestBasic):
     """DPDKTests."""
 
-    pack_copy_path = '/var/www/nailgun/plugins/contrail-5.0'
-    add_package = '/var/www/nailgun/plugins/contrail-5.0/'\
+    pack_copy_path = '/var/www/nailgun/plugins/contrail-5.1'
+    add_package = '/var/www/nailgun/plugins/contrail-5.1/'\
                   'repositories/ubuntu/contrail-setup*'
     ostf_msg = 'OSTF tests passed successfully.'
     cluster_id = ''

plugin_test/tests/test_failover.py

@@ -37,8 +37,8 @@ from tests.test_contrail_check import TestContrailCheck
 class FailoverTests(TestBasic):
     """FailoverTests."""
 
-    pack_copy_path = '/var/www/nailgun/plugins/contrail-5.0'
-    add_package = '/var/www/nailgun/plugins/contrail-5.0/'\
+    pack_copy_path = '/var/www/nailgun/plugins/contrail-5.1'
+    add_package = '/var/www/nailgun/plugins/contrail-5.1/'\
                   'repositories/ubuntu/contrail-setup*'
     ostf_msg = 'OSTF tests passed successfully.'
     cluster_id = ''

plugin_test/tests/test_functional.py

@@ -41,8 +41,8 @@ from tests.test_contrail_check import TestContrailCheck
 class FunctionalTests(TestBasic):
     """IntegrationTests."""
 
-    pack_copy_path = '/var/www/nailgun/plugins/contrail-5.0'
-    add_package = '/var/www/nailgun/plugins/contrail-5.0/'\
+    pack_copy_path = '/var/www/nailgun/plugins/contrail-5.1'
+    add_package = '/var/www/nailgun/plugins/contrail-5.1/'\
                   'repositories/ubuntu/contrail-setup*'
     ostf_msg = 'OSTF tests passed successfully.'
     cluster_id = ''

plugin_test/tests/test_integration.py

@@ -35,9 +35,9 @@ from tests.test_contrail_check import TestContrailCheck
 class IntegrationTests(TestBasic):
     """IntegrationTests."""
 
-    pack_copy_path = '/var/www/nailgun/plugins/contrail-5.0'
+    pack_copy_path = '/var/www/nailgun/plugins/contrail-5.1'
     add_package = \
-        '/var/www/nailgun/plugins/contrail-5.0/' \
+        '/var/www/nailgun/plugins/contrail-5.1/' \
         'repositories/ubuntu/contrail-setup*'
     ostf_msg = 'OSTF tests passed successfully.'
 

plugin_test/tests/test_smoke_bvt.py

@@ -37,9 +37,9 @@ from tests.test_contrail_check import TestContrailCheck
 class ContrailPlugin(TestBasic):
     """ContrailPlugin."""  # TODO(unknown) documentation
 
-    pack_copy_path = '/var/www/nailgun/plugins/contrail-5.0'
+    pack_copy_path = '/var/www/nailgun/plugins/contrail-5.1'
     add_package = \
-        '/var/www/nailgun/plugins/contrail-5.0/' \
+        '/var/www/nailgun/plugins/contrail-5.1/' \
         'repositories/ubuntu/contrail-setup*'
     ostf_msg = 'OSTF tests passed successfully.'
 

plugin_test/tests/test_sriov.py

@@ -35,8 +35,8 @@ from tests.test_contrail_check import TestContrailCheck
 class SRIOVTests(TestBasic):
     """SRIOV Tests."""
 
-    pack_copy_path = '/var/www/nailgun/plugins/contrail-5.0'
-    add_package = '/var/www/nailgun/plugins/contrail-5.0/'\
+    pack_copy_path = '/var/www/nailgun/plugins/contrail-5.1'
+    add_package = '/var/www/nailgun/plugins/contrail-5.1/'\
                   'repositories/ubuntu/contrail-setup*'
     ostf_msg = 'OSTF tests passed successfully.'
     cluster_id = ''

plugin_test/tests/test_system.py

@@ -58,9 +58,9 @@ class SystemTests(TestBasic):
     Contrail API without gaps in dataflow.
     """
 
-    pack_copy_path = '/var/www/nailgun/plugins/contrail-5.0'
+    pack_copy_path = '/var/www/nailgun/plugins/contrail-5.1'
     add_package = \
-        '/var/www/nailgun/plugins/contrail-5.0/' \
+        '/var/www/nailgun/plugins/contrail-5.1/' \
         'repositories/ubuntu/contrail-setup*'
     ostf_msg = 'OSTF tests passed successfully.'
     cluster_id = ''