Merge branch 'master' into issue1836

Author: allmightyspiff

SoftLayer/CLI/block/refresh.py

@@ -9,10 +9,12 @@
 @click.command(cls=SoftLayer.CLI.command.SLCommand, )
 @click.argument('volume_id')
 @click.argument('snapshot_id')
+@click.option('--force-refresh', '-f', is_flag=True, default=False, show_default=True,
+              help="Cancel current refresh process and initiates the new refresh.")
 @environment.pass_env
-def cli(env, volume_id, snapshot_id):
+def cli(env, volume_id, snapshot_id, force_refresh):
     """Refresh a duplicate volume with a snapshot from its parent."""
     block_manager = SoftLayer.BlockStorageManager(env.client)
-    resp = block_manager.refresh_dupe(volume_id, snapshot_id)
+    resp = block_manager.refresh_dupe(volume_id, snapshot_id, force_refresh)
 
     click.echo(resp)

SoftLayer/CLI/file/refresh.py

@@ -9,10 +9,12 @@
 @click.command(cls=SoftLayer.CLI.command.SLCommand, )
 @click.argument('volume_id')
 @click.argument('snapshot_id')
+@click.option('--force-refresh', '-f', is_flag=True, default=False, show_default=True,
+              help="Cancel current refresh process and initiates the new refresh.")
 @environment.pass_env
-def cli(env, volume_id, snapshot_id):
+def cli(env, volume_id, snapshot_id, force_refresh):
     """Refresh a duplicate volume with a snapshot from its parent."""
     file_manager = SoftLayer.FileStorageManager(env.client)
-    resp = file_manager.refresh_dupe(volume_id, snapshot_id)
+    resp = file_manager.refresh_dupe(volume_id, snapshot_id, force_refresh)
 
     click.echo(resp)

SoftLayer/CLI/routes.py

@@ -59,6 +59,7 @@
     ('virtual:notification-delete', 'SoftLayer.CLI.virt.notification_delete:cli'),
     ('virtual:host-list', 'SoftLayer.CLI.dedicatedhost.list:cli'),
     ('virtual:host-create', 'SoftLayer.CLI.dedicatedhost.create:cli'),
+    ('virtual:os-available', 'SoftLayer.CLI.virt.os_available:cli'),
 
     ('dedicatedhost', 'SoftLayer.CLI.dedicatedhost'),
     ('dedicatedhost:list', 'SoftLayer.CLI.dedicatedhost.list:cli'),

SoftLayer/CLI/virt/os_available.py

@@ -0,0 +1,30 @@
+"""Get all available Operating Systems."""
+# :license: MIT, see LICENSE for more details.
+
+import click
+
+import SoftLayer
+
+from SoftLayer.CLI import environment
+from SoftLayer.CLI import formatting
+
+
+@click.command(cls=SoftLayer.CLI.command.SLCommand, )
+@environment.pass_env
+def cli(env):
+    """Get all available Operating Systems."""
+
+    table = formatting.KeyValueTable(['Id', 'KeyName', 'Description', 'Hourly', 'Monthly', 'Setup'])
+    table.align['name'] = 'r'
+    table.align['value'] = 'l'
+    manager = SoftLayer.OrderingManager(env.client)
+    _filter = {"items": {"prices": {"categories": {"categoryCode": {"operation": "os"}}}}}
+    # PUBLIC_CLOUD_SERVER = 835
+    operations = manager.get_items(storage_filter=_filter, package_id=835)
+
+    for operation_system in operations:
+        table.add_row([operation_system.get('id'), operation_system.get('keyName'), operation_system.get('description'),
+                       operation_system['prices'][0].get('hourlyRecurringFee') or formatting.blank(),
+                       operation_system['prices'][0]['laborFee'],
+                       operation_system['prices'][0]['setupFee']])
+    env.fout(table)

SoftLayer/fixtures/SoftLayer_Product_Package.py

@@ -2276,3 +2276,33 @@
         }
     }
 ]
+
+getItemsOS = [{
+    "description": "Debian GNU/Linux 6.x Squeeze/Stable - LAMP Install (64 bit)",
+    "id": 3975,
+    "itemTaxCategoryId": 166,
+    "keyName": "OS_DEBIAN_6_X_SQUEEZE_LAMP_64_BIT",
+    "softwareDescriptionId": 881,
+    "itemCategory": {
+        "categoryCode": "os",
+        "id": 12,
+        "name": "Operating System",
+    },
+    "prices": [
+        {
+            "hourlyRecurringFee": "0",
+            "id": 14056,
+            "itemId": 3975,
+            "laborFee": "0",
+            "recurringFee": "0",
+            "setupFee": "0",
+            "packageReferences": [
+                {
+                    "id": 74660,
+                    "itemPriceId": 14056,
+                    "packageId": 46
+                }
+            ]
+        }
+    ]
+}]

SoftLayer/managers/storage.py

@@ -563,15 +563,17 @@ def cancel_volume(self,
                                 reason,
                                 id=billing_item_id)
 
-    def refresh_dupe(self, volume_id, snapshot_id):
+    def refresh_dupe(self, volume_id, snapshot_id, force_refresh=False):
         """"Refresh a duplicate volume with a snapshot from its parent.
 
         :param integer volume_id: The id of the volume
         :param integer snapshot_id: The id of the snapshot
+        :param boolean force_refresh: Force refreshing the volume if True
         """
         return self.client.call('Network_Storage',
                                 'refreshDuplicate',
                                 snapshot_id,
+                                force_refresh,
                                 id=volume_id)
 
     def convert_dep_dupe(self, volume_id):

SoftLayer/managers/vs.py

@@ -1120,7 +1120,7 @@ def get_disk_category_id_by_disk_number(self, capacity, disk_number):
         if category_to_request is None:
             return None
 
-        key_name = "*= GUEST_DISK_"+str(capacity)+"_GB_SAN"
+        key_name = "*= GUEST_DISK_" + str(capacity) + "_GB_SAN"
         object_filter = {
             "itemPrices": {
                 "locationGroupId": {"operation": "is null"},

docs/cli/vs.rst

@@ -299,6 +299,9 @@ If no timezone is specified, IMS local time (CST) will be assumed, which might n
 .. click:: SoftLayer.CLI.virt.create:cli
     This command is an alias for `slcli dedicatedhost create`
    :prog: virtual host-create
+
+.. click:: SoftLayer.CLI.virt.os_available:cli
+   :prog: virtual os-available
    :show-nested:
 
 Manages the migration of virutal guests. Supports migrating virtual guests on Dedicated Hosts as well.

tests/CLI/modules/vs/vs_tests.py

@@ -995,3 +995,9 @@ def test_add_notification(self):
     def test_notification_delete(self):
         result = self.run_command(['vs', 'notification-delete', '100'])
         self.assert_no_fail(result)
+
+    def test_os_available(self):
+        _mock = self.set_mock('SoftLayer_Product_Package', 'getItems')
+        _mock.return_value = SoftLayer_Product_Package.getItemsOS
+        result = self.run_command(['vs', 'os-available'])
+        self.assert_no_fail(result)