Merge pull request #432 from wojtek0806/commandmixin.variables

Commandmixin.variables

Author: swormke

f5/bigip/mixins.py

@@ -214,11 +214,9 @@ def load(self, **kwargs):
 
     def exec_cmd(self, command, **kwargs):
 
-        cmds = ['cp', 'generate', 'install', 'load', 'mv', 'publish',
-                'reboot', 'restart', 'reset-stats', 'run', 'save',
-                'send-mail', 'start', 'stop']
+        cmds = self._meta_data['allowed_commands']
 
-        if command not in cmds:
+        if command not in self._meta_data['allowed_commands']:
             error_message = "The command value {0} does not exist" \
                             "Valid commands are {1}".format(command, cmds)
             raise InvalidCommand(error_message)

f5/bigip/resource.py

@@ -349,6 +349,8 @@ def __init__(self, container):
         :param container: instance is an attribute of a ResourceBase container
         """
         super(ResourceBase, self).__init__(container)
+        # Commands you can run on a resource or collection, we define it here
+        self._meta_data['allowed_commands'] = []
 
     def _update(self, **kwargs):
         """wrapped with update, override that in a subclass to customize"""

f5/bigip/test/test_mixins.py

@@ -15,9 +15,7 @@
 import json
 import pytest
 
-
 from f5.bigip.mixins import CommandExecutionMixin
-from f5.bigip.mixins import InvalidCommand
 from f5.bigip.mixins import ToDictMixin
 from f5.bigip.mixins import UnnamedResourceMixin
 from f5.bigip.mixins import UnsupportedMethod
@@ -136,8 +134,3 @@ def test_load_raises(self):
         command_resource = CommandExecutionMixin()
         with pytest.raises(UnsupportedMethod):
             command_resource.load()
-
-    def test_invalid_command_raises(self):
-        command_resource = CommandExecutionMixin()
-        with pytest.raises(InvalidCommand):
-            command_resource.exec_cmd('foo', name='test')

f5/bigip/tm/cm/__init__.py

@@ -45,3 +45,4 @@ def __init__(self, cm):
             Devices, Device_Groups, Traffic_Groups, Trust_Domains,
             Sync_Status, Add_To_Trust, Remove_From_Trust,
         ]
+        self._meta_data['allowed_commands'].append('run')

f5/bigip/tm/cm/trust.py

@@ -37,6 +37,7 @@ def __init__(self, cm):
             ('device', 'deviceName', 'username', 'password'))
         self._meta_data['required_json_kind'] = \
             'tm:cm:add-to-trust:runstate'
+        self._meta_data['allowed_commands'].append('run')
 
 
 class Remove_From_Trust(UnnamedResourceMixin, CommandExecutionMixin, Resource):
@@ -57,3 +58,4 @@ def __init__(self, cm):
             ('deviceName',))
         self._meta_data['required_json_kind'] = \
             'tm:cm:remove-from-trust:runstate'
+        self._meta_data['allowed_commands'].append('run')

f5/bigip/tm/sys/config.py

@@ -25,16 +25,19 @@
 REST Kind
     ``tm:sys:config:*``
 """
-
+from f5.bigip.mixins import CommandExecutionMixin
 from f5.bigip.mixins import UnnamedResourceMixin
 from f5.bigip.resource import ResourceBase
 
 
-class Config(UnnamedResourceMixin, ResourceBase):
+class Config(UnnamedResourceMixin, ResourceBase,
+             CommandExecutionMixin):
     def __init__(self, sys):
         super(Config, self).__init__(sys)
         self._meta_data['allowed_lazy_attributes'] = []
         self._meta_data['attribute_registry'] = {}
+        self._meta_data['allowed_commands'].append('save',
+                                                   'load')
 
     def update(self, **kwargs):
         '''Update is not supported for Config
@@ -44,11 +47,3 @@ def update(self, **kwargs):
         raise self.UnsupportedMethod(
             "%s does not support the update method" % self.__class__.__name__
         )
-
-    def save(self):
-        '''Save the configuration on the device. '''
-        payload = {'command': 'save'}
-        session = self._meta_data['bigip']._meta_data['icr_session']
-        uri = self._meta_data['uri']
-        response = session.post(uri, json=payload)
-        self._local_update(response.json())

test/functional/cm/test_trust.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 #
 
+from f5.bigip.mixins import InvalidCommand
 import pytest
 
 
@@ -77,3 +78,12 @@ def test_run(self, request, bigip, peer):
         # Verify devices sync state is Standalone
         assert check_sync(request, bigip) == u"Standalone"
         assert check_sync(request, peer) == u"Standalone"
+
+    def test_invalid_cmd_meta(self, request, bigip):
+        dvcs = bigip.cm
+        with pytest.raises(InvalidCommand):
+            dvcs.add_to_trust.exec_cmd('foo', name='fooname',
+                                       device='foodev',
+                                       deviceName='foo_name',
+                                       username='foouser',
+                                       caDevice=True, password='foopasswd')