Merge branch 'master' of https://github.com/softlayer/softlayer-python …

…into issues258
softlayer · Apr 15, 2015 · 5cd4b10 · 5cd4b10
2 parents 489bba6 + 43b0b4e
commit 5cd4b10
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/SoftLayer/managers/metadata.py b/SoftLayer/managers/metadata.py
@@ -82,10 +82,13 @@ def get(self, name, param=None):
                 raise exceptions.SoftLayerError(
                     'Parameter required to get this attribute.')
 
+        params = tuple()
+        if param is not None:
+            params = (param,)
         try:
             return self.client.call('Resource_Metadata',
                                     self.attribs[name]['call'],
-                                    param)
+                                    *params)
         except exceptions.SoftLayerAPIError as ex:
             if ex.faultCode == 404:
                 return None

diff --git a/SoftLayer/tests/managers/metadata_tests.py b/SoftLayer/tests/managers/metadata_tests.py
@@ -28,7 +28,8 @@ def test_no_param(self):
 
         self.assertEqual('dal01', resp)
         self.assert_called_with('SoftLayer_Resource_Metadata', 'Datacenter',
-                                identifier=None)
+                                identifier=None,
+                                args=tuple())
 
     def test_w_param(self):
         resp = self.metadata.get('vlans', '1:2:3:4:5')