Merge pull request #1280 from caphrim007/feature.add-trunks-to-sdk

Adds trunk support to the SDK

Author: wojtek0806

f5/bigip/tm/net/__init__.py

@@ -35,6 +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.trunk import Trunks
 from f5.bigip.tm.net.tunnels import TunnelS
 from f5.bigip.tm.net.vlan import Vlans
 
@@ -50,6 +51,7 @@ def __init__(self, tm):
             Routes,
             Route_Domains,
             Selfips,
+            Trunks,
             TunnelS,
             Vlans
         ]

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

@@ -0,0 +1,96 @@
+# Copyright 2017 F5 Networks Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+from f5.sdk_exception import MissingRequiredCreationParameter
+from pytest import symbols
+
+import os
+import pytest
+import tempfile
+
+
+pytestmark = pytest.mark.skipif(
+    not symbols or
+    symbols and not hasattr(symbols, 'run_hardware_tests') or
+    symbols and hasattr(symbols, 'run_hardware_tests') and symbols.modules['run_hardware_tests'] is False,
+    reason='This series of tests requires a hardware BIG-IP be specified.'
+)
+
+
+@pytest.fixture
+def trunk(mgmt_root):
+    file = tempfile.NamedTemporaryFile()
+    name = os.path.basename(file.name)
+    resource = mgmt_root.tm.net.trunks.trunk.create(
+        name=name
+    )
+    yield resource
+    resource.delete()
+
+
+@pytest.fixture
+def trunks(mgmt_root):
+    collection = mgmt_root.tm.net.trunks
+    return collection
+
+
+class TestResource(object):
+    def test_get_collection(self, trunk, trunks):
+        assert len(list(trunks.get_collection())) > 1
+
+    def test_create(self, mgmt_root):
+        file = tempfile.NamedTemporaryFile()
+        name = os.path.basename(file.name)
+        resource = mgmt_root.tm.net.trunks.trunk.create(
+            name=name
+        )
+        assert resource.name == name
+        resource.delete()
+
+    def test_update(self, trunk):
+        """Test resource updates
+
+        Defaults asserted are taken from 13.1.0
+
+        :param trunk:
+        :return:
+        """
+        assert trunk.stp == 'enabled'
+        assert trunk.lacp == 'disabled'
+        trunk.lacp = 'enabled'
+        trunk.stp = 'disabled'
+        trunk.update()
+        assert trunk.stp == 'disabled'
+        assert trunk.lacp == 'enabled'
+
+    def test_refresh(self, trunk):
+        """Test resource refreshing
+
+        Defaults asserted are taken from 13.1.0
+
+        :param trunk:
+        :return:
+        """
+        assert trunk.stp == 'enabled'
+        trunk.stp = 'disabled'
+
+        # A refresh without an update should show no change
+        trunk.refresh()
+        assert trunk.stp == 'enabled'
+
+    def test_guest_no_creation_args(self, mgmt_root):
+        with pytest.raises(MissingRequiredCreationParameter) as ex:
+            mgmt_root.tm.net.trunks.trunk.create()
+        assert 'name' in str(ex.value)

f5/bigip/tm/net/trunk.py

@@ -0,0 +1,52 @@
+# coding=utf-8
+#
+# Copyright 2017 F5 Networks Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+"""BIG-IP® Network trunk module.
+
+REST URI
+    ``http://localhost/mgmt/tm/net/trunk``
+
+GUI Path
+    ``Network --> Trunks``
+
+REST Kind
+    ``tm:net:trunk:*``
+"""
+
+from f5.bigip.mixins import ExclusiveAttributesMixin
+from f5.bigip.resource import Collection
+from f5.bigip.resource import Resource
+
+
+class Trunks(Collection):
+    """BIG-IP® network route collection"""
+    def __init__(self, net):
+        super(Trunks, self).__init__(net)
+        self._meta_data['allowed_lazy_attributes'] = [Trunk]
+        self._meta_data['attribute_registry'] = {
+            'tm:net:trunk:trunkstate': Trunk
+        }
+
+
+class Trunk(Resource, ExclusiveAttributesMixin):
+    def __init__(self, trunks):
+        super(Trunk, self).__init__(trunks)
+        self._meta_data['required_json_kind'] = 'tm:net:trunk:trunkstate'
+        self._meta_data['read_only_attributes'].append(
+            ('network', 'cfgMbrCount', 'workingMbrCount', 'macAddress',
+             'bandwidth')
+        )

symbols.example.yaml

@@ -19,5 +19,7 @@ biq_license_pool: XXXXX-XXXXX-XXXXX-XXXXX-XXXXXXX
 biq_license_utility: XXXXX-XXXXX-XXXXX-XXXXX-XXXXXXX
 biq_license_volume: XXXXX-XXXXX-XXXXX-XXXXX-XXXXXXX
 
-# Tests related to VCMP guests
-run_vcmp_tests: true
+# Tests related to hardware and VCMP guests
+run_vcmp_tests: false
+vcmp_host: 1.1.1.1
+run_hardware_tests: false

tox.ini

@@ -1,8 +1,8 @@
 [tox]
 envlist =
-    py{27,35}-bip-v{11.5.4,11.6.0,11.6.1,12.0.0,12.1.0,12.1.1,12.1.2,13.0.0,13.1.0}
-    py{27,35}-biq-v{5.1.0,5.2.0,5.3.0}
-    py{27,35}-iwf-v{2.1.0}
+    py{27,35,36}-bip-v{11.5.4,11.6.0,11.6.1,12.0.0,12.1.0,12.1.1,12.1.2,13.0.0,13.1.0}
+    py{27,35,36}-biq-v{5.1.0,5.2.0,5.3.0}
+    py{27,35,36}-iwf-v{2.1.0}
     unit
     flake
     pycodestyle
@@ -14,6 +14,7 @@ envbindir = /Users/trupp/src/envs/pycharm/bin/
 basepython =
     py27: python2.7
     py35: python3.5
+    py36: python3.6
     unit: python
     flake: python
     pycodestyle: python
@@ -30,23 +31,23 @@ whitelist_externals=*
 
 commands =
     # BIG-IP tests
-    py{27,35}-bip-v11.5.4: py.test --bigip localhost --port 10443 -s -vv --release 11.5.4 {posargs:f5/bigip}
-    py{27,35}-bip-v11.6.0: py.test --bigip localhost --port 10443 -s -vv --release 11.6.0 {posargs:f5/bigip}
-    py{27,35}-bip-v11.6.1: py.test --bigip localhost --port 10443 -s -vv --release 11.6.1 {posargs:f5/bigip}
-    py{27,35}-bip-v12.0.0: py.test --bigip localhost --port 10443 -s -vv --release 12.0.0 {posargs:f5/bigip}
-    py{27,35}-bip-v12.1.0: py.test --bigip localhost --port 10443 -s -vv --release 12.1.0 {posargs:f5/bigip}
-    py{27,35}-bip-v12.1.1: py.test --bigip localhost --port 10443 -s -vv --release 12.1.1 {posargs:f5/bigip}
-    py{27,35}-bip-v12.1.2: py.test --bigip localhost --port 10443 -s -vv --release 12.1.2 {posargs:f5/bigip}
-    py{27,35}-bip-v13.0.0: py.test --bigip localhost --port 10443 -s -vv --release 13.0.0 {posargs:f5/bigip}
-    py{27,35}-bip-v13.1.0: py.test --bigip localhost --port 10443 -s -vv --release 13.1.0 {posargs:f5/bigip}
+    py{27,35,36}-bip-v11.5.4: py.test --bigip localhost --port 10443 -s -vv --release 11.5.4 {posargs:f5/bigip}
+    py{27,35,36}-bip-v11.6.0: py.test --bigip localhost --port 10443 -s -vv --release 11.6.0 {posargs:f5/bigip}
+    py{27,35,36}-bip-v11.6.1: py.test --bigip localhost --port 10443 -s -vv --release 11.6.1 {posargs:f5/bigip}
+    py{27,35,36}-bip-v12.0.0: py.test --bigip localhost --port 10443 -s -vv --release 12.0.0 {posargs:f5/bigip}
+    py{27,35,36}-bip-v12.1.0: py.test --bigip localhost --port 10443 -s -vv --release 12.1.0 {posargs:f5/bigip}
+    py{27,35,36}-bip-v12.1.1: py.test --bigip localhost --port 10443 -s -vv --release 12.1.1 {posargs:f5/bigip}
+    py{27,35,36}-bip-v12.1.2: py.test --bigip localhost --port 10443 -s -vv --release 12.1.2 {posargs:f5/bigip}
+    py{27,35,36}-bip-v13.0.0: py.test --bigip localhost --port 10443 -s -vv --release 13.0.0 {posargs:f5/bigip}
+    py{27,35,36}-bip-v13.1.0: py.test --bigip localhost --port 10443 -s -vv --release 13.1.0 {posargs:f5/bigip}
 
     # BIG-IQ tests
-    py{27,35}-biq-v5.1.0: py.test --bigip localhost --port 10443 -s -vv --release 5.1.0 {posargs:f5/bigiq}
-    py{27,35}-biq-v5.2.0: py.test --bigip localhost --port 10443 -s -vv --release 5.2.0 {posargs:f5/bigiq}
-    py{27,35}-biq-v5.3.0: py.test --bigip localhost --port 10443 -s -vv --release 5.3.0 {posargs:f5/bigiq}
+    py{27,35,36}-biq-v5.1.0: py.test --bigip localhost --port 10443 -s -vv --release 5.1.0 {posargs:f5/bigiq}
+    py{27,35,36}-biq-v5.2.0: py.test --bigip localhost --port 10443 -s -vv --release 5.2.0 {posargs:f5/bigiq}
+    py{27,35,36}-biq-v5.3.0: py.test --bigip localhost --port 10443 -s -vv --release 5.3.0 {posargs:f5/bigiq}
 
     # iWorkflow tests
-    py{27,35}-iwf-v2.1.0: py.test --bigip localhost --port 10443 -s -vv --release 2.1.0 {posargs:f5/iworkflow}
+    py{27,35,36}-iwf-v2.1.0: py.test --bigip localhost --port 10443 -s -vv --release 2.1.0 {posargs:f5/iworkflow}
 
     # Misc tests
     unit: pytest -k "not /functional/" -vv --cov {posargs:f5/}