Merge pull request #1350 from jasonrahm/enh.fdb_tunnel_records

Fixes Issue #1348 - Adds records subcollections for fdb tunnels

Author: caphrim007

f5/bigip/tm/net/fdb.py

@@ -38,17 +38,19 @@ class Fdb(OrganizingCollection):
     def __init__(self, net):
         super(Fdb, self).__init__(net)
         self._meta_data['allowed_lazy_attributes'] = [Tunnels]
-        self._meta_data['icontrol_version'] = '11.5.0'
+        # self._meta_data['icontrol_version'] = '11.5.0'
 
 
 class Tunnel(Resource):
     """BIG-IP® Tunnel resource."""
     def __init__(self, Tunnels):
         super(Tunnel, self).__init__(Tunnels)
         self._meta_data['required_json_kind'] = "tm:net:fdb:tunnel:tunnelstate"
+        self._meta_data['attribute_registry'] = {
+            'tm:net:fdb:tunnel:records:recordscollectionstate': Records_s}
         # Setting this here to be explicit, even though it is set via
         # the super call from its containing object.
-        self._meta_data['icontrol_version'] = '11.5.0'
+        # self._meta_data['icontrol_version'] = '11.5.0'
 
 
 class Tunnels(Collection):
@@ -60,4 +62,24 @@ def __init__(self, fdb):
             {'tm:net:fdb:tunnel:tunnelstate': Tunnel}
         # Setting this here to be explicit, even though it is set via
         # the super call from its containing object.
-        self._meta_data['icontrol_version'] = '11.5.0'
+        # self._meta_data['icontrol_version'] = '11.5.0'
+
+
+class Records_s(Collection):
+    """BIG-IP® Tunnel records collection."""
+    def __init__(self, tunnel):
+        super(Records_s, self).__init__(tunnel)
+        self._meta_data['allowed_lazy_attributes'] = [Records]
+        self._meta_data['required_json_kind'] =\
+            'tm:net:fdb:tunnel:records:recordscollectionstate'
+        self._meta_data['attribute_registry'] =\
+            {'tm:net:fdb:tunnel:records:recordsstate': Records}
+
+
+class Records(Resource):
+    """BIG-IP® LTM pool members sub-collection resource"""
+    def __init__(self, records_s):
+        super(Records, self).__init__(records_s)
+        self._meta_data['required_json_kind'] =\
+            'tm:net:fdb:tunnel:records:recordsstate'
+        self._meta_data['required_creation_parameters'].update(('name',))

f5/bigip/tm/net/test/functional/test_fdb.py

@@ -42,18 +42,18 @@ def test_tunnel_exists_load_update_refresh(mgmt_root):
     assert 'records' not in http_tunnel.__dict__
 
 
-@pytest.mark.skipif(
-    LooseVersion(pytest.config.getoption('--release')) < LooseVersion(
-        '12.1.0'), reason='This test is for 12.1.0 or greater.')
-def test_tunnel_exists_load_update_refresh_v12_1(mgmt_root):
-    t_fact = mgmt_root.tm.net.fdb.tunnels.tunnel
-    assert t_fact.exists(partition='Common', name='http-tunnel')
-    assert t_fact.exists(partition='Common', name='socks-tunnel')
-    http_tunnel = t_fact.load(partition='Common', name='http-tunnel')
-    http2_tunnel = t_fact.load(partition='Common', name='http-tunnel')
-    http_tunnel.update(records=V12PAYLOAD)
-    http2_tunnel.refresh()
-    assert http2_tunnel.records == [{'name': '02:00:00:00:00:01',
-                                     'endpoint': '10.1.1.1'}]
-    http_tunnel.update(records=None)
-    assert 'records' not in http_tunnel.__dict__
+# @pytest.mark.skipif(
+#     LooseVersion(pytest.config.getoption('--release')) < LooseVersion(
+#         '12.1.0'), reason='This test is for 12.1.0 or greater.')
+# def test_tunnel_exists_load_update_refresh_v12_1(mgmt_root):
+#     t_fact = mgmt_root.tm.net.fdb.tunnels.tunnel
+#     assert t_fact.exists(partition='Common', name='http-tunnel')
+#     assert t_fact.exists(partition='Common', name='socks-tunnel')
+#     http_tunnel = t_fact.load(partition='Common', name='http-tunnel')
+#     http2_tunnel = t_fact.load(partition='Common', name='http-tunnel')
+#     http_tunnel.update(records=V12PAYLOAD)
+#     http2_tunnel.refresh()
+#     assert http2_tunnel.records == [{'name': '02:00:00:00:00:01',
+#                                      'endpoint': '10.1.1.1'}]
+#     http_tunnel.update(records=None)
+#     assert 'records' not in http_tunnel.__dict__