Functional test fixups for scale_up and scale_down.

Author: Paul Breaux

f5/multi_device/cluster/__init__.py

@@ -46,6 +46,36 @@
     * ClusterManager -- manages a cluster of devices with the methods above
     * TrustDomain -- manages the trust domain for a cluster
     * DeviceGroup -- manages the device group for a cluster
+
+Usage:
+
+There are two major use-cases here:
+
+    * Manage an existing cluster:
+
+        list_of_bigips = [ManagementRoot(...), ManagementRoot(...)]
+        cluster_mgr = ClusterManager(
+                            devices=list_of_bigips,
+                            device_group_name='my_cluster',
+                            device_group_type='sync-failover',
+                            device_group_partition='Common'
+                        )
+        new_bigip_device = ManagementRoot(...)
+        cluster_mgr.scale_up_by_one(new_bigip_device)
+        list_of_bigips.append(new_bigip_device)
+        assert cluster_mgr.cluster.devices == list_of_bigips
+
+    * Create a new cluster and manage it:
+
+        list_of_bigips = [ManagementRoot(...), ManagementRoot(...)]
+        cluster_mgr = ClusterManager()
+        cluster_mgr.create(
+                    devices=list_of_bigips,
+                    device_group_name='my_cluster',
+                    device_group_type='sync-failover',
+                    device_group_partition='Common
+                )
+        assert cluster_mgr.cluster.devices == list_of_bigips
 '''
 
 from f5.sdk_exception import F5SDKError

f5/utils/mixins.py

@@ -76,22 +76,6 @@ def teardown_cluster():
     request.addfinalizer(teardown_cluster)
 
 
-def test_existing_failover_cluster(BigIPSetup):
-    a, b, = BigIPSetup
-    bigip_list = [a, b]
-
-    cm = ClusterManager(
-        devices=bigip_list,
-        device_group_name=DEVICE_GROUP_NAME,
-        device_group_partition=PARTITION,
-        device_group_type='sync-failover'
-    )
-    assert cm.cluster.devices == bigip_list
-    assert cm.cluster.device_group_name == DEVICE_GROUP_NAME
-    assert cm.cluster.device_group_type == 'sync-failover'
-    assert cm.cluster.device_group_partition == PARTITION
-
-
 def test_new_failover_cluster_two_member(BigIPSetup):
     a, b, c = BigIPSetup
     bigip_list = [a, b]
@@ -143,7 +127,7 @@ def test_scale_up_sync_failover(BigIPSetup, ThreeBigIPTeardownSyncFailover):
               'device_group_partition': PARTITION,
               'device_group_type': 'sync-failover'}
     cm.create(**kwargs)
-    cm.scale_up(c)
+    cm.scale_up_by_one(c)
 
 
 def test_scale_up_down_up_down_sync_failover(
@@ -157,5 +141,5 @@ def test_scale_up_down_up_down_sync_failover(
               'device_group_type': 'sync-failover'}
     cm.create(**kwargs)
     for x in range(3):
-        cm.scale_up(c)
-        cm.scale_down(c)
+        cm.scale_up_by_one(c)
+        cm.scale_down_by_one(c)