diff --git a/docs/test_plan/source/test_suite_smoke.rst b/docs/test_plan/source/test_suite_smoke.rst index 20716b2..4533123 100644 --- a/docs/test_plan/source/test_suite_smoke.rst +++ b/docs/test_plan/source/test_suite_smoke.rst @@ -107,7 +107,7 @@ Steps 3. Go to Network tab -> Other subtab and check DVS plugin section is displayed with all required GUI elements: 'Neutron VMware DVS ML2 plugin' checkbox 'Use the VMware DVS firewall driver' checkbox - 'Enter the cluster to dvSwitch mapping.' text field with description 'List of strings with format ClusterName:dvSwitchName:TeamingUplink1;TeamingUplink2:FallbackUplink1;FallbackUplink2.' + 'Enter the cluster to dvSwitch mapping.' text field with description 'List of strings with format ClusterName:dvSwitchName:ActiveUplink1;ActiveUplink2:StandbyUplink1;StandbyUplink2.' 'Versions' radio button with 4. Verify that checkbox 'Neutron VMware DVS ML2 plugin' is enabled by default. 5. Verify that user can disable/enable the DVS plugin by clicking on the checkbox 'Neutron VMware DVS ML2 plugin'. diff --git a/docs/test_plan/source/test_suite_system.rst b/docs/test_plan/source/test_suite_system.rst index 68566f3..5c5ad7c 100644 --- a/docs/test_plan/source/test_suite_system.rst +++ b/docs/test_plan/source/test_suite_system.rst @@ -1349,18 +1349,18 @@ Cluster is deployed successfully and all OSTF tests are passed. CA file was uploaded on all nodes with DVS agents and 'insecure' option for dvs agents is set to False. -Launch cluster with multiple teaming uplinks. ---------------------------------------------- +Launch cluster with multiple active uplinks. +-------------------------------------------- ID ## -dvs_multiple_uplinks_teaming +dvs_multiple_uplinks_active Description ########### -Launch cluster with multiple teaming uplinks. +Launch cluster with multiple active uplinks. Complexity ########## @@ -1384,7 +1384,7 @@ Steps 4. Configure interfaces on nodes. 5. Configure network settings. 6. Enable and configure DVS plugin with multiple uplinks. - In format "Cluster:VDS:TU1;TU2;TU3". + In format "Cluster:VDS:AU1;AU2;AU3". 7. Enable VMware vCenter/ESXi datastore for images (Glance). 8. Configure VMware vCenter Settings. Add 2 vSphere clusters and configure Nova Compute instances on controllers and compute-vmware. @@ -1398,18 +1398,18 @@ Expected result Cluster is deployed successfully and all OSTF tests are passed. -Launch cluster with multiple teaming and fallback uplniks. ----------------------------------------------------------- +Launch cluster with multiple active and standby uplniks. +-------------------------------------------------------- ID ## -dvs_multiple_uplinks_teaming_fallback +dvs_multiple_uplinks_active_standby Description ########### -Launch cluster with multiple teaming and fallback uplinks. +Launch cluster with multiple active and standby uplinks. Complexity ########## @@ -1433,7 +1433,7 @@ Steps 4. Configure interfaces on nodes. 5. Configure network settings. 6. Enable and configure DVS plugin with multiple uplinks. - In foramt "Cluster:VDS:TU1;TU2:FU3". + In foramt "Cluster:VDS:AU1;AU2:SU3". 7. Enable VMware vCenter/ESXi datastore for images (Glance). 8. Configure VMware vCenter Settings. Add 2 vSphere clusters and configure Nova Compute instances on controllers and compute-vmware. @@ -1448,19 +1448,19 @@ Cluster is deployed successfully and all OSTF tests are passed. -Disable teaming uplinks. ------------------------- +Disable active uplinks. +----------------------- ID ## -dvs_multiple_uplinks_disable_teaming +dvs_multiple_uplinks_disable_active Description ########### -Disable teaming uplinks. +Disable active uplinks. Complexity ########## @@ -1470,36 +1470,36 @@ core Steps ##### - 1. Launch cluster with 2 teaming and 1 fallback uplinks. + 1. Launch cluster with 2 active and 1 standby uplinks. 2. Run OSTF. 3. Up instance in default net in vCenter availability zone 4. Up instance in default net in nova availability zone - 5. Disable first teaming uplink in vCenter. + 5. Disable first active uplink in vCenter. 6. Check instances are alive and functioning. - 7. Disable all teaming uplinks in vCenter. + 7. Disable all active uplinks in vCenter. 8. Check instances are alive and functioning. 9. Run OSTF. Expected result ############### -After disabling teaming uplinks instances are alive and functioning. +After disabling active uplinks instances are alive and functioning. All OSTF tests passed. -Disabele teaming uplinks on cluster without fallback uplinks. -------------------------------------------------------------- +Disable active uplinks on cluster without standby uplinks. +---------------------------------------------------------- ID ## -dvs_multiple_uplinks_disable_teaming_without_fu +dvs_multiple_uplinks_disable_active_without_su Description ########### -Disabele teaming uplinks on cluster without fallback uplinks. +Disable active uplinks on cluster without standby uplinks. Complexity ########## @@ -1509,16 +1509,16 @@ core Steps ##### - 1. Launch cluster with 3 teaming uplinks. + 1. Launch cluster with 3 active uplinks. 2. Run OSTF. 3. Up instance in default net in vCenter availability zone 4. Up instance in default net in nova availability zone - 5. Disable two used teaming uplinks in vCenter. + 5. Disable two used active uplinks in vCenter. 6. Check instances are alive and functioning. 7. Run OSTF. Expected result ############### -After disabling two of three teaming uplinks instances are alive and functioning. +After disabling two of three active uplinks instances are alive and functioning. All OSTF tests passed. diff --git a/docs/user_guide/_static/settings.png b/docs/user_guide/_static/settings.png index 69d5e92..12035b4 100644 Binary files a/docs/user_guide/_static/settings.png and b/docs/user_guide/_static/settings.png differ diff --git a/docs/user_guide/config.rst b/docs/user_guide/config.rst index 0d7bb4a..1e556a5 100644 --- a/docs/user_guide/config.rst +++ b/docs/user_guide/config.rst @@ -21,7 +21,7 @@ creating an environment in Fuel and modifying the environment settings. \pagebreak -#. In the :guilabel:`Networking Setup` menu, select +3. In the :guilabel:`Networking Setup` menu, select :guilabel:`Neutron with VMware DVS`: .. figure:: _static/net.png @@ -47,24 +47,24 @@ creating an environment in Fuel and modifying the environment settings. \pagebreak -#. In the :guilabel:`Networks` tab, click :guilabel:`Other`: +6. In the :guilabel:`Networks` tab, click :guilabel:`Other`: #. Select the :guilabel:`Neutron VMware DVS ML2 plugin` checkbox. #. Specify the :guilabel:`Cluster to VDSwitch mapping`. Please notice that in the 3.1 release it has new format: #. New string is used as a delimiter between clusters. - #. There are 2 new columns: list of teaming uplinks and list of fallback + #. There are 2 new columns: list of active uplinks and list of standby uplinks. Both are optional. #. The semicolon is used as a delimiter between uplinks. #. There is no limitation for amount of uplinks. #. Thereby there are next options for a mapping-string: - #. ClusterName:VDSName:TeamingUplink1;TeamingUplink2:FallBackUplink1;FallBackUplink2 - #. ClusterName:VDSName:TeamingUplink1;TeamingUplink2;...;TeamingUplinkN + #. ClusterName:VDSName:ActiveUplink1;ActiveUplink2:StandbyUplink1;StandbyUplink2 + #. ClusterName:VDSName:ActiveUplink1;ActiveUplink2;...;ActiveUplinkN #. ClusterName:VDSName - #. There is no option to set fallback uplinks without teaming uplinks. + #. There is no option to set standby uplinks without active uplinks. #. All uplinks should be presented on real VDS. #. If you want to use security groups on your ports, select :guilabel:`Use the VMware DVS firewall driver`. @@ -82,7 +82,7 @@ creating an environment in Fuel and modifying the environment settings. \pagebreak -#. In the :guilabel:`VMware` tab, fill in the VMware configuration fields: +7. In the :guilabel:`VMware` tab, fill in the VMware configuration fields: .. figure:: _static/vmware.png :width: 90% diff --git a/docs/user_guide/install.rst b/docs/user_guide/install.rst index 309b897..c305fd6 100644 --- a/docs/user_guide/install.rst +++ b/docs/user_guide/install.rst @@ -37,7 +37,7 @@ Before you proceed with the VMware DVS plugin installation, verify that: # fuel plugins +------+--------------------------+-----------+--------------------+ - | id | name | version | package\_version | + | id | name | version | package_version | +------+--------------------------+-----------+--------------------+ | 2 | fuel-plugin-vmware-dvs | 3.1.0 | 4.0.0 | +------+--------------------------+-----------+--------------------+ diff --git a/environment_config.yaml b/environment_config.yaml index df71a5a..b4ba72c 100644 --- a/environment_config.yaml +++ b/environment_config.yaml @@ -15,7 +15,7 @@ attributes: vmware_dvs_net_maps: value: "" label: "Enter the Cluster to dvSwitch mapping." - description: "List of strings with format Cluster:VDS:Teaming1;Teaming2:Fallback1;Fallback2 where Teaming and Fallback is teaming and fallback uplinks on a VDS." + description: "List of strings with format Cluster:VDS:Active1;Active2:Standby1;Standby2 where Active and Standby is active and standby uplinks on a VDS." weight: 25 type: "textarea" regex: diff --git a/plugin_test/helpers/plugin.py b/plugin_test/helpers/plugin.py index fbeba0c..980329f 100644 --- a/plugin_test/helpers/plugin.py +++ b/plugin_test/helpers/plugin.py @@ -40,44 +40,44 @@ def install_dvs_plugin(master_node): os.path.basename(DVS_PLUGIN_PATH)) -def enable_plugin(cluster_id, fuel_web_client, multiclusters=True, tu=0, fu=0): +def enable_plugin(cluster_id, fuel_web_client, multiclusters=True, au=0, su=0): """Enable DVS plugin on cluster. :param cluster_id: cluster id :param fuel_web_client: fuel_web :param multiclusters: boolean. True if Multicluster is used. - :param tu: int, amount of teaming uplinks - :param fu: int, amount of falback uplinks + :param au: int, amount of active uplinks + :param su: int, amount of standby uplinks :return: None """ checker = fuel_web_client.check_plugin_exists(cluster_id, plugin_name) assert_true(checker, msg) - opts = {'vmware_dvs_net_maps/value': make_map_data(multiclusters, tu, fu)} + opts = {'vmware_dvs_net_maps/value': make_map_data(multiclusters, au, su)} logger.info("cluster is {0}".format(cluster_id)) fuel_web_client.update_plugin_settings(cluster_id, plugin_name, DVS_PLUGIN_VERSION, opts) -def make_map_data(multiclusters=False, tu=2, fu=1): +def make_map_data(multiclusters=False, au=2, su=1): """ Make DVS mapping data to paste it to options :param multiclusters: boolean. True if Multicluster is used. - :param tu: int, amount of teaming uplinks - :param fu: int, amount of falback uplinks + :param au: int, amount of active uplinks + :param su: int, amount of standby uplinks :return: """ - assert_true(False if fu > 0 and tu == 0 else True, - "We couldn't set Fallback uplinks " - "if amount of teaming uplinks equals zero." - "tu = {0}, fu = {1}".format(tu, fu)) + assert_true(False if su > 0 and au == 0 else True, + "We couldn't set Standby uplinks " + "if amount of Active uplinks equals zero." + "tu = {0}, fu = {1}".format(au, su)) map_sw_cl = map(lambda x, y: "{0}:{1}".format(x, y), VCENTER_CLUSTERS, DVS_SWITCHES) - if any([tu, fu]): - assert_true(tu + fu <= len(DVS_UPLINKS), 'Not enough uplinks') - data = [c + ':' + ';'.join(DVS_UPLINKS[:tu]) for c in map_sw_cl] - if fu > 0: - data = [v + ':' + ';'.join(DVS_UPLINKS[tu:tu+fu]) for v in data] + if any([au, su]): + assert_true(au + su <= len(DVS_UPLINKS), 'Not enough uplinks') + data = [c + ':' + ';'.join(DVS_UPLINKS[:au]) for c in map_sw_cl] + if su > 0: + data = [v + ':' + ';'.join(DVS_UPLINKS[au:au + su]) for v in data] return '\n'.join(data if multiclusters else data[0:1]) else: - return '\n'.join(map_sw_cl if multiclusters else map_sw_cl[0:1]) \ No newline at end of file + return '\n'.join(map_sw_cl if multiclusters else map_sw_cl[0:1]) diff --git a/plugin_test/tests/test_plugin_vmware_dvs_system.py b/plugin_test/tests/test_plugin_vmware_dvs_system.py index e36cf21..92619dd 100644 --- a/plugin_test/tests/test_plugin_vmware_dvs_system.py +++ b/plugin_test/tests/test_plugin_vmware_dvs_system.py @@ -2243,10 +2243,10 @@ class TestDVSSystem(TestBasic): assert_true(os_conn.get_network('spring')['id'] == default_net.id) @test(depends_on=[SetupEnvironment.prepare_slaves_5], - groups=["dvs_multiple_uplinks_teaming_fallback"]) + groups=["dvs_multiple_uplinks_active_standby"]) @log_snapshot_after_test - def dvs_multiple_uplinks_teaming_fallback(self): - """Launch cluster with multiple teaming and fallback uplinks. + def dvs_multiple_uplinks_active_standby(self): + """Launch cluster with multiple active and standby uplinks. Scenario: 1. Upload DVS plugin to the master node. @@ -2268,13 +2268,13 @@ class TestDVSSystem(TestBasic): 9. Configure VMware vCenter Settings. Add 2 vSphere clusters and configure Nova Compute instances on controllers and compute-vmware. 10. Enable and configure DVS plugin with multiple uplinks. - In foramt "Cluster:VDS:TU1;TU2:FU3". + In foramt "Cluster:VDS:AU1;AU2:SU3". 11. Verify networks. 12. Deploy cluster. 13. Run OSTF. Duration: 1.8 hours - Snapshot: dvs_multiple_uplinks_teaming_fallback + Snapshot: dvs_multiple_uplinks_active_standby """ self.env.revert_snapshot("ready_with_5_slaves") @@ -2310,7 +2310,7 @@ class TestDVSSystem(TestBasic): multiclusters=True) self.show_step(10) - plugin.enable_plugin(cluster_id, self.fuel_web, tu=2, fu=1) + plugin.enable_plugin(cluster_id, self.fuel_web, au=2, su=1) self.show_step(11) self.fuel_web.verify_network(cluster_id) @@ -2322,10 +2322,10 @@ class TestDVSSystem(TestBasic): self.fuel_web.run_ostf(cluster_id=cluster_id, test_sets=['smoke']) @test(depends_on=[SetupEnvironment.prepare_slaves_5], - groups=["dvs_multiple_uplinks_teaming"]) + groups=["dvs_multiple_uplinks_active"]) @log_snapshot_after_test - def dvs_multiple_uplinks_teaming(self): - """Launch cluster with multiple teaming uplinks. + def dvs_multiple_uplinks_active(self): + """Launch cluster with multiple active uplinks. Scenario: 1. Upload DVS plugin to the master node. @@ -2347,13 +2347,13 @@ class TestDVSSystem(TestBasic): 9. Configure VMware vCenter Settings. Add 2 vSphere clusters and configure Nova Compute instances on controllers and compute-vmware. 10. Enable and configure DVS plugin with multiple uplinks. - In format "Cluster:VDS:TU1;TU2;TU3". + In format "Cluster:VDS:AU1;AU2;SU3". 11. Verify networks. 12. Deploy cluster. 13. Run OSTF. Duration: 1.8 hours - Snapshot: dvs_multiple_uplinks_teaming + Snapshot: dvs_multiple_uplinks_active """ self.env.revert_snapshot("ready_with_5_slaves") @@ -2389,7 +2389,7 @@ class TestDVSSystem(TestBasic): multiclusters=True) self.show_step(10) - plugin.enable_plugin(cluster_id, self.fuel_web, tu=3, fu=0) + plugin.enable_plugin(cluster_id, self.fuel_web, au=3, su=0) self.show_step(11) self.fuel_web.verify_network(cluster_id)