Browse Source

Rename teaming and fallback uplinks

TeamingUplink was renamed to ActiveUplink, FallbackUplink was
renamed to StandbyUplink due to VMware terminology.

Rename affected tests (plans, test groups, automation) and
UI (description string).

Change-Id: Ie251ae6f6bba7a70c79ccbcbf56aa325eb937c80
ekhomyakova 2 years ago
parent
commit
6bdcf4939e

+ 1
- 1
docs/test_plan/source/test_suite_smoke.rst View File

@@ -107,7 +107,7 @@ Steps
107 107
     3. Go to Network tab -> Other subtab and check DVS plugin section is displayed with all required GUI elements:
108 108
        'Neutron VMware DVS ML2 plugin' checkbox
109 109
        'Use the VMware DVS firewall driver' checkbox
110
-       'Enter the cluster to dvSwitch mapping.' text field with description 'List of strings with format ClusterName:dvSwitchName:TeamingUplink1;TeamingUplink2:FallbackUplink1;FallbackUplink2.'
110
+       'Enter the cluster to dvSwitch mapping.' text field with description 'List of strings with format ClusterName:dvSwitchName:ActiveUplink1;ActiveUplink2:StandbyUplink1;StandbyUplink2.'
111 111
        'Versions' radio button with <plugin version>
112 112
     4. Verify that checkbox 'Neutron VMware DVS ML2 plugin' is enabled by default.
113 113
     5. Verify that user can disable/enable the DVS plugin by clicking on the checkbox 'Neutron VMware DVS ML2 plugin'.

+ 25
- 25
docs/test_plan/source/test_suite_system.rst View File

@@ -1349,18 +1349,18 @@ Cluster is deployed successfully and all OSTF tests are passed.
1349 1349
 CA file was uploaded on all nodes with DVS agents and 'insecure' option for dvs agents is set to False.
1350 1350
 
1351 1351
 
1352
-Launch cluster with multiple teaming uplinks.
1353
----------------------------------------------
1352
+Launch cluster with multiple active uplinks.
1353
+--------------------------------------------
1354 1354
 
1355 1355
 ID
1356 1356
 ##
1357 1357
 
1358
-dvs_multiple_uplinks_teaming
1358
+dvs_multiple_uplinks_active
1359 1359
 
1360 1360
 Description
1361 1361
 ###########
1362 1362
 
1363
-Launch cluster with multiple teaming uplinks.
1363
+Launch cluster with multiple active uplinks.
1364 1364
 
1365 1365
 Complexity
1366 1366
 ##########
@@ -1384,7 +1384,7 @@ Steps
1384 1384
     4. Configure interfaces on nodes.
1385 1385
     5. Configure network settings.
1386 1386
     6. Enable and configure DVS plugin with multiple uplinks.
1387
-       In format "Cluster:VDS:TU1;TU2;TU3".
1387
+       In format "Cluster:VDS:AU1;AU2;AU3".
1388 1388
     7. Enable VMware vCenter/ESXi datastore for images (Glance).
1389 1389
     8. Configure VMware vCenter Settings. Add 2 vSphere clusters and configure
1390 1390
        Nova Compute instances on controllers and compute-vmware.
@@ -1398,18 +1398,18 @@ Expected result
1398 1398
 Cluster is deployed successfully and all OSTF tests are passed.
1399 1399
 
1400 1400
 
1401
-Launch cluster with multiple teaming and fallback uplniks.
1402
-----------------------------------------------------------
1401
+Launch cluster with multiple active and standby uplniks.
1402
+--------------------------------------------------------
1403 1403
 
1404 1404
 ID
1405 1405
 ##
1406 1406
 
1407
-dvs_multiple_uplinks_teaming_fallback
1407
+dvs_multiple_uplinks_active_standby
1408 1408
 
1409 1409
 Description
1410 1410
 ###########
1411 1411
 
1412
-Launch cluster with multiple teaming and fallback uplinks.
1412
+Launch cluster with multiple active and standby uplinks.
1413 1413
 
1414 1414
 Complexity
1415 1415
 ##########
@@ -1433,7 +1433,7 @@ Steps
1433 1433
     4. Configure interfaces on nodes.
1434 1434
     5. Configure network settings.
1435 1435
     6. Enable and configure DVS plugin with multiple uplinks.
1436
-       In foramt "Cluster:VDS:TU1;TU2:FU3".
1436
+       In foramt "Cluster:VDS:AU1;AU2:SU3".
1437 1437
     7. Enable VMware vCenter/ESXi datastore for images (Glance).
1438 1438
     8. Configure VMware vCenter Settings. Add 2 vSphere clusters and configure
1439 1439
        Nova Compute instances on controllers and compute-vmware.
@@ -1448,19 +1448,19 @@ Cluster is deployed successfully and all OSTF tests are passed.
1448 1448
 
1449 1449
 
1450 1450
 
1451
-Disable teaming uplinks.
1452
-------------------------
1451
+Disable active uplinks.
1452
+-----------------------
1453 1453
 
1454 1454
 
1455 1455
 ID
1456 1456
 ##
1457 1457
 
1458
-dvs_multiple_uplinks_disable_teaming
1458
+dvs_multiple_uplinks_disable_active
1459 1459
 
1460 1460
 Description
1461 1461
 ###########
1462 1462
 
1463
-Disable teaming uplinks.
1463
+Disable active uplinks.
1464 1464
 
1465 1465
 Complexity
1466 1466
 ##########
@@ -1470,36 +1470,36 @@ core
1470 1470
 Steps
1471 1471
 #####
1472 1472
 
1473
-    1. Launch cluster with 2 teaming and 1 fallback uplinks.
1473
+    1. Launch cluster with 2 active and 1 standby uplinks.
1474 1474
     2. Run OSTF.
1475 1475
     3. Up instance in default net in vCenter availability zone
1476 1476
     4. Up instance in default net in nova availability zone
1477
-    5. Disable first teaming uplink in vCenter.
1477
+    5. Disable first active uplink in vCenter.
1478 1478
     6. Check instances are alive and functioning.
1479
-    7. Disable all teaming uplinks in vCenter.
1479
+    7. Disable all active uplinks in vCenter.
1480 1480
     8. Check instances are alive and functioning.
1481 1481
     9. Run OSTF.
1482 1482
 
1483 1483
 Expected result
1484 1484
 ###############
1485 1485
 
1486
-After disabling teaming uplinks instances are alive and functioning.
1486
+After disabling active uplinks instances are alive and functioning.
1487 1487
 All OSTF tests passed.
1488 1488
 
1489 1489
 
1490
-Disabele teaming uplinks on cluster without fallback uplinks.
1491
--------------------------------------------------------------
1490
+Disable active uplinks on cluster without standby uplinks.
1491
+----------------------------------------------------------
1492 1492
 
1493 1493
 
1494 1494
 ID
1495 1495
 ##
1496 1496
 
1497
-dvs_multiple_uplinks_disable_teaming_without_fu
1497
+dvs_multiple_uplinks_disable_active_without_su
1498 1498
 
1499 1499
 Description
1500 1500
 ###########
1501 1501
 
1502
-Disabele teaming uplinks on cluster without fallback uplinks.
1502
+Disable active uplinks on cluster without standby uplinks.
1503 1503
 
1504 1504
 Complexity
1505 1505
 ##########
@@ -1509,16 +1509,16 @@ core
1509 1509
 Steps
1510 1510
 #####
1511 1511
 
1512
-    1. Launch cluster with 3 teaming uplinks.
1512
+    1. Launch cluster with 3 active uplinks.
1513 1513
     2. Run OSTF.
1514 1514
     3. Up instance in default net in vCenter availability zone
1515 1515
     4. Up instance in default net in nova availability zone
1516
-    5. Disable two used teaming uplinks in vCenter.
1516
+    5. Disable two used active uplinks in vCenter.
1517 1517
     6. Check instances are alive and functioning.
1518 1518
     7. Run OSTF.
1519 1519
 
1520 1520
 Expected result
1521 1521
 ###############
1522 1522
 
1523
-After disabling two of three teaming uplinks instances are alive and functioning.
1523
+After disabling two of three active uplinks instances are alive and functioning.
1524 1524
 All OSTF tests passed.

BIN
docs/user_guide/_static/settings.png View File


+ 7
- 7
docs/user_guide/config.rst View File

@@ -21,7 +21,7 @@ creating an environment in Fuel and modifying the environment settings.
21 21
 
22 22
    \pagebreak
23 23
 
24
-#. In the :guilabel:`Networking Setup` menu, select
24
+3. In the :guilabel:`Networking Setup` menu, select
25 25
    :guilabel:`Neutron with VMware DVS`:
26 26
 
27 27
    .. figure:: _static/net.png
@@ -47,24 +47,24 @@ creating an environment in Fuel and modifying the environment settings.
47 47
 
48 48
    \pagebreak
49 49
 
50
-#. In the :guilabel:`Networks` tab, click :guilabel:`Other`:
50
+6. In the :guilabel:`Networks` tab, click :guilabel:`Other`:
51 51
 
52 52
    #. Select the :guilabel:`Neutron VMware DVS ML2 plugin` checkbox.
53 53
    #. Specify the :guilabel:`Cluster to VDSwitch mapping`. Please notice that
54 54
       in the 3.1 release it has new format:
55 55
 
56 56
       #. New string is used as a delimiter between clusters.
57
-      #. There are 2 new columns: list of teaming uplinks and list of fallback
57
+      #. There are 2 new columns: list of active uplinks and list of standby
58 58
          uplinks. Both are optional.
59 59
       #. The semicolon is used as a delimiter between uplinks.
60 60
       #. There is no limitation for amount of uplinks.
61 61
       #. Thereby there are next options for a mapping-string:
62 62
 
63
-         #. ClusterName:VDSName:TeamingUplink1;TeamingUplink2:FallBackUplink1;FallBackUplink2
64
-         #. ClusterName:VDSName:TeamingUplink1;TeamingUplink2;...;TeamingUplinkN
63
+         #. ClusterName:VDSName:ActiveUplink1;ActiveUplink2:StandbyUplink1;StandbyUplink2
64
+         #. ClusterName:VDSName:ActiveUplink1;ActiveUplink2;...;ActiveUplinkN
65 65
          #. ClusterName:VDSName
66 66
 
67
-      #. There is no option to set fallback uplinks without teaming uplinks.
67
+      #. There is no option to set standby uplinks without active uplinks.
68 68
       #. All uplinks should be presented on real VDS.
69 69
    #. If you want to use security groups on your ports, select
70 70
       :guilabel:`Use the VMware DVS firewall driver`.
@@ -82,7 +82,7 @@ creating an environment in Fuel and modifying the environment settings.
82 82
 
83 83
    \pagebreak
84 84
 
85
-#. In the :guilabel:`VMware` tab, fill in the VMware configuration fields:
85
+7. In the :guilabel:`VMware` tab, fill in the VMware configuration fields:
86 86
 
87 87
    .. figure:: _static/vmware.png
88 88
       :width: 90%

+ 1
- 1
docs/user_guide/install.rst View File

@@ -37,7 +37,7 @@ Before you proceed with the VMware DVS plugin installation, verify that:
37 37
      # fuel plugins
38 38
 
39 39
      +------+--------------------------+-----------+--------------------+
40
-     | id   | name                     | version   | package\_version   |
40
+     | id   | name                     | version   | package_version    |
41 41
      +------+--------------------------+-----------+--------------------+
42 42
      | 2    | fuel-plugin-vmware-dvs   | 3.1.0     | 4.0.0              |
43 43
      +------+--------------------------+-----------+--------------------+

+ 1
- 1
environment_config.yaml View File

@@ -15,7 +15,7 @@ attributes:
15 15
   vmware_dvs_net_maps:
16 16
     value: ""
17 17
     label: "Enter the Cluster to dvSwitch mapping."
18
-    description: "List of strings with format Cluster:VDS:Teaming1;Teaming2:Fallback1;Fallback2 where Teaming and Fallback is teaming and fallback uplinks on a VDS."
18
+    description: "List of strings with format Cluster:VDS:Active1;Active2:Standby1;Standby2 where Active and Standby is active and standby uplinks on a VDS."
19 19
     weight: 25
20 20
     type: "textarea"
21 21
     regex:

+ 17
- 17
plugin_test/helpers/plugin.py View File

@@ -40,44 +40,44 @@ def install_dvs_plugin(master_node):
40 40
                                     os.path.basename(DVS_PLUGIN_PATH))
41 41
 
42 42
 
43
-def enable_plugin(cluster_id, fuel_web_client, multiclusters=True, tu=0, fu=0):
43
+def enable_plugin(cluster_id, fuel_web_client, multiclusters=True, au=0, su=0):
44 44
     """Enable DVS plugin on cluster.
45 45
 
46 46
     :param cluster_id: cluster id
47 47
     :param fuel_web_client: fuel_web
48 48
     :param multiclusters: boolean. True if Multicluster is used.
49
-    :param tu: int, amount of teaming uplinks
50
-    :param fu: int, amount of falback uplinks
49
+    :param au: int, amount of active uplinks
50
+    :param su: int, amount of standby uplinks
51 51
     :return: None
52 52
     """
53 53
     checker = fuel_web_client.check_plugin_exists(cluster_id, plugin_name)
54 54
     assert_true(checker, msg)
55
-    opts = {'vmware_dvs_net_maps/value': make_map_data(multiclusters, tu, fu)}
55
+    opts = {'vmware_dvs_net_maps/value': make_map_data(multiclusters, au, su)}
56 56
     logger.info("cluster is {0}".format(cluster_id))
57 57
     fuel_web_client.update_plugin_settings(cluster_id, plugin_name,
58 58
                                            DVS_PLUGIN_VERSION, opts)
59 59
 
60 60
 
61
-def make_map_data(multiclusters=False, tu=2, fu=1):
61
+def make_map_data(multiclusters=False, au=2, su=1):
62 62
     """ Make DVS mapping data to paste it to options
63 63
 
64 64
     :param multiclusters: boolean. True if Multicluster is used.
65
-    :param tu: int, amount of teaming uplinks
66
-    :param fu: int, amount of falback uplinks
65
+    :param au: int, amount of active uplinks
66
+    :param su: int, amount of standby uplinks
67 67
     :return:
68 68
     """
69
-    assert_true(False if fu > 0 and tu == 0 else True,
70
-                "We couldn't set Fallback uplinks "
71
-                "if amount of teaming uplinks equals zero."
72
-                "tu = {0}, fu = {1}".format(tu, fu))
69
+    assert_true(False if su > 0 and au == 0 else True,
70
+                "We couldn't set Standby uplinks "
71
+                "if amount of Active uplinks equals zero."
72
+                "tu = {0}, fu = {1}".format(au, su))
73 73
 
74 74
     map_sw_cl = map(lambda x, y: "{0}:{1}".format(x, y),
75 75
                     VCENTER_CLUSTERS, DVS_SWITCHES)
76
-    if any([tu, fu]):
77
-        assert_true(tu + fu <= len(DVS_UPLINKS), 'Not enough uplinks')
78
-        data = [c + ':' + ';'.join(DVS_UPLINKS[:tu]) for c in map_sw_cl]
79
-        if fu > 0:
80
-            data = [v + ':' + ';'.join(DVS_UPLINKS[tu:tu+fu]) for v in data]
76
+    if any([au, su]):
77
+        assert_true(au + su <= len(DVS_UPLINKS), 'Not enough uplinks')
78
+        data = [c + ':' + ';'.join(DVS_UPLINKS[:au]) for c in map_sw_cl]
79
+        if su > 0:
80
+            data = [v + ':' + ';'.join(DVS_UPLINKS[au:au + su]) for v in data]
81 81
         return '\n'.join(data if multiclusters else data[0:1])
82 82
     else:
83
-        return '\n'.join(map_sw_cl if multiclusters else map_sw_cl[0:1])
83
+        return '\n'.join(map_sw_cl if multiclusters else map_sw_cl[0:1])

+ 12
- 12
plugin_test/tests/test_plugin_vmware_dvs_system.py View File

@@ -2243,10 +2243,10 @@ class TestDVSSystem(TestBasic):
2243 2243
         assert_true(os_conn.get_network('spring')['id'] == default_net.id)
2244 2244
 
2245 2245
     @test(depends_on=[SetupEnvironment.prepare_slaves_5],
2246
-          groups=["dvs_multiple_uplinks_teaming_fallback"])
2246
+          groups=["dvs_multiple_uplinks_active_standby"])
2247 2247
     @log_snapshot_after_test
2248
-    def dvs_multiple_uplinks_teaming_fallback(self):
2249
-        """Launch cluster with multiple teaming and fallback uplinks.
2248
+    def dvs_multiple_uplinks_active_standby(self):
2249
+        """Launch cluster with multiple active and standby uplinks.
2250 2250
 
2251 2251
         Scenario:
2252 2252
             1. Upload DVS plugin to the master node.
@@ -2268,13 +2268,13 @@ class TestDVSSystem(TestBasic):
2268 2268
             9. Configure VMware vCenter Settings. Add 2 vSphere clusters and configure
2269 2269
                Nova Compute instances on controllers and compute-vmware.
2270 2270
             10. Enable and configure DVS plugin with multiple uplinks.
2271
-                In foramt "Cluster:VDS:TU1;TU2:FU3".
2271
+                In foramt "Cluster:VDS:AU1;AU2:SU3".
2272 2272
             11. Verify networks.
2273 2273
             12. Deploy cluster.
2274 2274
             13. Run OSTF.
2275 2275
 
2276 2276
         Duration: 1.8 hours
2277
-        Snapshot: dvs_multiple_uplinks_teaming_fallback
2277
+        Snapshot: dvs_multiple_uplinks_active_standby
2278 2278
 
2279 2279
         """
2280 2280
         self.env.revert_snapshot("ready_with_5_slaves")
@@ -2310,7 +2310,7 @@ class TestDVSSystem(TestBasic):
2310 2310
             multiclusters=True)
2311 2311
 
2312 2312
         self.show_step(10)
2313
-        plugin.enable_plugin(cluster_id, self.fuel_web, tu=2, fu=1)
2313
+        plugin.enable_plugin(cluster_id, self.fuel_web, au=2, su=1)
2314 2314
 
2315 2315
         self.show_step(11)
2316 2316
         self.fuel_web.verify_network(cluster_id)
@@ -2322,10 +2322,10 @@ class TestDVSSystem(TestBasic):
2322 2322
         self.fuel_web.run_ostf(cluster_id=cluster_id, test_sets=['smoke'])
2323 2323
 
2324 2324
     @test(depends_on=[SetupEnvironment.prepare_slaves_5],
2325
-          groups=["dvs_multiple_uplinks_teaming"])
2325
+          groups=["dvs_multiple_uplinks_active"])
2326 2326
     @log_snapshot_after_test
2327
-    def dvs_multiple_uplinks_teaming(self):
2328
-        """Launch cluster with multiple teaming uplinks.
2327
+    def dvs_multiple_uplinks_active(self):
2328
+        """Launch cluster with multiple active uplinks.
2329 2329
 
2330 2330
         Scenario:
2331 2331
             1. Upload DVS plugin to the master node.
@@ -2347,13 +2347,13 @@ class TestDVSSystem(TestBasic):
2347 2347
             9. Configure VMware vCenter Settings. Add 2 vSphere clusters and configure
2348 2348
                Nova Compute instances on controllers and compute-vmware.
2349 2349
             10. Enable and configure DVS plugin with multiple uplinks.
2350
-                In format "Cluster:VDS:TU1;TU2;TU3".
2350
+                In format "Cluster:VDS:AU1;AU2;SU3".
2351 2351
             11. Verify networks.
2352 2352
             12. Deploy cluster.
2353 2353
             13. Run OSTF.
2354 2354
 
2355 2355
         Duration: 1.8 hours
2356
-        Snapshot: dvs_multiple_uplinks_teaming
2356
+        Snapshot: dvs_multiple_uplinks_active
2357 2357
 
2358 2358
         """
2359 2359
         self.env.revert_snapshot("ready_with_5_slaves")
@@ -2389,7 +2389,7 @@ class TestDVSSystem(TestBasic):
2389 2389
             multiclusters=True)
2390 2390
 
2391 2391
         self.show_step(10)
2392
-        plugin.enable_plugin(cluster_id, self.fuel_web, tu=3, fu=0)
2392
+        plugin.enable_plugin(cluster_id, self.fuel_web, au=3, su=0)
2393 2393
 
2394 2394
         self.show_step(11)
2395 2395
         self.fuel_web.verify_network(cluster_id)

Loading…
Cancel
Save