Scenario Tests for core VM commands

src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/custom.py

@@ -4,6 +4,7 @@
 from azure.cli.commands import CommandTable
 from azure.cli.commands._command_creation import get_mgmt_service_client
 from azure.cli._locale import L
+from azure.cli._util import CLIError
 
 command_table = CommandTable()
 
@@ -45,7 +46,7 @@ def create(self, resource_group_name, location, tags=None): # pylint: disable=no
         rcf = _resource_client_factory(None)
 
         if rcf.resource_groups.check_existence(resource_group_name):
-            raise ValueError('resource group {} already exists'.format(resource_group_name))
+            raise CLIError('Resource group {} already exists'.format(resource_group_name))
         parameters = ResourceGroup(
             location=location,
             tags=tags

src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/command_specs.py

@@ -43,7 +43,8 @@ def set_up(self):
     def test_body(self):
         # Expecting no results at the beginning
         self.test('vm list-ip-addresses --resource-group {}'.format(self.resource_group), None)
-        self.run(['vm', 'create', '-g', self.resource_group, '-l', self.location,
+        self.run(['vm', 'create', '--resource-group', self.resource_group,
+                  '--location', self.location,
                   '-n', self.vm_name, '--admin-username', 'ubuntu',
                   '--image', 'Canonical:UbuntuServer:14.04.4-LTS:latest',
                   '--admin-password', 'testPassword0', '--deployment-name', self.deployment_name,
@@ -69,16 +70,275 @@ def test_body(self):
     def tear_down(self):
         self.run('resource group delete --name {}'.format(self.resource_group))
 
+class VMSizeListScenarioTest(CommandTestScript):
+
+    def __init__(self):
+        super(VMSizeListScenarioTest, self).__init__(None, self.test_body, None)
+
+    def test_body(self):
+        self.test('vm size list --location westus', JMESPathComparator('type(@)', 'array'))
+
+class VMShowScenarioTest(CommandTestScript):
+
+    def __init__(self):
+        self.deployment_name = 'azurecli-test-deployment-vm-show'
+        self.resource_group = 'cliTestRg_VmShow'
+        self.location = 'westus'
+        self.vm_name = 'vm-show'
+        super(VMShowScenarioTest, self).__init__(
+            self.set_up,
+            self.test_body,
+            self.tear_down)
+
+    def set_up(self):
+        self.run('resource group create --location {} --name {}'.format(
+            self.location,
+            self.resource_group))
+
+    def test_body(self):
+        self.run(['vm', 'create', '--resource-group', self.resource_group,
+                  '--location', self.location,
+                  '-n', self.vm_name, '--admin-username', 'ubuntu',
+                  '--image', 'Canonical:UbuntuServer:14.04.4-LTS:latest',
+                  '--admin-password', 'testPassword0', '--deployment-name', self.deployment_name])
+        self.test('vm show --resource-group {} --name {} --expand instanceView'.format(
+            self.resource_group, self.vm_name),
+                  [
+                      JMESPathComparator('type(@)', 'object'),
+                      JMESPathComparator('name', self.vm_name),
+                      JMESPathComparator('location', self.location),
+                      JMESPathComparator('resourceGroup', self.resource_group),
+                  ])
+
+    def tear_down(self):
+        self.run('resource group delete --name {}'.format(self.resource_group))
+
+class VMImageListOffersScenarioTest(CommandTestScript):
+
+    def __init__(self):
+        self.location = 'westus'
+        self.publisher_name = 'Canonical'
+        super(VMImageListOffersScenarioTest, self).__init__(None, self.test_body, None)
+
+    def test_body(self):
+        self.test('vm image list-offers --location {} --publisher-name {}'.format(
+            self.location, self.publisher_name),
+                  [
+                      JMESPathComparator('type(@)', 'array'),
+                      # all results should have location has set in the test
+                      JMESPathComparator("length([?location == '{}']) == length(@)".format(
+                          self.location),
+                                         True),
+                      # all results should have the correct publisher name
+                      JMESPathComparator(
+                          "length([].id.contains(@, '/Publishers/{}'))".format(self.publisher_name),
+                          6),
+                  ])
+
+class VMImageListPublishersScenarioTest(CommandTestScript):
+
+    def __init__(self):
+        self.location = 'westus'
+        super(VMImageListPublishersScenarioTest, self).__init__(None, self.test_body, None)
+
+    def test_body(self):
+        self.test('vm image list-publishers --location {}'.format(self.location),
+                  [
+                      JMESPathComparator('type(@)', 'array'),
+                      # all results should have location has set in the test
+                      JMESPathComparator("length([?location == '{}']) == length(@)".format(
+                          self.location),
+                                         True),
+                  ])
+
+class VMImageListSkusScenarioTest(CommandTestScript):
+
+    def __init__(self):
+        self.location = 'westus'
+        self.publisher_name = 'Canonical'
+        self.offer = 'UbuntuServer'
+        super(VMImageListSkusScenarioTest, self).__init__(None, self.test_body, None)
+
+    def test_body(self):
+        self.test('vm image list-skus --location {} --publisher-name {} --offer {}'.format(
+            self.location, self.publisher_name, self.offer),
+                  [
+                      JMESPathComparator('type(@)', 'array'),
+                      # all results should have location has set in the test
+                      JMESPathComparator("length([?location == '{}']) == length(@)".format(
+                          self.location),
+                                         True),
+                      # all results should have the correct publisher name
+                      JMESPathComparator(
+                          "length([].id.contains(@, '/Publishers/{}/ArtifactTypes/VMImage/Offers/{}/Skus/'))".format( #pylint: disable=line-too-long
+                              self.publisher_name, self.offer),
+                          27),
+                  ])
+
+class VMImageShowScenarioTest(CommandTestScript):
+
+    def __init__(self):
+        self.location = 'westus'
+        self.publisher_name = 'Canonical'
+        self.offer = 'UbuntuServer'
+        self.skus = '14.04.2-LTS'
+        self.version = '14.04.201503090'
+        super(VMImageShowScenarioTest, self).__init__(None, self.test_body, None)
+
+    def test_body(self):
+        self.test('vm image show --location {} --publisher-name {} --offer {} --skus {} --version {}'.format( #pylint: disable=line-too-long
+            self.location, self.publisher_name, self.offer, self.skus, self.version),
+                  [
+                      JMESPathComparator('type(@)', 'object'),
+                      JMESPathComparator('location', self.location),
+                      JMESPathComparator('name', self.version),
+                      # all results should have the correct publisher name
+                      JMESPathComparator(
+                          "contains(id, '/Publishers/{}/ArtifactTypes/VMImage/Offers/{}/Skus/{}/Versions/{}')".format( #pylint: disable=line-too-long
+                              self.publisher_name, self.offer, self.skus, self.version),
+                          True),
+                  ])
+
+class VMListSizesScenarioTest(CommandTestScript):
+
+    def __init__(self):
+        self.deployment_name = 'azurecli-test-deployment-vm-list-sizes'
+        self.resource_group = 'cliTestRg_VmListSizes'
+        self.location = 'westus'
+        self.vm_name = 'vm-show'
+        super(VMListSizesScenarioTest, self).__init__(self.set_up, self.test_body, self.tear_down)
+
+    def set_up(self):
+        self.run('resource group create --location {} --name {}'.format(
+            self.location,
+            self.resource_group))
+
+    def test_body(self):
+        self.run(['vm', 'create', '--resource-group', self.resource_group,
+                  '--location', self.location,
+                  '-n', self.vm_name, '--admin-username', 'ubuntu',
+                  '--image', 'Canonical:UbuntuServer:14.04.4-LTS:latest',
+                  '--admin-password', 'testPassword0', '--deployment-name', self.deployment_name])
+        self.test(
+            'vm list-sizes --resource-group {} --name {}'.format(
+                self.resource_group,
+                self.vm_name),
+            JMESPathComparator('type(@)', 'array'))
+
+    def tear_down(self):
+        self.run('resource group delete --name {}'.format(self.resource_group))
+
+class VMGeneralizeScenarioTest(CommandTestScript):
+
+    def __init__(self):
+        self.deployment_name = 'azurecli-test-deployment-vm-generalize'
+        self.resource_group = 'cliTestRg_VmGeneralize'
+        self.location = 'westus'
+        self.vm_name = 'vm-generalize'
+        super(VMGeneralizeScenarioTest, self).__init__(self.set_up, self.test_body, self.tear_down)
+
+    def set_up(self):
+        self.run('resource group create --location {} --name {}'.format(
+            self.location,
+            self.resource_group))
+
+    def test_body(self):
+        self.run(['vm', 'create', '--resource-group', self.resource_group,
+                  '--location', self.location,
+                  '--name', self.vm_name, '--admin-username', 'ubuntu',
+                  '--image', 'Canonical:UbuntuServer:14.04.4-LTS:latest',
+                  '--admin-password', 'testPassword0', '--deployment-name', self.deployment_name])
+        self.run('vm power-off --resource-group {} --name {}'.format(
+            self.resource_group, self.vm_name))
+        # Should be able to generalize the VM after it has been stopped
+        self.test(
+            'vm generalize --resource-group {} --name {}'.format(
+                self.resource_group,
+                self.vm_name), None)
+
+    def tear_down(self):
+        self.run('resource group delete --name {}'.format(self.resource_group))
+
+class VMCreateAndStateModificationsScenarioTest(CommandTestScript):
+
+    def __init__(self):
+        self.deployment_name = 'azurecli-test-deployment-vm-state-mod'
+        self.resource_group = 'cliTestRg_VmStateMod'
+        self.location = 'westus'
+        self.vm_name = 'vm-state-mod'
+        super(VMCreateAndStateModificationsScenarioTest, self).__init__(
+            self.set_up,
+            self.test_body,
+            self.tear_down)
+
+    def set_up(self):
+        self.run('resource group create --location {} --name {}'.format(
+            self.location,
+            self.resource_group))
+
+    def _check_vm_power_state(self, expected_power_state):
+        self.test(
+            'vm show --resource-group {} --name {} --expand instanceView'.format(
+                self.resource_group,
+                self.vm_name),
+            [
+                JMESPathComparator('type(@)', 'object'),
+                JMESPathComparator('name', self.vm_name),
+                JMESPathComparator('resourceGroup', self.resource_group),
+                JMESPathComparator('length(instanceView.statuses)', 2),
+                JMESPathComparator(
+                    'instanceView.statuses[0].code',
+                    'ProvisioningState/succeeded'),
+                JMESPathComparator('instanceView.statuses[1].code', expected_power_state),
+            ])
+
+    def test_body(self):
+        # Expecting no results
+        self.test('vm list --resource-group {}'.format(self.resource_group), None)
+        self.run(['vm', 'create', '--resource-group', self.resource_group,
+                  '--location', self.location,
+                  '--name', self.vm_name, '--admin-username', 'ubuntu',
+                  '--image', 'Canonical:UbuntuServer:14.04.4-LTS:latest',
+                  '--admin-password', 'testPassword0', '--deployment-name', self.deployment_name])
+        # Expecting one result, the one we created
+        self.test('vm list --resource-group {}'.format(self.resource_group), [
+            JMESPathComparator('length(@)', 1),
+            JMESPathComparator('[0].resourceGroup', self.resource_group),
+            JMESPathComparator('[0].name', self.vm_name),
+            JMESPathComparator('[0].location', self.location),
+            JMESPathComparator('[0].provisioningState', 'Succeeded'),
+        ])
+        self._check_vm_power_state('PowerState/running')
+        self.run('vm power-off --resource-group {} --name {}'.format(
+            self.resource_group, self.vm_name))
+        self._check_vm_power_state('PowerState/stopped')
+        self.run('vm start --resource-group {} --name {}'.format(
+            self.resource_group, self.vm_name))
+        self._check_vm_power_state('PowerState/running')
+        self.run('vm restart --resource-group {} --name {}'.format(
+            self.resource_group, self.vm_name))
+        self._check_vm_power_state('PowerState/running')
+        self.run('vm deallocate --resource-group {} --name {}'.format(
+            self.resource_group, self.vm_name))
+        self._check_vm_power_state('PowerState/deallocated')
+        self.run('vm delete --resource-group {} --name {}'.format(
+            self.resource_group, self.vm_name))
+        # Expecting no results
+        self.test('vm list --resource-group {}'.format(self.resource_group), None)
+
+    def tear_down(self):
+        self.run('resource group delete --name {}'.format(self.resource_group))
+
 ENV_VAR = {}
 
 TEST_DEF = [
     {
         'test_name': 'vm_usage_list_westus',
-        'command': 'vm usage list --location westus --output json',
+        'command': 'vm usage list --location westus --output json'
     },
     {
         'test_name': 'vm_list_from_group',
-        'command': 'vm list --resource-group XPLATTESTGEXTENSION9085',
+        'command': 'vm list --resource-group XPLATTESTGEXTENSION9085'
     },
     {
         'test_name': 'vm_list_ip_addresses',
@@ -91,7 +351,43 @@ def tear_down(self):
     {
         'test_name': 'vm_images_list_thru_services',
         'command': VMImageListThruServiceScenarioTest()
-    }
+    },
+    {
+        'test_name': 'vm_size_list',
+        'command': VMSizeListScenarioTest()
+    },
+    {
+        'test_name': 'vm_show',
+        'command': VMShowScenarioTest()
+    },
+    {
+        'test_name': 'vm_image_list_offers',
+        'command': VMImageListOffersScenarioTest()
+    },
+    {
+        'test_name': 'vm_image_list_publishers',
+        'command': VMImageListPublishersScenarioTest()
+    },
+    {
+        'test_name': 'vm_image_list_skus',
+        'command': VMImageListSkusScenarioTest()
+    },
+    {
+        'test_name': 'vm_image_show',
+        'command': VMImageShowScenarioTest()
+    },
+    {
+        'test_name': 'vm_list_sizes',
+        'command': VMListSizesScenarioTest()
+    },
+    {
+        'test_name': 'vm_generalize',
+        'command': VMGeneralizeScenarioTest()
+    },
+    {
+        'test_name': 'vm_create_state_modifications',
+        'command': VMCreateAndStateModificationsScenarioTest()
+    },
 ]