Fixes the gtm tests and gtm code

Issues:
Fixes #519

Problem:
When the alias changes were added, GTM datacenter and rule classes
were passed over. This patch fixes those classes

Analysis:
The classes were not using load and create correctly.

Tests:
Existing tests

Author: caphrim007

f5/bigip/tm/gtm/datacenter.py

@@ -128,15 +128,15 @@ def create(self, **kwargs):
         if 'disabled' in kwargs and kwargs['disabled']:
             del kwargs['enabled']
 
-        self._create(**kwargs)
-        self._endis_attrs()
-        return self
+        inst = self._create(**kwargs)
+        inst._endis_attrs()
+        return inst
 
     def load(self, **kwargs):
         kwargs = self._endis_able(kwargs)
-        self._load(**kwargs)
-        self._endis_attrs()
-        return self
+        inst = self._load(**kwargs)
+        inst._endis_attrs()
+        return inst
 
     def refresh(self, **kwargs):
         kwargs = self._endis_able(kwargs)

f5/bigip/tm/gtm/rule.py

@@ -33,8 +33,8 @@
 
 class Rules(Collection):
     """BIG-IP® GTM rule collection"""
-    def __init__(self, ltm):
-        super(Rules, self).__init__(ltm)
+    def __init__(self, gtm):
+        super(Rules, self).__init__(gtm)
         self._meta_data['allowed_lazy_attributes'] = [Rule]
         self._meta_data['attribute_registry'] =\
             {'tm:gtm:rule:rulestate': Rule}

test/functional/tm/gtm/test_datacenter.py

@@ -19,19 +19,17 @@
 from f5.bigip.tm.gtm.datacenter import Datacenter
 from requests.exceptions import HTTPError
 
-pytestmark = pytest.mark.skipif(
-    True, reason='these tests require the optional gtm module')
-
 
 def delete_dc(mgmt_root, name, partition):
-    r = mgmt_root.tm.gtm.datacenters.datacenter
     try:
-        r.load(name=name, partition=partition)
+        foo = mgmt_root.tm.gtm.datacenters.datacenter.load(
+            name=name, partition=partition
+        )
     except HTTPError as err:
         if err.response.status_code != 404:
             raise
         return
-    r.delete()
+    foo.delete()
 
 
 def setup_create_test(request, mgmt_root, name, partition):
@@ -81,7 +79,7 @@ def test_create_optional_args(self, request, mgmt_root):
         assert "Between the earth and the moon" == dc1.location
 
     def test_create_duplicate(self, request, mgmt_root):
-        setup_create_test(request, mgmt_root, 'dc1', 'Common')
+        setup_basic_test(request, mgmt_root, 'dc1', 'Common')
         with pytest.raises(HTTPError) as err:
             mgmt_root.tm.gtm.datacenters.datacenter.create(
                 name='dc1', partition='Common')

test/functional/tm/gtm/test_rule.py

@@ -19,9 +19,6 @@
 from f5.bigip.tm.gtm.rule import Rule
 from requests.exceptions import HTTPError
 
-pytestmark = pytest.mark.skipif(
-    True, reason='these tests require the optional gtm module')
-
 
 RULE = '''when LB_SELECTED {
    set wipHost [LB::server addr]
@@ -30,14 +27,13 @@
 
 
 def delete_rule(mgmt_root, name, partition):
-    r = mgmt_root.tm.gtm.rules.rule
     try:
-        r.load(name=name, partition=partition)
+        foo = mgmt_root.tm.gtm.rules.rule.load(name=name, partition=partition)
     except HTTPError as err:
         if err.response.status_code != 404:
             raise
         return
-    r.delete()
+    foo.delete()
 
 
 def setup_create_test(request, mgmt_root, name, partition):
@@ -50,8 +46,9 @@ def setup_basic_test(request, mgmt_root, name, partition):
     def teardown():
         delete_rule(mgmt_root, name, partition)
 
-    rule1 = mgmt_root.tm.gtm.rules.rule
-    rule1.create(name=name, partition=partition, apiAnonymous=RULE)
+    rule1 = mgmt_root.tm.gtm.rules.rule.create(
+        name=name, partition=partition, apiAnonymous=RULE
+    )
     request.addfinalizer(teardown)
     return rule1
 
@@ -69,8 +66,10 @@ def test_create_no_apianonymous(self, mgmt_root):
 
     def test_create(self, request, mgmt_root):
         setup_create_test(request, mgmt_root, 'rule1', 'Common')
-        rule1 = mgmt_root.tm.gtm.rules.rule
-        rule1.create(name='rule1', partition='Common', apiAnonymous=RULE)
+
+        rule1 = mgmt_root.tm.gtm.rules.rule.create(
+            name='rule1', partition='Common', apiAnonymous=RULE
+        )
         assert rule1.name == 'rule1'
         assert rule1.partition == 'Common'
         assert rule1.generation and isinstance(rule1.generation, int)
@@ -82,10 +81,11 @@ def test_create(self, request, mgmt_root):
 
     def test_create_optional_args(self, request, mgmt_root):
         setup_create_test(request, mgmt_root, 'rule1', 'Common')
-        rule1 = mgmt_root.tm.gtm.rules.rule
-        rule1.create(name='rule1', partition='Common',
-                     apiAnonymous=RULE,
-                     check='syntax')
+
+        rule1 = mgmt_root.tm.gtm.rules.rule.create(
+            name='rule1', partition='Common',
+            apiAnonymous=RULE, check='syntax'
+        )
         assert 'check syntax' in rule1.apiAnonymous
 
     def test_create_duplicate(self, request, mgmt_root):
@@ -164,8 +164,10 @@ def test_delete(self, request, mgmt_root):
 class TestRuleCollection(object):
     def test_rule_collection(self, request, mgmt_root):
         setup_create_test(request, mgmt_root, 'rule1', 'Common')
-        rule1 = mgmt_root.tm.gtm.rules.rule
-        rule1.create(name='rule1', partition='Common', apiAnonymous=RULE)
+
+        rule1 = mgmt_root.tm.gtm.rules.rule.create(
+            name='rule1', partition='Common', apiAnonymous=RULE
+        )
         assert rule1.name == 'rule1'
         assert rule1.partition == 'Common'
         assert rule1.generation and isinstance(rule1.generation, int)