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

Author: allmightyspiff

SoftLayer/CLI/image/datacenter.py

@@ -0,0 +1,28 @@
+"""Edit details of an image."""
+# :license: MIT, see LICENSE for more details.
+
+import click
+
+import SoftLayer
+from SoftLayer.CLI import environment
+from SoftLayer.CLI import helpers
+
+
+@click.command()
+@click.argument('identifier')
+@click.option('--add/--remove', default=True,
+              help="To add or remove Datacenter")
+@click.argument('locations', nargs=-1, required=True)
+@environment.pass_env
+def cli(env, identifier, add, locations):
+    """Add/Remove datacenter of an image."""
+
+    image_mgr = SoftLayer.ImageManager(env.client)
+    image_id = helpers.resolve_id(image_mgr.resolve_ids, identifier, 'image')
+
+    if add:
+        result = image_mgr.add_locations(image_id, locations)
+    else:
+        result = image_mgr.remove_locations(image_id, locations)
+
+    env.fout(result)

SoftLayer/CLI/routes.py

@@ -163,6 +163,7 @@
     ('image:list', 'SoftLayer.CLI.image.list:cli'),
     ('image:import', 'SoftLayer.CLI.image.import:cli'),
     ('image:export', 'SoftLayer.CLI.image.export:cli'),
+    ('image:datacenter', 'SoftLayer.CLI.image.datacenter:cli'),
 
     ('ipsec', 'SoftLayer.CLI.vpn.ipsec'),
     ('ipsec:configure', 'SoftLayer.CLI.vpn.ipsec.configure:cli'),

SoftLayer/fixtures/SoftLayer_Virtual_Guest_Block_Device_Template_Group.py

@@ -7,6 +7,11 @@
     'name': 'test_image',
     'parentId': '',
     'publicFlag': True,
+    'children': [{
+        'datacenter': {
+            'name': 'ams01'
+        }
+    }],
 }, {
     'accountId': 1234,
     'blockDevices': [],
@@ -16,24 +21,35 @@
     'name': 'test_image2',
     'parentId': '',
     'publicFlag': True,
+    'children': [{
+        'datacenter': {
+            'name': 'ams01'
+        }
+    }],
 }]
 
 getObject = IMAGES[0]
 getPublicImages = IMAGES
 deleteObject = {}
 editObject = True
 setTags = True
-createFromExternalSource = [{
+createFromExternalSource = {
     'createDate': '2013-12-05T21:53:03-06:00',
     'globalIdentifier': '0B5DEAF4-643D-46CA-A695-CECBE8832C9D',
     'id': 100,
     'name': 'test_image',
-}]
-createFromIcos = [{
+}
+createFromIcos = {
     'createDate': '2013-12-05T21:53:03-06:00',
     'globalIdentifier': '0B5DEAF4-643D-46CA-A695-CECBE8832C9D',
     'id': 100,
     'name': 'test_image',
-}]
+}
 copyToExternalSource = True
 copyToIcos = True
+addLocations = True
+removeLocations = True
+getStorageLocations = [
+    {'id': 265592, 'longName': 'Amsterdam 1', 'name': 'ams01', 'statusId': 2},
+    {'id': 814994, 'longName': 'Amsterdam 3', 'name': 'ams03', 'statusId': 2},
+]

SoftLayer/managers/image.py

@@ -6,6 +6,7 @@
     :license: MIT, see LICENSE for more details.
 """
 
+from SoftLayer import exceptions
 from SoftLayer import utils
 
 IMAGE_MASK = ('id,accountId,name,globalIdentifier,blockDevices,parentId,'
@@ -187,3 +188,52 @@ def export_image_to_uri(self, image_id, uri, ibm_api_key=None):
             }, id=image_id)
         else:
             return self.vgbdtg.copyToExternalSource({'uri': uri}, id=image_id)
+
+    def add_locations(self, image_id, location_names):
+        """Add available locations to an archive image template.
+
+        :param int image_id: The ID of the image
+        :param location_names: Locations for the Image.
+        """
+        locations = self.get_locations_list(image_id, location_names)
+        return self.vgbdtg.addLocations(locations, id=image_id)
+
+    def remove_locations(self, image_id, location_names):
+        """Remove available locations from an archive image template.
+
+        :param int image_id: The ID of the image
+        :param location_names: Locations for the Image.
+        """
+        locations = self.get_locations_list(image_id, location_names)
+        return self.vgbdtg.removeLocations(locations, id=image_id)
+
+    def get_storage_locations(self, image_id):
+        """Get available locations for public image storage.
+
+        :param int image_id: The ID of the image
+        """
+        return self.vgbdtg.getStorageLocations(id=image_id)
+
+    def get_locations_list(self, image_id, location_names):
+        """Converts a list of location names to a list of locations.
+
+        :param int image_id: The ID of the image.
+        :param list location_names: A list of location names strings.
+        :returns: A list of locations associated with the given location names in the image.
+        """
+        locations = self.get_storage_locations(image_id)
+        locations_ids = []
+        matching_location = {}
+        output_error = "Location {} does not exist for available locations for image {}"
+
+        for location_name in location_names:
+            for location in locations:
+                if location_name == location.get('name'):
+                    matching_location = location
+                    break
+            if matching_location.get('id') is None:
+                raise exceptions.SoftLayerError(output_error.format(location_name, image_id))
+
+            locations_ids.append(matching_location)
+
+        return locations_ids

tests/CLI/modules/image_tests.py

@@ -0,0 +1,55 @@
+"""
+    SoftLayer.tests.CLI.modules.image_tests
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    :license: MIT, see LICENSE for more details.
+"""
+
+from SoftLayer import testing
+
+
+class ImageTests(testing.TestCase):
+
+    def test_detail(self):
+        result = self.run_command(['image', 'detail', '100'])
+        self.assert_no_fail(result)
+
+    def test_delete(self):
+        result = self.run_command(['image', 'delete', '100'])
+        self.assert_no_fail(result)
+
+    def test_edit_note(self):
+        result = self.run_command(['image', 'edit', '100', '--note=test'])
+        self.assert_no_fail(result)
+
+    def test_edit_name(self):
+        result = self.run_command(['image', 'edit', '100', '--name=test'])
+        self.assert_no_fail(result)
+
+    def test_edit_tag(self):
+        result = self.run_command(['image', 'edit', '100', '--tag=test'])
+        self.assert_no_fail(result)
+
+    def test_import(self):
+        result = self.run_command(['image', 'import', '100', 'swift://test'])
+        self.assert_no_fail(result)
+
+    def test_export(self):
+        result = self.run_command(['image', 'export', '100', 'swift://test'])
+        self.assert_no_fail(result)
+
+    def test_list(self):
+        result = self.run_command(['image', 'list'])
+        self.assert_no_fail(result)
+
+    def test_datacenter_add(self):
+        result = self.run_command(['image', 'datacenter', '100', '--add', 'ams01'])
+        self.assert_no_fail(result)
+
+    def test_datacenter_remove(self):
+        result = self.run_command(['image', 'datacenter', '100', '--remove', 'ams01'])
+        self.assert_no_fail(result)
+
+    def test_datacenter_remove_fails(self):
+        result = self.run_command(['image', 'datacenter', '100', '--remove'])
+        self.assertEqual(2, result.exit_code)

tests/managers/image_tests.py

@@ -6,6 +6,7 @@
 """
 
 import SoftLayer
+from SoftLayer import exceptions
 from SoftLayer import testing
 
 IMAGE_SERVICE = 'SoftLayer_Virtual_Guest_Block_Device_Template_Group'
@@ -192,3 +193,33 @@ def test_export_image_cos(self):
             'copyToIcos',
             args=({'uri': 'cos://someuri', 'ibmApiKey': 'someApiKey'},),
             identifier=1234)
+
+    def test_add_locations_image(self):
+        locations = ['ams01']
+        self.image.add_locations(100, locations)
+
+        self.assert_called_with(IMAGE_SERVICE, 'addLocations', identifier=100)
+
+    def test_add_locations_fail(self):
+        locations = ['test']
+        self.assertRaises(
+            exceptions.SoftLayerError,
+            self.image.add_locations,
+            100,
+            locations
+        )
+
+    def test_remove_locations_image(self):
+        locations = ['ams01']
+        self.image.remove_locations(100, locations)
+
+        self.assert_called_with(IMAGE_SERVICE, 'removeLocations', identifier=100)
+
+    def test_get_locations_id_fails(self):
+        locations = ['test']
+        self.assertRaises(
+            exceptions.SoftLayerError,
+            self.image.get_locations_list,
+            100,
+            locations
+        )