mixin change, progress commit

Author: wojtek0806

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

@@ -592,6 +592,8 @@ def __init__(self, container):
         self._meta_data['exclusive_attributes'] = []
         # You can't set these attributes, only 'read' them.
         self._meta_data['read_only_attributes'] = []
+        # Commands you can run on a resource
+        self._meta_data['allowed_commands'] = []
 
     def _activate_URI(self, selfLinkuri):
         """Call this with a selfLink, after it's returned in _create or _load.

f5/bigip/test/test_mixins.py

@@ -14,14 +14,14 @@
 #
 import json
 import pytest
-
+import mock
 
 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
-
+from f5.bigip.resource import Resource
 
 class MixinTestClass(ToDictMixin):
     def __init__(self):
@@ -137,7 +137,3 @@ def test_load_raises(self):
         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/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')