Added test for specified_target parameter

Author: hinashi

actions/acoslib/action.py

@@ -9,7 +9,7 @@ class BaseAction(Action):
     DEFAULT_AXAPI_VERSION = acos.AXAPI_30
 
     # These are the parameters for acos pack, not used by the ACOS Client
-    PARAMS_FOR_PACK = ['appliance', 'action', 'object_path', 'one_target', 'specified_target']
+    PARAMS_FOR_PACK = ['appliance', 'action', 'object_path', 'one_target']
 
     def __init__(self, config):
         super(BaseAction, self).__init__(config)
@@ -18,12 +18,12 @@ def __init__(self, config):
 
         self.config = config
 
-    def login(self, appliance, specified_target=None):
+    def login(self, target, specified_target=None):
         try:
             if specified_target:
                 config = specified_target
             else:
-                config = next(x for x in self.config['appliance'] if x['target'] == appliance)
+                config = next(x for x in self.config['appliance'] if x['target'] == target)
             return acos.Client(config['target'],
                                config['api_version'],
                                config['userid'],
@@ -34,7 +34,7 @@ def login(self, appliance, specified_target=None):
             self.logger.error(e)
         except StopIteration:
             self.logger.error("Specified appliance(%s) doesn't exist in the configuration file " %
-                              appliance)
+                              target)
 
     def get_object(self, base_obj, object_path):
         obj = base_obj

actions/ax_action_runner.py

@@ -4,11 +4,10 @@
 
 
 class AXActionRunner(BaseAction):
-    def do_run(self, action, object_path, appliance, specified_target, **kwargs):
-        target = appliance
-        if specified_target:
-            target = specified_target.get("target")
-        client = self.login(appliance, specified_target)
+    def do_run(self, action, object_path, target, **kwargs):
+        if kwargs.get('specified_target'):
+            target = kwargs.get('specified_target').get("target")
+        client = self.login(target, kwargs.get('specified_target'))
         if client:
             try:
                 # transforms user parameters as needed
@@ -28,12 +27,10 @@ def do_run(self, action, object_path, appliance, specified_target, **kwargs):
             return (False, '[%s] Failed to initilaize Client object of acos_client' % target)
 
     def run(self, action, object_path, one_target, **kwargs):
-        if one_target or kwargs.get('appliance') or kwargs.get('specified_target'):
-            return self.do_run(
-                action,
-                object_path,
-                **kwargs
-            )
+        if kwargs.get('specified_target'):
+            return self.do_run(action, object_path, None, **kwargs)
+        if one_target or kwargs.get('appliance'):
+            return self.do_run(action, object_path, kwargs.get('appliance'), **kwargs)
         else:
             results = []
             for config in self.config['appliance']:

tests/test_specified_target.py

@@ -0,0 +1,69 @@
+import mock
+
+from acos_base_action_test_case import ACOSBaseActionTestCase
+from ax_action_runner import AXActionRunner
+
+
+class SpecifiedTargetTestCase(ACOSBaseActionTestCase):
+    __test__ = True
+    action_cls = AXActionRunner
+
+    def setUp(self):
+        super(SpecifiedTargetTestCase, self).setUp()
+
+        self.action = self.get_action_instance(self._full_config)
+        self.action.logger.addHandler(self._log_handler)
+
+    @mock.patch('acos_client.Client')
+    def test_specified_target_without_one_target(self, mock_client):
+        # set mock of action
+        mock_action = mock.Mock()
+        mock_action.slb.server.get.return_value = 'test-result'
+
+        mock_client.return_value = mock_action
+
+        # execute action
+        params = {
+            'object_path': 'slb.server',
+            'action': 'get',
+            'name': 'hoge',
+            'one_target': False,
+            'specified_target': {
+                'target': 'appliance_acos_v2.1',
+                'userid': 'admin',
+                'passwd': 'hoge',
+                'api_version': 'v2.1',
+            }
+        }
+        result = self.action.run(**params)
+
+        self.assertTrue(result[0])
+        self.assertEqual(result[1], 'test-result')
+        self.assertEqual(len(self._log_handler.messages['error']), 0)
+
+    @mock.patch('acos_client.Client')
+    def test_specified_target_with_one_target(self, mock_client):
+        # set mock of action
+        mock_action = mock.Mock()
+        mock_action.slb.server.get.return_value = 'test-result'
+
+        mock_client.return_value = mock_action
+
+        params = {
+            'object_path': 'slb.server',
+            'action': 'get',
+            'name': 'hoge',
+            'one_target': True,
+            'appliance': 'fuga',
+            'specified_target': {
+                'target': 'appliance_acos_v2.1',
+                'userid': 'admin',
+                'passwd': 'hoge',
+                'api_version': 'v2.1',
+            }
+        }
+        result = self.action.run(**params)
+
+        self.assertTrue(result[0])
+        self.assertEqual(result[1], 'test-result')
+        self.assertEqual(len(self._log_handler.messages['error']), 0)