Merge pull request #520 from caphrim007/bugfix.the-gtm-tests-were-broken

Fixes the gtm tests and gtm code

Author: zancas

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}

f5/bigip/tm/net/__init__.py

@@ -35,7 +35,7 @@
 from f5.bigip.tm.net.route import Routes
 from f5.bigip.tm.net.route_domain import Route_Domains
 from f5.bigip.tm.net.selfip import Selfips
-from f5.bigip.tm.net.tunnels import TunnelS
+from f5.bigip.tm.net.tunnels import Tunnels_s
 from f5.bigip.tm.net.vlan import Vlans
 
 
@@ -50,6 +50,6 @@ def __init__(self, tm):
             Routes,
             Route_Domains,
             Selfips,
-            TunnelS,
+            Tunnels_s,
             Vlans
         ]

f5/bigip/tm/net/tunnels.py

@@ -28,14 +28,13 @@
 """
 
 from f5.bigip.resource import Collection
-from f5.bigip.resource import OrganizingCollection
 from f5.bigip.resource import Resource
 
 
-class TunnelS(OrganizingCollection):
+class Tunnels_s(Collection):
     """BIG-IP® network tunnels collection"""
     def __init__(self, net):
-        super(TunnelS, self).__init__(net)
+        super(Tunnels_s, self).__init__(net)
         self._meta_data['allowed_lazy_attributes'] = [
             Gres,
             Tunnels,
@@ -45,8 +44,8 @@ def __init__(self, net):
 
 class Tunnels(Collection):
     """BIG-IP® network tunnels resource (collection for GRE, Tunnel, VXLANs"""
-    def __init__(self, tunnels):
-        super(Tunnels, self).__init__(tunnels)
+    def __init__(self, tunnels_s):
+        super(Tunnels, self).__init__(tunnels_s)
         self._meta_data['allowed_lazy_attributes'] = [Gres, Tunnel, Vxlans]
         self._meta_data['attribute_registry'] =\
             {'tm:net:tunnels:tunnel:tunnelstate': Tunnel}

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)

test/functional/tm/net/test_tunnels.py

@@ -32,7 +32,7 @@ def teardown():
         delete_resource(tunnel)
     request.addfinalizer(teardown)
 
-    tunnel = bigip.net.tunnels.tunnels.tunnel.create(
+    tunnel = bigip.net.tunnels_s.tunnels.tunnel.create(
         name=name, partition=partition, localAddress=ip, profile=profile)
     return tunnel
 
@@ -42,7 +42,7 @@ def teardown():
         delete_resource(gre)
     request.addfinalizer(teardown)
 
-    gre = bigip.net.tunnels.gres.gre.create(
+    gre = bigip.net.tunnels_s.gres.gre.create(
         name=name, partition=partition)
     return gre
 
@@ -52,14 +52,14 @@ def teardown():
         delete_resource(vxlan)
     request.addfinalizer(teardown)
 
-    vxlan = bigip.net.tunnels.vxlans.vxlan.create(
+    vxlan = bigip.net.tunnels_s.vxlans.vxlan.create(
         name=name, partition=partition)
     return vxlan
 
 
 class TestTunnels(object):
     def test_tunnel_list(self, bigip):
-        tunnels = bigip.net.tunnels.tunnels.get_collection()
+        tunnels = bigip.net.tunnels_s.tunnels.get_collection()
         assert len(tunnels)
         for tunnel in tunnels:
             assert tunnel.generation
@@ -74,7 +74,7 @@ def test_tunnel_CURDL(self, request, bigip):
         )
 
         # Load
-        t2 = bigip.net.tunnels.tunnels.tunnel.load(
+        t2 = bigip.net.tunnels_s.tunnels.tunnel.load(
             name='tunnel-test', partition='Common')
         assert t1.name == 'tunnel-test'
         assert t1.name == t2.name
@@ -99,7 +99,7 @@ def test_gre_CURDL(self, request, bigip):
         assert g1.name == 'gre-test'
 
         # Load
-        g2 = bigip.net.tunnels.gres.gre.load(
+        g2 = bigip.net.tunnels_s.gres.gre.load(
             name='gre-test', partition='Common')
         assert g1.name == g2.name
         assert g1.generation == g2.generation
@@ -123,7 +123,7 @@ def test_vxlan_CURDL(self, request, bigip):
         assert vx1.name == 'vxlan-test'
 
         # Load
-        vx2 = bigip.net.tunnels.vxlans.vxlan.load(
+        vx2 = bigip.net.tunnels_s.vxlans.vxlan.load(
             name='vxlan-test', partition='Common')
         assert vx1.name == vx2.name
         assert vx1.generation == vx2.generation