Repository: Azure/azure-cli

Issue:
VM Access: command renaming
This is polishing like change regarding 4 existing commands under `vm access`, including `delete-linux-user`, `reset-linux-ssh`, `reset-windows-admin`, `set-linux-user`. The naming oddness reflects the service function difference between windows and linux vm, particularly on windows vm, you will not be able to add/rename/delete users, even though the API invoke always succeeds but nothing really happens at vm side
The change details are:
1. Rename category `vm access` to `vm user`
2. Collapse into 3 commands
    `delete`: delete a user from linux vm
    `update`: for windows vm, you can only update the admin password, for linux vm, you can add, or change both username and password, also you can upload public ssh key
    `reset-ssh`: reset linux vm’s SSH configurations



Discussion:

Patch:
diff --git a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_help.py b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_help.py
index 8f73d9966..540d6aab1 100644
--- a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_help.py
+++ b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_help.py
@@ -235,22 +235,22 @@ helps['vm'] = """
     type: group
     short-summary: Provision Linux and Windows virtual machines in minutes
 """
-helps['vm access'] = """
+helps['vm user'] = """
     type: group
-    short-summary: Manage user access
+    short-summary: Manage users
 """
 
-helps['vm access delete-linux-user'] = """
+helps['vm user delete'] = """
     type: command
     long-summary: >
         Delete a user account without logging into to the VM directly.
     examples:
         - name: Delete User
-          text: az vm access delete-linux-user -u username -n vm-name -r group_name
+          text: az vm user delete -u username -n vm-name -r group_name
 {0}
-""".format(vm_ids_example.format('Delete User by VM Ids', 'az vm access delete-linux-user -u username'))
+""".format(vm_ids_example.format('Delete User by VM Ids', 'az vm user delete -u username'))
 
-helps['vm access reset-linux-ssh'] = """
+helps['vm user reset-ssh'] = """
     type: command
     short-summary: Reset the SSH configuration.
     long-summary: >
@@ -258,29 +258,21 @@ helps['vm access reset-linux-ssh'] = """
         default values. The user account (name, password or SSH keys) will not be changed.
     examples:
         - name: Reset SSH
-          text: az vm access reset-linux-ssh -n vm-name -r group_name
+          text: az vm user reset-ssh -n vm-name -r group_name
 {0}
-""".format(vm_ids_example.format('Reset SSH by VM Ids', 'vm access reset-linux-ssh'))
+""".format(vm_ids_example.format('Reset SSH by VM Ids', 'vm user reset-ssh'))
 
-helps['vm access set-linux-user'] = """
+helps['vm user update'] = """
     type: command
     long-summary: Note, the user will have an admin's privilege.
-    examples:
-        - name: Set Linux User Access
-          text: az vm access set-linux-user -u username --ssh-key-value "$(< ~/.ssh/id_rsa.pub)" -n vm-name -r group_name
-{0}
-""".format(vm_ids_example.format('Set Linux User Access by VM Ids', 'vm access set-linux-user -u username '
-                                                                    '--ssh-key-value "$(< ~/.ssh/id_rsa.pub)"'))
-
-helps['vm access reset-windows-admin'] = """
-    type: command
-    long-summary: Note, this resets the admin's credentials. You can't add a new admin.
     examples:
         - name: Reset Windows Admin
-          text: az vm access reset-windows-admin -u username -p password -n vm-name -g resource_group_name
+          text: az vm user update -u username -p password -n vm-name -g resource_group_name
+        - name: Set Linux User
+          text: az vm user update -u username --ssh-key-value "$(< ~/.ssh/id_rsa.pub)" -n vm-name -r group_name
 {0}
-""".format(vm_ids_example.format('Reset Windows Admin by VM Ids', 'vm access reset-windows-admin -u username -p '
-                                                                  'password'))
+""".format(vm_ids_example.format('Set Linux User by VM Ids', 'vm user update -u username '
+                                 '--ssh-key-value "$(< ~/.ssh/id_rsa.pub)"'))
 
 helps['vm availability-set'] = """
     type: group
diff --git a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_params.py b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_params.py
index 37b56abbb..7644fde22 100644
--- a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_params.py
+++ b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_params.py
@@ -80,8 +80,8 @@ register_cli_argument('vm availability-set create', 'availability_set_name', nam
 register_cli_argument('vm availability-set create', 'unmanaged', action='store_true', help='contained VMs should use unmanaged disks')
 register_cli_argument('vm availability-set create', 'validate', help='Generate and validate the ARM template without creating any resources.', action='store_true')
 
-register_cli_argument('vm access', 'username', options_list=('--username', '-u'), help='The user name')
-register_cli_argument('vm access', 'password', options_list=('--password', '-p'), help='The user password')
+register_cli_argument('vm user', 'username', options_list=('--username', '-u'), help='The user name')
+register_cli_argument('vm user', 'password', options_list=('--password', '-p'), help='The user password')
 
 register_cli_argument('acs', 'name', arg_type=name_arg_type)
 register_cli_argument('acs', 'orchestrator_type', **enum_choice_list(ContainerServiceOchestratorTypes))
diff --git a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/commands.py b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/commands.py
index b29b3cc8a..8e555ca23 100644
--- a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/commands.py
+++ b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/commands.py
@@ -121,10 +121,9 @@ cli_command(__name__, 'vmss nic list-vm-nics', 'azure.mgmt.network.operations.ne
 cli_command(__name__, 'vmss nic show', 'azure.mgmt.network.operations.network_interfaces_operations#NetworkInterfacesOperations.get_virtual_machine_scale_set_network_interface', cf_ni)
 
 # VM Access
-cli_command(__name__, 'vm access set-linux-user', custom_path.format('set_linux_user'))
-cli_command(__name__, 'vm access delete-linux-user', custom_path.format('delete_linux_user'))
-cli_command(__name__, 'vm access reset-linux-ssh', custom_path.format('reset_linux_ssh'))
-cli_command(__name__, 'vm access reset-windows-admin', custom_path.format('reset_windows_admin'))
+cli_command(__name__, 'vm user update', custom_path.format('set_user'))
+cli_command(__name__, 'vm user delete', custom_path.format('delete_user'))
+cli_command(__name__, 'vm user reset-ssh', custom_path.format('reset_linux_ssh'))
 
 # # VM Availability Set
 cli_command(__name__, 'vm availability-set create', custom_path.format('create_av_set'), transform=transform_av_set_output)
diff --git a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/custom.py b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/custom.py
index a61084931..75f5c79e8 100644
--- a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/custom.py
+++ b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/custom.py
@@ -598,41 +598,51 @@ def capture_vm(resource_group_name, vm_name, vhd_name_prefix,
     print(json.dumps(result.output, indent=2))  # pylint: disable=no-member
 
 
-def reset_windows_admin(
-        resource_group_name, vm_name, username, password):
-    '''Update the password.
-    You can only change the password. Adding a new user is not supported.
+def set_user(resource_group_name, vm_name, username, password=None, ssh_key_value=None):
+    '''Update or Add(only on Linux VM) users
+    :param username: user name
+    :param password: user password.
+    :param ssh_key_value: SSH public key file value or public key file path
     '''
     vm = get_vm(resource_group_name, vm_name, 'instanceView')
+    if _is_linx_vm(vm):
+        return _set_linux_user(resource_group_name, vm_name, username, password, ssh_key_value)
+    else:
+        if ssh_key_value:
+            raise CLIError('SSH key is not appliable on a Windows VM')
+        return _reset_windows_admin(resource_group_name, vm, username, password)
 
-    client = _compute_client_factory()
 
-    from azure.mgmt.compute.models import VirtualMachineExtension
+def delete_user(
+        resource_group_name, vm_name, username):
+    '''Remove a user(not supported on Windows VM)
+    :param username: user name
+    '''
+    vm = get_vm(resource_group_name, vm_name, 'instanceView')
+    if not _is_linx_vm(vm):
+        raise CLIError('Deleting a user is not supported on Windows VM')
+    poller = _update_linux_access_extension(resource_group_name, vm_name,
+                                            {'remove_user': username})
+    return ExtensionUpdateLongRunningOperation('deleting user', 'done')(poller)
 
-    extension_name = _WINDOWS_ACCESS_EXT
-    publisher, version, auto_upgrade = _get_access_extension_upgrade_info(
-        vm.resources, extension_name)
 
-    ext = VirtualMachineExtension(vm.location,  # pylint: disable=no-member
-                                  publisher=publisher,
-                                  virtual_machine_extension_type=extension_name,
-                                  protected_settings={'Password': password},
-                                  type_handler_version=version,
-                                  settings={'UserName': username},
-                                  auto_upgrade_minor_version=auto_upgrade)
+def reset_linux_ssh(resource_group_name, vm_name):
+    '''Reset the SSH configuration In Linux VM'''
+    vm = get_vm(resource_group_name, vm_name, 'instanceView')
+    if not _is_linx_vm(vm):
+        raise CLIError('Resetting SSH is not supported in Windows VM')
+    poller = _update_linux_access_extension(resource_group_name, vm_name,
+                                            {'reset_ssh': True})
+    return ExtensionUpdateLongRunningOperation('resetting SSH', 'done')(poller)
 
-    poller = client.virtual_machine_extensions.create_or_update(resource_group_name, vm_name,
-                                                                _ACCESS_EXT_HANDLER_NAME, ext)
-    return ExtensionUpdateLongRunningOperation('resetting admin', 'done')(poller)
 
+def _is_linx_vm(vm):
+    os_type = vm.storage_profile.os_disk.os_type.value
+    return os_type.lower() == 'linux'
 
-def set_linux_user(
+
+def _set_linux_user(
         resource_group_name, vm_name, username, password=None, ssh_key_value=None):
-    '''create or update a user credential
-    :param username: user name
-    :param password: user password.
-    :param ssh_key_value: SSH key file value or key file path
-    '''
     protected_settings = {}
     protected_settings['username'] = username
     if password:
@@ -648,19 +658,30 @@ def set_linux_user(
     return ExtensionUpdateLongRunningOperation('setting user', 'done')(poller)
 
 
-def delete_linux_user(
-        resource_group_name, vm_name, username):
-    '''Remove the user '''
-    poller = _update_linux_access_extension(resource_group_name, vm_name,
-                                            {'remove_user': username})
-    return ExtensionUpdateLongRunningOperation('deleting user', 'done')(poller)
+def _reset_windows_admin(
+        resource_group_name, vm, username, password):
+    '''Update the password.
+    You can only change the password. Adding a new user is not supported.
+    '''
+    client = _compute_client_factory()
 
+    from azure.mgmt.compute.models import VirtualMachineExtension
 
-def reset_linux_ssh(resource_group_name, vm_name):
-    '''Reset the SSH configuration'''
-    poller = _update_linux_access_extension(resource_group_name, vm_name,
-                                            {'reset_ssh': True})
-    return ExtensionUpdateLongRunningOperation('resetting SSH', 'done')(poller)
+    extension_name = _WINDOWS_ACCESS_EXT
+    publisher, version, auto_upgrade = _get_access_extension_upgrade_info(
+        vm.resources, extension_name)
+
+    ext = VirtualMachineExtension(vm.location,  # pylint: disable=no-member
+                                  publisher=publisher,
+                                  virtual_machine_extension_type=extension_name,
+                                  protected_settings={'Password': password},
+                                  type_handler_version=version,
+                                  settings={'UserName': username},
+                                  auto_upgrade_minor_version=auto_upgrade)
+
+    poller = client.virtual_machine_extensions.create_or_update(resource_group_name, vm.name,
+                                                                _ACCESS_EXT_HANDLER_NAME, ext)
+    return ExtensionUpdateLongRunningOperation('resetting admin', 'done')(poller)
 
 
 def _update_linux_access_extension(resource_group_name, vm_name, protected_settings):


Test patch:
diff --git a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/recordings/test_vm_create_state_modifications.yaml b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/recordings/test_vm_create_state_modifications.yaml
index 4d2a3c12b..02382f28f 100644
--- a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/recordings/test_vm_create_state_modifications.yaml
+++ b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/recordings/test_vm_create_state_modifications.yaml
@@ -6,10 +6,10 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [5e5c8ed8-e757-11e6-a5f3-64510658e3b3]
+      x-ms-client-request-id: [37d14674-f0e6-11e6-8bdc-f4b7e2e85440]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines?api-version=2016-04-30-preview
   response:
@@ -17,7 +17,7 @@ interactions:
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 01:48:31 GMT']
+      Date: ['Sun, 12 Feb 2017 05:43:45 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
@@ -31,20 +31,20 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          resourcemanagementclient/0.30.2 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          resourcemanagementclient/0.30.2 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [5e9a4be6-e757-11e6-9eef-64510658e3b3]
+      x-ms-client-request-id: [385d70c8-f0e6-11e6-8a3d-f4b7e2e85440]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Storage?api-version=2016-09-01
   response:
-    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Storage","namespace":"Microsoft.Storage","resourceTypes":[{"resourceType":"storageAccounts","locations":["East
+    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Storage","namespace":"Microsoft.Storage","authorization":{"applicationId":"a6aa9161-5291-40bb-8c5c-923b567bee3b","roleDefinitionId":"070ab87f-0efc-4423-b18b-756f3bdb0236"},"resourceTypes":[{"resourceType":"storageAccounts","locations":["East
         US","East US 2","East US 2 (Stage)","West US","West Europe","East Asia","Southeast
         Asia","Japan East","Japan West","North Central US","South Central US","Central
         US","North Europe","Brazil South","Australia East","Australia Southeast","South
         India","Central India","West India","Canada East","Canada Central","West US
         2","West Central US","UK South","UK West"],"apiVersions":["2016-12-01","2016-05-01","2016-01-01","2015-06-15","2015-05-01-preview"],"capabilities":"CrossResourceGroupResourceMove,
-        CrossSubscriptionResourceMove"},{"resourceType":"operations","locations":[],"apiVersions":["2016-12-01","2016-05-01","2016-01-01","2015-06-15","2015-05-01-preview"]},{"resourceType":"storageAccounts/listAccountSas","locations":[],"apiVersions":["2016-12-01","2016-05-01"]},{"resourceType":"usages","locations":[],"apiVersions":["2016-12-01","2016-05-01","2016-01-01","2015-06-15","2015-05-01-preview"]},{"resourceType":"checkNameAvailability","locations":[],"apiVersions":["2016-12-01","2016-05-01","2016-01-01","2015-06-15","2015-05-01-preview"]},{"resourceType":"storageAccounts/services","locations":["East
+        CrossSubscriptionResourceMove"},{"resourceType":"operations","locations":[],"apiVersions":["2016-12-01","2016-05-01","2016-01-01","2015-06-15","2015-05-01-preview"]},{"resourceType":"storageAccounts/listAccountSas","locations":[],"apiVersions":["2016-12-01","2016-05-01"]},{"resourceType":"storageAccounts/listServiceSas","locations":[],"apiVersions":["2016-12-01","2016-05-01"]},{"resourceType":"locations","locations":[],"apiVersions":["2016-12-01","2016-07-01"]},{"resourceType":"locations/deleteVirtualNetworkOrSubnets","locations":[],"apiVersions":["2016-12-01","2016-07-01"]},{"resourceType":"usages","locations":[],"apiVersions":["2016-12-01","2016-05-01","2016-01-01","2015-06-15","2015-05-01-preview"]},{"resourceType":"checkNameAvailability","locations":[],"apiVersions":["2016-12-01","2016-05-01","2016-01-01","2015-06-15","2015-05-01-preview"]},{"resourceType":"storageAccounts/services","locations":["East
         US","West US","East US 2 (Stage)","West Europe","North Europe","East Asia","Southeast
         Asia","Japan East","Japan West","North Central US","South Central US","East
         US 2","Central US","Australia East","Australia Southeast","Brazil South","South
@@ -58,12 +58,12 @@ interactions:
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 01:48:31 GMT']
+      Date: ['Sun, 12 Feb 2017 05:43:45 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
       Vary: [Accept-Encoding]
-      content-length: ['2194']
+      content-length: ['2634']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -72,20 +72,20 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          resourcemanagementclient/0.30.2 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          resourcemanagementclient/0.30.2 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [5ea9dd2c-e757-11e6-a7df-64510658e3b3]
+      x-ms-client-request-id: [387e5538-f0e6-11e6-9cad-f4b7e2e85440]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_vm_state_mod/providers/Microsoft.Storage/storageAccounts/ab394fvkdj34?api-version=2016-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_vm_state_mod/providers/Microsoft.Storage/storageAccounts/ab394fvkdj39?api-version=2016-12-01
   response:
-    body: {string: '{"error":{"code":"ResourceNotFound","message":"The Resource ''Microsoft.Storage/storageAccounts/ab394fvkdj34''
+    body: {string: '{"error":{"code":"ResourceNotFound","message":"The Resource ''Microsoft.Storage/storageAccounts/ab394fvkdj39''
         under resource group ''cli_test_vm_state_mod'' was not found."}}'}
     headers:
       Cache-Control: [no-cache]
       Content-Length: ['177']
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 01:48:32 GMT']
+      Date: ['Sun, 12 Feb 2017 05:43:46 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
@@ -98,10 +98,10 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          resourcemanagementclient/0.30.2 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          resourcemanagementclient/0.30.2 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [5f1491da-e757-11e6-a87a-64510658e3b3]
+      x-ms-client-request-id: [38b37392-f0e6-11e6-9f60-f4b7e2e85440]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network?api-version=2016-09-01
   response:
@@ -185,7 +185,7 @@ interactions:
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 01:48:31 GMT']
+      Date: ['Sun, 12 Feb 2017 05:43:46 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
@@ -199,10 +199,10 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          resourcemanagementclient/0.30.2 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          resourcemanagementclient/0.30.2 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [5f32b194-e757-11e6-99f3-64510658e3b3]
+      x-ms-client-request-id: [38e22bf0-f0e6-11e6-bfcf-f4b7e2e85440]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_vm_state_mod/providers/Microsoft.Network/networkSecurityGroups/mynsg?api-version=2016-12-01
   response:
@@ -212,7 +212,7 @@ interactions:
       Cache-Control: [no-cache]
       Content-Length: ['176']
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 01:48:32 GMT']
+      Date: ['Sun, 12 Feb 2017 05:43:46 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
@@ -225,10 +225,10 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          resourcemanagementclient/0.30.2 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          resourcemanagementclient/0.30.2 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [5f9976a2-e757-11e6-ac06-64510658e3b3]
+      x-ms-client-request-id: [391554ba-f0e6-11e6-ae69-f4b7e2e85440]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network?api-version=2016-09-01
   response:
@@ -312,7 +312,7 @@ interactions:
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 01:48:32 GMT']
+      Date: ['Sun, 12 Feb 2017 05:43:46 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
@@ -326,10 +326,10 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          resourcemanagementclient/0.30.2 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          resourcemanagementclient/0.30.2 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [5fb66012-e757-11e6-888a-64510658e3b3]
+      x-ms-client-request-id: [393a4ba6-f0e6-11e6-9255-f4b7e2e85440]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_vm_state_mod/providers/Microsoft.Network/publicIPAddresses/mypubip?api-version=2016-12-01
   response:
@@ -339,70 +339,69 @@ interactions:
       Cache-Control: [no-cache]
       Content-Length: ['174']
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 01:48:33 GMT']
+      Date: ['Sun, 12 Feb 2017 05:43:46 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
       x-ms-failure-cause: [gateway]
     status: {code: 404, message: Not Found}
 - request:
-    body: '{"properties": {"parameters": {}, "mode": "Incremental", "template": {"parameters":
-      {}, "resources": [{"apiVersion": "2015-06-15", "tags": {"secondtag": "2", "firsttag":
-      "1", "thirdtag": ""}, "location": "eastus", "name": "ab394fvkdj34", "properties":
-      {"accountType": "Standard_LRS"}, "type": "Microsoft.Storage/storageAccounts",
-      "dependsOn": []}, {"apiVersion": "2015-06-15", "tags": {"secondtag": "2", "firsttag":
-      "1", "thirdtag": ""}, "location": "eastus", "name": "myvnet", "properties":
-      {"subnets": [{"name": "vm-state-modSubnet", "properties": {"addressPrefix":
-      "10.0.0.0/24"}}], "addressSpace": {"addressPrefixes": ["10.0.0.0/16"]}}, "type":
-      "Microsoft.Network/virtualNetworks", "dependsOn": []}, {"apiVersion": "2015-06-15",
-      "tags": {"secondtag": "2", "firsttag": "1", "thirdtag": ""}, "location": "eastus",
-      "name": "mynsg", "properties": {"securityRules": [{"name": "default-allow-ssh",
-      "properties": {"sourcePortRange": "*", "direction": "Inbound", "protocol": "Tcp",
-      "destinationAddressPrefix": "*", "sourceAddressPrefix": "*", "priority": 1000,
-      "access": "Allow", "destinationPortRange": "22"}}]}, "type": "Microsoft.Network/networkSecurityGroups",
-      "dependsOn": []}, {"apiVersion": "2015-06-15", "tags": {"secondtag": "2", "firsttag":
-      "1", "thirdtag": ""}, "location": "eastus", "name": "mypubip", "properties":
-      {"publicIPAllocationMethod": "dynamic"}, "type": "Microsoft.Network/publicIPAddresses",
-      "dependsOn": []}, {"apiVersion": "2015-06-15", "tags": {"secondtag": "2", "firsttag":
-      "1", "thirdtag": ""}, "location": "eastus", "name": "vm-state-modVMNic", "properties":
-      {"networkSecurityGroup": {"id": "/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/networkSecurityGroups/mynsg"},
-      "ipConfigurations": [{"name": "ipconfigvm-state-mod", "properties": {"subnet":
-      {"id": "/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/virtualNetworks/myvnet/subnets/vm-state-modSubnet"},
-      "privateIPAllocationMethod": "Dynamic", "publicIPAddress": {"id": "/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/publicIPAddresses/mypubip"}}}]},
-      "type": "Microsoft.Network/networkInterfaces", "dependsOn": ["Microsoft.Network/virtualNetworks/myvnet",
-      "Microsoft.Network/networkSecurityGroups/mynsg", "Microsoft.Network/publicIpAddresses/mypubip"]},
-      {"apiVersion": "2016-04-30-preview", "tags": {"secondtag": "2", "firsttag":
-      "1", "thirdtag": ""}, "location": "eastus", "name": "vm-state-mod", "properties":
-      {"storageProfile": {"imageReference": {"sku": "14.04.4-LTS", "version": "latest",
-      "offer": "UbuntuServer", "publisher": "Canonical"}, "osDisk": {"createOption":
-      "fromImage", "name": "osdisk_67DTRZjyk0", "vhd": {"uri": "https://ab394fvkdj34.blob.core.windows.net/vhds/osdisk_67DTRZjyk0.vhd"},
-      "caching": "ReadWrite"}}, "osProfile": {"adminUsername": "ubuntu", "computerName":
-      "vm-state-mod", "adminPassword": "testPassword0"}, "networkProfile": {"networkInterfaces":
-      [{"id": "/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/networkInterfaces/vm-state-modVMNic"}]},
-      "hardwareProfile": {"vmSize": "Standard_DS1"}}, "type": "Microsoft.Compute/virtualMachines",
-      "dependsOn": ["Microsoft.Storage/storageAccounts/ab394fvkdj34", "Microsoft.Network/networkInterfaces/vm-state-modVMNic"]}],
-      "variables": {}, "contentVersion": "1.0.0.0", "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
-      "outputs": {}}}}'
+    body: '{"properties": {"mode": "Incremental", "parameters": {}, "template": {"resources":
+      [{"location": "eastus", "dependsOn": [], "tags": {"firsttag": "1", "thirdtag":
+      "", "secondtag": "2"}, "properties": {"accountType": "Standard_LRS"}, "apiVersion":
+      "2015-06-15", "type": "Microsoft.Storage/storageAccounts", "name": "ab394fvkdj39"},
+      {"location": "eastus", "dependsOn": [], "tags": {"firsttag": "1", "thirdtag":
+      "", "secondtag": "2"}, "properties": {"subnets": [{"properties": {"addressPrefix":
+      "10.0.0.0/24"}, "name": "vm-state-modSubnet"}], "addressSpace": {"addressPrefixes":
+      ["10.0.0.0/16"]}}, "apiVersion": "2015-06-15", "type": "Microsoft.Network/virtualNetworks",
+      "name": "myvnet"}, {"location": "eastus", "dependsOn": [], "tags": {"firsttag":
+      "1", "thirdtag": "", "secondtag": "2"}, "properties": {"securityRules": [{"properties":
+      {"destinationPortRange": "22", "sourcePortRange": "*", "direction": "Inbound",
+      "priority": 1000, "protocol": "Tcp", "sourceAddressPrefix": "*", "access": "Allow",
+      "destinationAddressPrefix": "*"}, "name": "default-allow-ssh"}]}, "apiVersion":
+      "2015-06-15", "type": "Microsoft.Network/networkSecurityGroups", "name": "mynsg"},
+      {"location": "eastus", "dependsOn": [], "tags": {"firsttag": "1", "thirdtag":
+      "", "secondtag": "2"}, "properties": {"publicIPAllocationMethod": "dynamic"},
+      "apiVersion": "2015-06-15", "type": "Microsoft.Network/publicIPAddresses", "name":
+      "mypubip"}, {"location": "eastus", "dependsOn": ["Microsoft.Network/virtualNetworks/myvnet",
+      "Microsoft.Network/networkSecurityGroups/mynsg", "Microsoft.Network/publicIpAddresses/mypubip"],
+      "tags": {"firsttag": "1", "thirdtag": "", "secondtag": "2"}, "properties": {"ipConfigurations":
+      [{"properties": {"publicIPAddress": {"id": "/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/publicIPAddresses/mypubip"},
+      "privateIPAllocationMethod": "Dynamic", "subnet": {"id": "/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/virtualNetworks/myvnet/subnets/vm-state-modSubnet"}},
+      "name": "ipconfigvm-state-mod"}], "networkSecurityGroup": {"id": "/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/networkSecurityGroups/mynsg"}},
+      "apiVersion": "2015-06-15", "type": "Microsoft.Network/networkInterfaces", "name":
+      "vm-state-modVMNic"}, {"location": "eastus", "dependsOn": ["Microsoft.Storage/storageAccounts/ab394fvkdj39",
+      "Microsoft.Network/networkInterfaces/vm-state-modVMNic"], "tags": {"firsttag":
+      "1", "thirdtag": "", "secondtag": "2"}, "properties": {"storageProfile": {"imageReference":
+      {"offer": "UbuntuServer", "sku": "14.04.4-LTS", "publisher": "Canonical", "version":
+      "latest"}, "osDisk": {"createOption": "fromImage", "caching": "ReadWrite", "name":
+      "osdisk_vJe7inxoHG", "vhd": {"uri": "https://ab394fvkdj39.blob.core.windows.net/vhds/osdisk_vJe7inxoHG.vhd"}}},
+      "osProfile": {"computerName": "vm-state-mod", "adminUsername": "ubuntu", "adminPassword":
+      "testPassword0"}, "networkProfile": {"networkInterfaces": [{"id": "/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/networkInterfaces/vm-state-modVMNic"}]},
+      "hardwareProfile": {"vmSize": "Standard_DS1"}}, "apiVersion": "2016-04-30-preview",
+      "type": "Microsoft.Compute/virtualMachines", "name": "vm-state-mod"}], "outputs":
+      {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+      "contentVersion": "1.0.0.0", "variables": {}, "parameters": {}}}}'
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Length: ['3631']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          resourcemanagementclient/0.30.2 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          resourcemanagementclient/0.30.2 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [6009aff8-e757-11e6-9744-64510658e3b3]
+      x-ms-client-request-id: [3969e538-f0e6-11e6-835a-f4b7e2e85440]
     method: PUT
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_vm_state_mod/providers/Microsoft.Resources/deployments/mock-deployment?api-version=2016-09-01
   response:
-    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Resources/deployments/vm_deploy_xrHrrbhV41SEKZiOipzmvVPO1zMJozb3","name":"vm_deploy_xrHrrbhV41SEKZiOipzmvVPO1zMJozb3","properties":{"parameters":{},"mode":"Incremental","provisioningState":"Accepted","timestamp":"2017-01-31T01:48:36.2881495Z","duration":"PT1.3075055S","correlationId":"9d473581-4d54-4dc4-bc63-388b215b4a2f","providers":[{"namespace":"Microsoft.Storage","resourceTypes":[{"resourceType":"storageAccounts","locations":["eastus"]}]},{"namespace":"Microsoft.Network","resourceTypes":[{"resourceType":"virtualNetworks","locations":["eastus"]},{"resourceType":"networkSecurityGroups","locations":["eastus"]},{"resourceType":"publicIPAddresses","locations":["eastus"]},{"resourceType":"networkInterfaces","locations":["eastus"]}]},{"namespace":"Microsoft.Compute","resourceTypes":[{"resourceType":"virtualMachines","locations":["eastus"]}]}],"dependencies":[{"dependsOn":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/virtualNetworks/myvnet","resourceType":"Microsoft.Network/virtualNetworks","resourceName":"myvnet"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/networkSecurityGroups/mynsg","resourceType":"Microsoft.Network/networkSecurityGroups","resourceName":"mynsg"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/publicIpAddresses/mypubip","resourceType":"Microsoft.Network/publicIpAddresses","resourceName":"mypubip"}],"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/networkInterfaces/vm-state-modVMNic","resourceType":"Microsoft.Network/networkInterfaces","resourceName":"vm-state-modVMNic"},{"dependsOn":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Storage/storageAccounts/ab394fvkdj34","resourceType":"Microsoft.Storage/storageAccounts","resourceName":"ab394fvkdj34"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/networkInterfaces/vm-state-modVMNic","resourceType":"Microsoft.Network/networkInterfaces","resourceName":"vm-state-modVMNic"}],"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod","resourceType":"Microsoft.Compute/virtualMachines","resourceName":"vm-state-mod"}]}}'}
+    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Resources/deployments/vm_deploy_GCPYqmrEK0QpIkC7H2aWP0QraNuR8nAg","name":"vm_deploy_GCPYqmrEK0QpIkC7H2aWP0QraNuR8nAg","properties":{"parameters":{},"mode":"Incremental","provisioningState":"Accepted","timestamp":"2017-02-12T05:43:49.9044643Z","duration":"PT1.3828799S","correlationId":"ca4d3d0f-20a3-4d6f-ac9c-d0a91fb15595","providers":[{"namespace":"Microsoft.Storage","resourceTypes":[{"resourceType":"storageAccounts","locations":["eastus"]}]},{"namespace":"Microsoft.Network","resourceTypes":[{"resourceType":"virtualNetworks","locations":["eastus"]},{"resourceType":"networkSecurityGroups","locations":["eastus"]},{"resourceType":"publicIPAddresses","locations":["eastus"]},{"resourceType":"networkInterfaces","locations":["eastus"]}]},{"namespace":"Microsoft.Compute","resourceTypes":[{"resourceType":"virtualMachines","locations":["eastus"]}]}],"dependencies":[{"dependsOn":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/virtualNetworks/myvnet","resourceType":"Microsoft.Network/virtualNetworks","resourceName":"myvnet"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/networkSecurityGroups/mynsg","resourceType":"Microsoft.Network/networkSecurityGroups","resourceName":"mynsg"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/publicIpAddresses/mypubip","resourceType":"Microsoft.Network/publicIpAddresses","resourceName":"mypubip"}],"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/networkInterfaces/vm-state-modVMNic","resourceType":"Microsoft.Network/networkInterfaces","resourceName":"vm-state-modVMNic"},{"dependsOn":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Storage/storageAccounts/ab394fvkdj39","resourceType":"Microsoft.Storage/storageAccounts","resourceName":"ab394fvkdj39"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/networkInterfaces/vm-state-modVMNic","resourceType":"Microsoft.Network/networkInterfaces","resourceName":"vm-state-modVMNic"}],"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod","resourceType":"Microsoft.Compute/virtualMachines","resourceName":"vm-state-mod"}]}}'}
     headers:
-      Azure-AsyncOperation: ['https://management.azure.com/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/resourcegroups/cli_test_vm_state_mod/providers/Microsoft.Resources/deployments/vm_deploy_xrHrrbhV41SEKZiOipzmvVPO1zMJozb3/operationStatuses/08587157795704970241?api-version=2016-09-01']
+      Azure-AsyncOperation: ['https://management.azure.com/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/resourcegroups/cli_test_vm_state_mod/providers/Microsoft.Resources/deployments/vm_deploy_GCPYqmrEK0QpIkC7H2aWP0QraNuR8nAg/operationStatuses/08587147286569560904?api-version=2016-09-01']
       Cache-Control: [no-cache]
       Content-Length: ['2722']
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 01:48:36 GMT']
+      Date: ['Sun, 12 Feb 2017 05:43:50 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
@@ -415,18 +414,18 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          resourcemanagementclient/0.30.2 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          resourcemanagementclient/0.30.2 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [6009aff8-e757-11e6-9744-64510658e3b3]
+      x-ms-client-request-id: [3969e538-f0e6-11e6-835a-f4b7e2e85440]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_vm_state_mod/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08587157795704970241?api-version=2016-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_vm_state_mod/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08587147286569560904?api-version=2016-09-01
   response:
     body: {string: '{"status":"Running"}'}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 01:49:06 GMT']
+      Date: ['Sun, 12 Feb 2017 05:44:20 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
@@ -440,18 +439,18 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          resourcemanagementclient/0.30.2 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          resourcemanagementclient/0.30.2 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [6009aff8-e757-11e6-9744-64510658e3b3]
+      x-ms-client-request-id: [3969e538-f0e6-11e6-835a-f4b7e2e85440]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_vm_state_mod/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08587157795704970241?api-version=2016-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_vm_state_mod/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08587147286569560904?api-version=2016-09-01
   response:
     body: {string: '{"status":"Running"}'}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 01:49:36 GMT']
+      Date: ['Sun, 12 Feb 2017 05:44:50 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
@@ -465,18 +464,18 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          resourcemanagementclient/0.30.2 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          resourcemanagementclient/0.30.2 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [6009aff8-e757-11e6-9744-64510658e3b3]
+      x-ms-client-request-id: [3969e538-f0e6-11e6-835a-f4b7e2e85440]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_vm_state_mod/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08587157795704970241?api-version=2016-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_vm_state_mod/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08587147286569560904?api-version=2016-09-01
   response:
     body: {string: '{"status":"Running"}'}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 01:50:08 GMT']
+      Date: ['Sun, 12 Feb 2017 05:45:21 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
@@ -490,18 +489,43 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          resourcemanagementclient/0.30.2 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          resourcemanagementclient/0.30.2 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [6009aff8-e757-11e6-9744-64510658e3b3]
+      x-ms-client-request-id: [3969e538-f0e6-11e6-835a-f4b7e2e85440]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_vm_state_mod/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08587157795704970241?api-version=2016-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_vm_state_mod/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08587147286569560904?api-version=2016-09-01
+  response:
+    body: {string: '{"status":"Running"}'}
+    headers:
+      Cache-Control: [no-cache]
+      Content-Type: [application/json; charset=utf-8]
+      Date: ['Sun, 12 Feb 2017 05:45:51 GMT']
+      Expires: ['-1']
+      Pragma: [no-cache]
+      Strict-Transport-Security: [max-age=31536000; includeSubDomains]
+      Vary: [Accept-Encoding]
+      content-length: ['20']
+    status: {code: 200, message: OK}
+- request:
+    body: null
+    headers:
+      Accept: [application/json]
+      Accept-Encoding: ['gzip, deflate']
+      Connection: [keep-alive]
+      Content-Type: [application/json; charset=utf-8]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          resourcemanagementclient/0.30.2 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
+      accept-language: [en-US]
+      x-ms-client-request-id: [3969e538-f0e6-11e6-835a-f4b7e2e85440]
+    method: GET
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_vm_state_mod/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08587147286569560904?api-version=2016-09-01
   response:
     body: {string: '{"status":"Succeeded"}'}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 01:50:38 GMT']
+      Date: ['Sun, 12 Feb 2017 05:46:22 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
@@ -515,23 +539,23 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          resourcemanagementclient/0.30.2 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          resourcemanagementclient/0.30.2 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [6009aff8-e757-11e6-9744-64510658e3b3]
+      x-ms-client-request-id: [3969e538-f0e6-11e6-835a-f4b7e2e85440]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_vm_state_mod/providers/Microsoft.Resources/deployments/mock-deployment?api-version=2016-09-01
   response:
-    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Resources/deployments/vm_deploy_xrHrrbhV41SEKZiOipzmvVPO1zMJozb3","name":"vm_deploy_xrHrrbhV41SEKZiOipzmvVPO1zMJozb3","properties":{"parameters":{},"mode":"Incremental","provisioningState":"Succeeded","timestamp":"2017-01-31T01:50:25.2599028Z","duration":"PT1M50.2792588S","correlationId":"9d473581-4d54-4dc4-bc63-388b215b4a2f","providers":[{"namespace":"Microsoft.Storage","resourceTypes":[{"resourceType":"storageAccounts","locations":["eastus"]}]},{"namespace":"Microsoft.Network","resourceTypes":[{"resourceType":"virtualNetworks","locations":["eastus"]},{"resourceType":"networkSecurityGroups","locations":["eastus"]},{"resourceType":"publicIPAddresses","locations":["eastus"]},{"resourceType":"networkInterfaces","locations":["eastus"]}]},{"namespace":"Microsoft.Compute","resourceTypes":[{"resourceType":"virtualMachines","locations":["eastus"]}]}],"dependencies":[{"dependsOn":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/virtualNetworks/myvnet","resourceType":"Microsoft.Network/virtualNetworks","resourceName":"myvnet"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/networkSecurityGroups/mynsg","resourceType":"Microsoft.Network/networkSecurityGroups","resourceName":"mynsg"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/publicIpAddresses/mypubip","resourceType":"Microsoft.Network/publicIpAddresses","resourceName":"mypubip"}],"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/networkInterfaces/vm-state-modVMNic","resourceType":"Microsoft.Network/networkInterfaces","resourceName":"vm-state-modVMNic"},{"dependsOn":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Storage/storageAccounts/ab394fvkdj34","resourceType":"Microsoft.Storage/storageAccounts","resourceName":"ab394fvkdj34"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/networkInterfaces/vm-state-modVMNic","resourceType":"Microsoft.Network/networkInterfaces","resourceName":"vm-state-modVMNic"}],"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod","resourceType":"Microsoft.Compute/virtualMachines","resourceName":"vm-state-mod"}],"outputs":{},"outputResources":[{"id":"Microsoft.Compute/virtualMachines/vm-state-mod"},{"id":"Microsoft.Network/networkInterfaces/vm-state-modVMNic"},{"id":"Microsoft.Network/networkSecurityGroups/mynsg"},{"id":"Microsoft.Network/publicIPAddresses/mypubip"},{"id":"Microsoft.Network/virtualNetworks/myvnet"},{"id":"Microsoft.Storage/storageAccounts/ab394fvkdj34"}]}}'}
+    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Resources/deployments/vm_deploy_GCPYqmrEK0QpIkC7H2aWP0QraNuR8nAg","name":"vm_deploy_GCPYqmrEK0QpIkC7H2aWP0QraNuR8nAg","properties":{"parameters":{},"mode":"Incremental","provisioningState":"Succeeded","timestamp":"2017-02-12T05:45:53.8740153Z","duration":"PT2M5.3524309S","correlationId":"ca4d3d0f-20a3-4d6f-ac9c-d0a91fb15595","providers":[{"namespace":"Microsoft.Storage","resourceTypes":[{"resourceType":"storageAccounts","locations":["eastus"]}]},{"namespace":"Microsoft.Network","resourceTypes":[{"resourceType":"virtualNetworks","locations":["eastus"]},{"resourceType":"networkSecurityGroups","locations":["eastus"]},{"resourceType":"publicIPAddresses","locations":["eastus"]},{"resourceType":"networkInterfaces","locations":["eastus"]}]},{"namespace":"Microsoft.Compute","resourceTypes":[{"resourceType":"virtualMachines","locations":["eastus"]}]}],"dependencies":[{"dependsOn":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/virtualNetworks/myvnet","resourceType":"Microsoft.Network/virtualNetworks","resourceName":"myvnet"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/networkSecurityGroups/mynsg","resourceType":"Microsoft.Network/networkSecurityGroups","resourceName":"mynsg"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/publicIpAddresses/mypubip","resourceType":"Microsoft.Network/publicIpAddresses","resourceName":"mypubip"}],"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/networkInterfaces/vm-state-modVMNic","resourceType":"Microsoft.Network/networkInterfaces","resourceName":"vm-state-modVMNic"},{"dependsOn":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Storage/storageAccounts/ab394fvkdj39","resourceType":"Microsoft.Storage/storageAccounts","resourceName":"ab394fvkdj39"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/networkInterfaces/vm-state-modVMNic","resourceType":"Microsoft.Network/networkInterfaces","resourceName":"vm-state-modVMNic"}],"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod","resourceType":"Microsoft.Compute/virtualMachines","resourceName":"vm-state-mod"}],"outputs":{},"outputResources":[{"id":"Microsoft.Compute/virtualMachines/vm-state-mod"},{"id":"Microsoft.Network/networkInterfaces/vm-state-modVMNic"},{"id":"Microsoft.Network/networkSecurityGroups/mynsg"},{"id":"Microsoft.Network/publicIPAddresses/mypubip"},{"id":"Microsoft.Network/virtualNetworks/myvnet"},{"id":"Microsoft.Storage/storageAccounts/ab394fvkdj39"}]}}'}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 01:50:38 GMT']
+      Date: ['Sun, 12 Feb 2017 05:46:23 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
       Vary: [Accept-Encoding]
-      content-length: ['3092']
+      content-length: ['3091']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -540,21 +564,21 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [ab2a8848-e757-11e6-8c82-64510658e3b3]
+      x-ms-client-request-id: [970c5b68-f0e6-11e6-bde4-f4b7e2e85440]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod?api-version=2016-04-30-preview&$expand=instanceView
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod?$expand=instanceView&api-version=2016-04-30-preview
   response:
-    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"c05b0fe2-cdfc-47e5-903a-d751c65b9ff9\"\
+    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"987654cb-f4fa-4426-8f3f-c9fda42418e2\"\
         ,\r\n    \"hardwareProfile\": {\r\n      \"vmSize\": \"Standard_DS1\"\r\n\
         \    },\r\n    \"storageProfile\": {\r\n      \"imageReference\": {\r\n  \
         \      \"publisher\": \"Canonical\",\r\n        \"offer\": \"UbuntuServer\"\
         ,\r\n        \"sku\": \"14.04.4-LTS\",\r\n        \"version\": \"latest\"\r\
         \n      },\r\n      \"osDisk\": {\r\n        \"osType\": \"Linux\",\r\n  \
-        \      \"name\": \"osdisk_67DTRZjyk0\",\r\n        \"createOption\": \"FromImage\"\
-        ,\r\n        \"vhd\": {\r\n          \"uri\": \"https://ab394fvkdj34.blob.core.windows.net/vhds/osdisk_67DTRZjyk0.vhd\"\
+        \      \"name\": \"osdisk_vJe7inxoHG\",\r\n        \"createOption\": \"FromImage\"\
+        ,\r\n        \"vhd\": {\r\n          \"uri\": \"https://ab394fvkdj39.blob.core.windows.net/vhds/osdisk_vJe7inxoHG.vhd\"\
         \r\n        },\r\n        \"caching\": \"ReadWrite\"\r\n      },\r\n     \
         \ \"dataDisks\": []\r\n    },\r\n    \"osProfile\": {\r\n      \"computerName\"\
         : \"vm-state-mod\",\r\n      \"adminUsername\": \"ubuntu\",\r\n      \"linuxConfiguration\"\
@@ -566,35 +590,35 @@ interactions:
         ,\r\n        \"statuses\": [\r\n          {\r\n            \"code\": \"ProvisioningState/succeeded\"\
         ,\r\n            \"level\": \"Info\",\r\n            \"displayStatus\": \"\
         Ready\",\r\n            \"message\": \"GuestAgent is running and accepting\
-        \ new configurations.\",\r\n            \"time\": \"2017-01-31T01:50:19+00:00\"\
+        \ new configurations.\",\r\n            \"time\": \"2017-02-12T05:46:14+00:00\"\
         \r\n          }\r\n        ],\r\n        \"extensionHandlers\": []\r\n   \
-        \   },\r\n      \"disks\": [\r\n        {\r\n          \"name\": \"osdisk_67DTRZjyk0\"\
+        \   },\r\n      \"disks\": [\r\n        {\r\n          \"name\": \"osdisk_vJe7inxoHG\"\
         ,\r\n          \"statuses\": [\r\n            {\r\n              \"code\"\
         : \"ProvisioningState/succeeded\",\r\n              \"level\": \"Info\",\r\
         \n              \"displayStatus\": \"Provisioning succeeded\",\r\n       \
-        \       \"time\": \"2017-01-31T01:49:01.3353712+00:00\"\r\n            }\r\
-        \n          ]\r\n        }\r\n      ],\r\n      \"statuses\": [\r\n      \
-        \  {\r\n          \"code\": \"ProvisioningState/succeeded\",\r\n         \
-        \ \"level\": \"Info\",\r\n          \"displayStatus\": \"Provisioning succeeded\"\
-        ,\r\n          \"time\": \"2017-01-31T01:50:16.5864467+00:00\"\r\n       \
+        \       \"time\": \"2017-02-12T05:44:15.585184+00:00\"\r\n            }\r\n\
+        \          ]\r\n        }\r\n      ],\r\n      \"statuses\": [\r\n       \
+        \ {\r\n          \"code\": \"ProvisioningState/succeeded\",\r\n          \"\
+        level\": \"Info\",\r\n          \"displayStatus\": \"Provisioning succeeded\"\
+        ,\r\n          \"time\": \"2017-02-12T05:45:48.9983754+00:00\"\r\n       \
         \ },\r\n        {\r\n          \"code\": \"PowerState/running\",\r\n     \
         \     \"level\": \"Info\",\r\n          \"displayStatus\": \"VM running\"\r\
         \n        }\r\n      ]\r\n    }\r\n  },\r\n  \"type\": \"Microsoft.Compute/virtualMachines\"\
-        ,\r\n  \"location\": \"eastus\",\r\n  \"tags\": {\r\n    \"secondtag\": \"\
-        2\",\r\n    \"firsttag\": \"1\",\r\n    \"thirdtag\": \"\"\r\n  },\r\n  \"\
+        ,\r\n  \"location\": \"eastus\",\r\n  \"tags\": {\r\n    \"firsttag\": \"\
+        1\",\r\n    \"thirdtag\": \"\",\r\n    \"secondtag\": \"2\"\r\n  },\r\n  \"\
         id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod\"\
         ,\r\n  \"name\": \"vm-state-mod\"\r\n}"}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 01:50:39 GMT']
+      Date: ['Sun, 12 Feb 2017 05:46:24 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
       Transfer-Encoding: [chunked]
       Vary: [Accept-Encoding]
-      content-length: ['2658']
+      content-length: ['2657']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -603,22 +627,22 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          networkmanagementclient/0.30.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          networkmanagementclient/0.30.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [ab6e3506-e757-11e6-9228-64510658e3b3]
+      x-ms-client-request-id: [97576e30-f0e6-11e6-96f0-f4b7e2e85440]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/networkInterfaces/vm-state-modVMNic?api-version=2016-09-01
   response:
     body: {string: "{\r\n  \"name\": \"vm-state-modVMNic\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/networkInterfaces/vm-state-modVMNic\"\
-        ,\r\n  \"etag\": \"W/\\\"3be07300-6bd1-4626-be83-90e031e30af4\\\"\",\r\n \
-        \ \"location\": \"eastus\",\r\n  \"tags\": {\r\n    \"secondtag\": \"2\",\r\
-        \n    \"firsttag\": \"1\",\r\n    \"thirdtag\": \"\"\r\n  },\r\n  \"properties\"\
+        ,\r\n  \"etag\": \"W/\\\"660a02ba-0fdc-4c61-b81b-36b95f924280\\\"\",\r\n \
+        \ \"location\": \"eastus\",\r\n  \"tags\": {\r\n    \"firsttag\": \"1\",\r\
+        \n    \"thirdtag\": \"\",\r\n    \"secondtag\": \"2\"\r\n  },\r\n  \"properties\"\
         : {\r\n    \"provisioningState\": \"Succeeded\",\r\n    \"resourceGuid\":\
-        \ \"e6b58fcc-ade7-45f7-90aa-229fd05a9043\",\r\n    \"ipConfigurations\": [\r\
+        \ \"ce57e1c9-7a60-4522-ae9f-caa6e8ab89d9\",\r\n    \"ipConfigurations\": [\r\
         \n      {\r\n        \"name\": \"ipconfigvm-state-mod\",\r\n        \"id\"\
         : \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/networkInterfaces/vm-state-modVMNic/ipConfigurations/ipconfigvm-state-mod\"\
-        ,\r\n        \"etag\": \"W/\\\"3be07300-6bd1-4626-be83-90e031e30af4\\\"\"\
+        ,\r\n        \"etag\": \"W/\\\"660a02ba-0fdc-4c61-b81b-36b95f924280\\\"\"\
         ,\r\n        \"properties\": {\r\n          \"provisioningState\": \"Succeeded\"\
         ,\r\n          \"privateIPAddress\": \"10.0.0.4\",\r\n          \"privateIPAllocationMethod\"\
         : \"Dynamic\",\r\n          \"publicIPAddress\": {\r\n            \"id\":\
@@ -627,8 +651,8 @@ interactions:
         \r\n          },\r\n          \"primary\": true,\r\n          \"privateIPAddressVersion\"\
         : \"IPv4\"\r\n        }\r\n      }\r\n    ],\r\n    \"dnsSettings\": {\r\n\
         \      \"dnsServers\": [],\r\n      \"appliedDnsServers\": [],\r\n      \"\
-        internalDomainNameSuffix\": \"sypdqf4j0vjevmtntsvp4wudnc.bx.internal.cloudapp.net\"\
-        \r\n    },\r\n    \"macAddress\": \"00-0D-3A-18-E4-71\",\r\n    \"enableAcceleratedNetworking\"\
+        internalDomainNameSuffix\": \"p0lcxouumadebajqyramln5cjf.bx.internal.cloudapp.net\"\
+        \r\n    },\r\n    \"macAddress\": \"00-0D-3A-10-39-46\",\r\n    \"enableAcceleratedNetworking\"\
         : false,\r\n    \"enableIPForwarding\": false,\r\n    \"networkSecurityGroup\"\
         : {\r\n      \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/networkSecurityGroups/mynsg\"\
         \r\n    },\r\n    \"primary\": true,\r\n    \"virtualMachine\": {\r\n    \
@@ -638,8 +662,8 @@ interactions:
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 01:50:40 GMT']
-      ETag: [W/"3be07300-6bd1-4626-be83-90e031e30af4"]
+      Date: ['Sun, 12 Feb 2017 05:46:24 GMT']
+      ETag: [W/"660a02ba-0fdc-4c61-b81b-36b95f924280"]
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -655,35 +679,35 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          networkmanagementclient/0.30.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          networkmanagementclient/0.30.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [ab8ca5f4-e757-11e6-ab44-64510658e3b3]
+      x-ms-client-request-id: [978ac18a-f0e6-11e6-b65f-f4b7e2e85440]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/publicIPAddresses/mypubip?api-version=2016-09-01
   response:
     body: {string: "{\r\n  \"name\": \"mypubip\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/publicIPAddresses/mypubip\"\
-        ,\r\n  \"etag\": \"W/\\\"07b533e2-d567-4d5d-a2f0-abd0418e485c\\\"\",\r\n \
+        ,\r\n  \"etag\": \"W/\\\"56c2f566-d599-41f2-aeba-f43e3df53e38\\\"\",\r\n \
         \ \"type\": \"Microsoft.Network/publicIPAddresses\",\r\n  \"location\": \"\
-        eastus\",\r\n  \"tags\": {\r\n    \"secondtag\": \"2\",\r\n    \"firsttag\"\
-        : \"1\",\r\n    \"thirdtag\": \"\"\r\n  },\r\n  \"properties\": {\r\n    \"\
-        provisioningState\": \"Succeeded\",\r\n    \"resourceGuid\": \"b7e37011-797b-469a-b1b9-d34ab5f33d3a\"\
-        ,\r\n    \"ipAddress\": \"40.71.99.3\",\r\n    \"publicIPAddressVersion\"\
+        eastus\",\r\n  \"tags\": {\r\n    \"firsttag\": \"1\",\r\n    \"thirdtag\"\
+        : \"\",\r\n    \"secondtag\": \"2\"\r\n  },\r\n  \"properties\": {\r\n   \
+        \ \"provisioningState\": \"Succeeded\",\r\n    \"resourceGuid\": \"42e08a80-8dd0-4de5-9118-890ede4f1dc8\"\
+        ,\r\n    \"ipAddress\": \"40.121.214.78\",\r\n    \"publicIPAddressVersion\"\
         : \"IPv4\",\r\n    \"publicIPAllocationMethod\": \"Dynamic\",\r\n    \"idleTimeoutInMinutes\"\
         : 4,\r\n    \"ipConfiguration\": {\r\n      \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/networkInterfaces/vm-state-modVMNic/ipConfigurations/ipconfigvm-state-mod\"\
         \r\n    }\r\n  }\r\n}"}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 01:50:40 GMT']
-      ETag: [W/"07b533e2-d567-4d5d-a2f0-abd0418e485c"]
+      Date: ['Sun, 12 Feb 2017 05:46:25 GMT']
+      ETag: [W/"56c2f566-d599-41f2-aeba-f43e3df53e38"]
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
       Transfer-Encoding: [chunked]
       Vary: [Accept-Encoding]
-      content-length: ['919']
+      content-length: ['922']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -692,22 +716,22 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [ac01c374-e757-11e6-b873-64510658e3b3]
+      x-ms-client-request-id: [9834922c-f0e6-11e6-9a87-f4b7e2e85440]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines?api-version=2016-04-30-preview
   response:
     body: {string: "{\r\n  \"value\": [\r\n    {\r\n      \"properties\": {\r\n  \
-        \      \"vmId\": \"c05b0fe2-cdfc-47e5-903a-d751c65b9ff9\",\r\n        \"hardwareProfile\"\
+        \      \"vmId\": \"987654cb-f4fa-4426-8f3f-c9fda42418e2\",\r\n        \"hardwareProfile\"\
         : {\r\n          \"vmSize\": \"Standard_DS1\"\r\n        },\r\n        \"\
         storageProfile\": {\r\n          \"imageReference\": {\r\n            \"publisher\"\
         : \"Canonical\",\r\n            \"offer\": \"UbuntuServer\",\r\n         \
         \   \"sku\": \"14.04.4-LTS\",\r\n            \"version\": \"latest\"\r\n \
         \         },\r\n          \"osDisk\": {\r\n            \"osType\": \"Linux\"\
-        ,\r\n            \"name\": \"osdisk_67DTRZjyk0\",\r\n            \"createOption\"\
-        : \"FromImage\",\r\n            \"vhd\": {\r\n              \"uri\": \"https://ab394fvkdj34.blob.core.windows.net/vhds/osdisk_67DTRZjyk0.vhd\"\
+        ,\r\n            \"name\": \"osdisk_vJe7inxoHG\",\r\n            \"createOption\"\
+        : \"FromImage\",\r\n            \"vhd\": {\r\n              \"uri\": \"https://ab394fvkdj39.blob.core.windows.net/vhds/osdisk_vJe7inxoHG.vhd\"\
         \r\n            },\r\n            \"caching\": \"ReadWrite\"\r\n         \
         \ },\r\n          \"dataDisks\": []\r\n        },\r\n        \"osProfile\"\
         : {\r\n          \"computerName\": \"vm-state-mod\",\r\n          \"adminUsername\"\
@@ -716,14 +740,14 @@ interactions:
         \     \"networkProfile\": {\"networkInterfaces\":[{\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/networkInterfaces/vm-state-modVMNic\"\
         }]},\r\n        \"provisioningState\": \"Succeeded\"\r\n      },\r\n     \
         \ \"type\": \"Microsoft.Compute/virtualMachines\",\r\n      \"location\":\
-        \ \"eastus\",\r\n      \"tags\": {\r\n        \"secondtag\": \"2\",\r\n  \
-        \      \"firsttag\": \"1\",\r\n        \"thirdtag\": \"\"\r\n      },\r\n\
+        \ \"eastus\",\r\n      \"tags\": {\r\n        \"firsttag\": \"1\",\r\n   \
+        \     \"thirdtag\": \"\",\r\n        \"secondtag\": \"2\"\r\n      },\r\n\
         \      \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod\"\
         ,\r\n      \"name\": \"vm-state-mod\"\r\n    }\r\n  ]\r\n}"}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 01:50:41 GMT']
+      Date: ['Sun, 12 Feb 2017 05:46:26 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -739,21 +763,21 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [ac863128-e757-11e6-b516-64510658e3b3]
+      x-ms-client-request-id: [98f8f362-f0e6-11e6-afeb-f4b7e2e85440]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod?api-version=2016-04-30-preview
   response:
-    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"c05b0fe2-cdfc-47e5-903a-d751c65b9ff9\"\
+    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"987654cb-f4fa-4426-8f3f-c9fda42418e2\"\
         ,\r\n    \"hardwareProfile\": {\r\n      \"vmSize\": \"Standard_DS1\"\r\n\
         \    },\r\n    \"storageProfile\": {\r\n      \"imageReference\": {\r\n  \
         \      \"publisher\": \"Canonical\",\r\n        \"offer\": \"UbuntuServer\"\
         ,\r\n        \"sku\": \"14.04.4-LTS\",\r\n        \"version\": \"latest\"\r\
         \n      },\r\n      \"osDisk\": {\r\n        \"osType\": \"Linux\",\r\n  \
-        \      \"name\": \"osdisk_67DTRZjyk0\",\r\n        \"createOption\": \"FromImage\"\
-        ,\r\n        \"vhd\": {\r\n          \"uri\": \"https://ab394fvkdj34.blob.core.windows.net/vhds/osdisk_67DTRZjyk0.vhd\"\
+        \      \"name\": \"osdisk_vJe7inxoHG\",\r\n        \"createOption\": \"FromImage\"\
+        ,\r\n        \"vhd\": {\r\n          \"uri\": \"https://ab394fvkdj39.blob.core.windows.net/vhds/osdisk_vJe7inxoHG.vhd\"\
         \r\n        },\r\n        \"caching\": \"ReadWrite\"\r\n      },\r\n     \
         \ \"dataDisks\": []\r\n    },\r\n    \"osProfile\": {\r\n      \"computerName\"\
         : \"vm-state-mod\",\r\n      \"adminUsername\": \"ubuntu\",\r\n      \"linuxConfiguration\"\
@@ -762,13 +786,13 @@ interactions:
         :[{\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/networkInterfaces/vm-state-modVMNic\"\
         }]},\r\n    \"provisioningState\": \"Succeeded\"\r\n  },\r\n  \"type\": \"\
         Microsoft.Compute/virtualMachines\",\r\n  \"location\": \"eastus\",\r\n  \"\
-        tags\": {\r\n    \"secondtag\": \"2\",\r\n    \"firsttag\": \"1\",\r\n   \
-        \ \"thirdtag\": \"\"\r\n  },\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod\"\
+        tags\": {\r\n    \"firsttag\": \"1\",\r\n    \"thirdtag\": \"\",\r\n    \"\
+        secondtag\": \"2\"\r\n  },\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod\"\
         ,\r\n  \"name\": \"vm-state-mod\"\r\n}"}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 01:50:42 GMT']
+      Date: ['Sun, 12 Feb 2017 05:46:27 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -784,21 +808,21 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [ad06b4fa-e757-11e6-90f1-64510658e3b3]
+      x-ms-client-request-id: [99a820fe-f0e6-11e6-b8c1-f4b7e2e85440]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod?api-version=2016-04-30-preview&$expand=instanceView
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod?$expand=instanceView&api-version=2016-04-30-preview
   response:
-    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"c05b0fe2-cdfc-47e5-903a-d751c65b9ff9\"\
+    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"987654cb-f4fa-4426-8f3f-c9fda42418e2\"\
         ,\r\n    \"hardwareProfile\": {\r\n      \"vmSize\": \"Standard_DS1\"\r\n\
         \    },\r\n    \"storageProfile\": {\r\n      \"imageReference\": {\r\n  \
         \      \"publisher\": \"Canonical\",\r\n        \"offer\": \"UbuntuServer\"\
         ,\r\n        \"sku\": \"14.04.4-LTS\",\r\n        \"version\": \"latest\"\r\
         \n      },\r\n      \"osDisk\": {\r\n        \"osType\": \"Linux\",\r\n  \
-        \      \"name\": \"osdisk_67DTRZjyk0\",\r\n        \"createOption\": \"FromImage\"\
-        ,\r\n        \"vhd\": {\r\n          \"uri\": \"https://ab394fvkdj34.blob.core.windows.net/vhds/osdisk_67DTRZjyk0.vhd\"\
+        \      \"name\": \"osdisk_vJe7inxoHG\",\r\n        \"createOption\": \"FromImage\"\
+        ,\r\n        \"vhd\": {\r\n          \"uri\": \"https://ab394fvkdj39.blob.core.windows.net/vhds/osdisk_vJe7inxoHG.vhd\"\
         \r\n        },\r\n        \"caching\": \"ReadWrite\"\r\n      },\r\n     \
         \ \"dataDisks\": []\r\n    },\r\n    \"osProfile\": {\r\n      \"computerName\"\
         : \"vm-state-mod\",\r\n      \"adminUsername\": \"ubuntu\",\r\n      \"linuxConfiguration\"\
@@ -810,35 +834,35 @@ interactions:
         ,\r\n        \"statuses\": [\r\n          {\r\n            \"code\": \"ProvisioningState/succeeded\"\
         ,\r\n            \"level\": \"Info\",\r\n            \"displayStatus\": \"\
         Ready\",\r\n            \"message\": \"GuestAgent is running and accepting\
-        \ new configurations.\",\r\n            \"time\": \"2017-01-31T01:50:19+00:00\"\
+        \ new configurations.\",\r\n            \"time\": \"2017-02-12T05:46:14+00:00\"\
         \r\n          }\r\n        ],\r\n        \"extensionHandlers\": []\r\n   \
-        \   },\r\n      \"disks\": [\r\n        {\r\n          \"name\": \"osdisk_67DTRZjyk0\"\
+        \   },\r\n      \"disks\": [\r\n        {\r\n          \"name\": \"osdisk_vJe7inxoHG\"\
         ,\r\n          \"statuses\": [\r\n            {\r\n              \"code\"\
         : \"ProvisioningState/succeeded\",\r\n              \"level\": \"Info\",\r\
         \n              \"displayStatus\": \"Provisioning succeeded\",\r\n       \
-        \       \"time\": \"2017-01-31T01:49:01.3353712+00:00\"\r\n            }\r\
-        \n          ]\r\n        }\r\n      ],\r\n      \"statuses\": [\r\n      \
-        \  {\r\n          \"code\": \"ProvisioningState/succeeded\",\r\n         \
-        \ \"level\": \"Info\",\r\n          \"displayStatus\": \"Provisioning succeeded\"\
-        ,\r\n          \"time\": \"2017-01-31T01:50:16.5864467+00:00\"\r\n       \
+        \       \"time\": \"2017-02-12T05:44:15.585184+00:00\"\r\n            }\r\n\
+        \          ]\r\n        }\r\n      ],\r\n      \"statuses\": [\r\n       \
+        \ {\r\n          \"code\": \"ProvisioningState/succeeded\",\r\n          \"\
+        level\": \"Info\",\r\n          \"displayStatus\": \"Provisioning succeeded\"\
+        ,\r\n          \"time\": \"2017-02-12T05:45:48.9983754+00:00\"\r\n       \
         \ },\r\n        {\r\n          \"code\": \"PowerState/running\",\r\n     \
         \     \"level\": \"Info\",\r\n          \"displayStatus\": \"VM running\"\r\
         \n        }\r\n      ]\r\n    }\r\n  },\r\n  \"type\": \"Microsoft.Compute/virtualMachines\"\
-        ,\r\n  \"location\": \"eastus\",\r\n  \"tags\": {\r\n    \"secondtag\": \"\
-        2\",\r\n    \"firsttag\": \"1\",\r\n    \"thirdtag\": \"\"\r\n  },\r\n  \"\
+        ,\r\n  \"location\": \"eastus\",\r\n  \"tags\": {\r\n    \"firsttag\": \"\
+        1\",\r\n    \"thirdtag\": \"\",\r\n    \"secondtag\": \"2\"\r\n  },\r\n  \"\
         id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod\"\
         ,\r\n  \"name\": \"vm-state-mod\"\r\n}"}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 01:50:43 GMT']
+      Date: ['Sun, 12 Feb 2017 05:46:28 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
       Transfer-Encoding: [chunked]
       Vary: [Accept-Encoding]
-      content-length: ['2658']
+      content-length: ['2657']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -847,21 +871,21 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [ad83108a-e757-11e6-bcad-64510658e3b3]
+      x-ms-client-request-id: [9a745c36-f0e6-11e6-8719-f4b7e2e85440]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod?api-version=2016-04-30-preview&$expand=instanceView
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod?$expand=instanceView&api-version=2016-04-30-preview
   response:
-    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"c05b0fe2-cdfc-47e5-903a-d751c65b9ff9\"\
+    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"987654cb-f4fa-4426-8f3f-c9fda42418e2\"\
         ,\r\n    \"hardwareProfile\": {\r\n      \"vmSize\": \"Standard_DS1\"\r\n\
         \    },\r\n    \"storageProfile\": {\r\n      \"imageReference\": {\r\n  \
         \      \"publisher\": \"Canonical\",\r\n        \"offer\": \"UbuntuServer\"\
         ,\r\n        \"sku\": \"14.04.4-LTS\",\r\n        \"version\": \"latest\"\r\
         \n      },\r\n      \"osDisk\": {\r\n        \"osType\": \"Linux\",\r\n  \
-        \      \"name\": \"osdisk_67DTRZjyk0\",\r\n        \"createOption\": \"FromImage\"\
-        ,\r\n        \"vhd\": {\r\n          \"uri\": \"https://ab394fvkdj34.blob.core.windows.net/vhds/osdisk_67DTRZjyk0.vhd\"\
+        \      \"name\": \"osdisk_vJe7inxoHG\",\r\n        \"createOption\": \"FromImage\"\
+        ,\r\n        \"vhd\": {\r\n          \"uri\": \"https://ab394fvkdj39.blob.core.windows.net/vhds/osdisk_vJe7inxoHG.vhd\"\
         \r\n        },\r\n        \"caching\": \"ReadWrite\"\r\n      },\r\n     \
         \ \"dataDisks\": []\r\n    },\r\n    \"osProfile\": {\r\n      \"computerName\"\
         : \"vm-state-mod\",\r\n      \"adminUsername\": \"ubuntu\",\r\n      \"linuxConfiguration\"\
@@ -873,50 +897,113 @@ interactions:
         ,\r\n        \"statuses\": [\r\n          {\r\n            \"code\": \"ProvisioningState/succeeded\"\
         ,\r\n            \"level\": \"Info\",\r\n            \"displayStatus\": \"\
         Ready\",\r\n            \"message\": \"GuestAgent is running and accepting\
-        \ new configurations.\",\r\n            \"time\": \"2017-01-31T01:50:19+00:00\"\
+        \ new configurations.\",\r\n            \"time\": \"2017-02-12T05:46:14+00:00\"\
         \r\n          }\r\n        ],\r\n        \"extensionHandlers\": []\r\n   \
-        \   },\r\n      \"disks\": [\r\n        {\r\n          \"name\": \"osdisk_67DTRZjyk0\"\
+        \   },\r\n      \"disks\": [\r\n        {\r\n          \"name\": \"osdisk_vJe7inxoHG\"\
         ,\r\n          \"statuses\": [\r\n            {\r\n              \"code\"\
         : \"ProvisioningState/succeeded\",\r\n              \"level\": \"Info\",\r\
         \n              \"displayStatus\": \"Provisioning succeeded\",\r\n       \
-        \       \"time\": \"2017-01-31T01:49:01.3353712+00:00\"\r\n            }\r\
-        \n          ]\r\n        }\r\n      ],\r\n      \"statuses\": [\r\n      \
-        \  {\r\n          \"code\": \"ProvisioningState/succeeded\",\r\n         \
-        \ \"level\": \"Info\",\r\n          \"displayStatus\": \"Provisioning succeeded\"\
-        ,\r\n          \"time\": \"2017-01-31T01:50:16.5864467+00:00\"\r\n       \
+        \       \"time\": \"2017-02-12T05:44:15.585184+00:00\"\r\n            }\r\n\
+        \          ]\r\n        }\r\n      ],\r\n      \"statuses\": [\r\n       \
+        \ {\r\n          \"code\": \"ProvisioningState/succeeded\",\r\n          \"\
+        level\": \"Info\",\r\n          \"displayStatus\": \"Provisioning succeeded\"\
+        ,\r\n          \"time\": \"2017-02-12T05:45:48.9983754+00:00\"\r\n       \
         \ },\r\n        {\r\n          \"code\": \"PowerState/running\",\r\n     \
         \     \"level\": \"Info\",\r\n          \"displayStatus\": \"VM running\"\r\
         \n        }\r\n      ]\r\n    }\r\n  },\r\n  \"type\": \"Microsoft.Compute/virtualMachines\"\
-        ,\r\n  \"location\": \"eastus\",\r\n  \"tags\": {\r\n    \"secondtag\": \"\
-        2\",\r\n    \"firsttag\": \"1\",\r\n    \"thirdtag\": \"\"\r\n  },\r\n  \"\
+        ,\r\n  \"location\": \"eastus\",\r\n  \"tags\": {\r\n    \"firsttag\": \"\
+        1\",\r\n    \"thirdtag\": \"\",\r\n    \"secondtag\": \"2\"\r\n  },\r\n  \"\
         id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod\"\
         ,\r\n  \"name\": \"vm-state-mod\"\r\n}"}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 01:50:43 GMT']
+      Date: ['Sun, 12 Feb 2017 05:46:30 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
       Transfer-Encoding: [chunked]
       Vary: [Accept-Encoding]
-      content-length: ['2658']
+      content-length: ['2657']
     status: {code: 200, message: OK}
 - request:
-    body: '{"properties": {"settings": {}, "protectedSettings": {"username": "foouser1",
-      "password": "Foo12345"}, "typeHandlerVersion": "1.4", "type": "VMAccessForLinux",
-      "publisher": "Microsoft.OSTCExtensions"}, "location": "eastus"}'
+    body: null
+    headers:
+      Accept: [application/json]
+      Accept-Encoding: ['gzip, deflate']
+      Connection: [keep-alive]
+      Content-Type: [application/json; charset=utf-8]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
+      accept-language: [en-US]
+      x-ms-client-request-id: [9aa900ec-f0e6-11e6-9e94-f4b7e2e85440]
+    method: GET
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod?$expand=instanceView&api-version=2016-04-30-preview
+  response:
+    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"987654cb-f4fa-4426-8f3f-c9fda42418e2\"\
+        ,\r\n    \"hardwareProfile\": {\r\n      \"vmSize\": \"Standard_DS1\"\r\n\
+        \    },\r\n    \"storageProfile\": {\r\n      \"imageReference\": {\r\n  \
+        \      \"publisher\": \"Canonical\",\r\n        \"offer\": \"UbuntuServer\"\
+        ,\r\n        \"sku\": \"14.04.4-LTS\",\r\n        \"version\": \"latest\"\r\
+        \n      },\r\n      \"osDisk\": {\r\n        \"osType\": \"Linux\",\r\n  \
+        \      \"name\": \"osdisk_vJe7inxoHG\",\r\n        \"createOption\": \"FromImage\"\
+        ,\r\n        \"vhd\": {\r\n          \"uri\": \"https://ab394fvkdj39.blob.core.windows.net/vhds/osdisk_vJe7inxoHG.vhd\"\
+        \r\n        },\r\n        \"caching\": \"ReadWrite\"\r\n      },\r\n     \
+        \ \"dataDisks\": []\r\n    },\r\n    \"osProfile\": {\r\n      \"computerName\"\
+        : \"vm-state-mod\",\r\n      \"adminUsername\": \"ubuntu\",\r\n      \"linuxConfiguration\"\
+        : {\r\n        \"disablePasswordAuthentication\": false\r\n      },\r\n  \
+        \    \"secrets\": []\r\n    },\r\n    \"networkProfile\": {\"networkInterfaces\"\
+        :[{\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/networkInterfaces/vm-state-modVMNic\"\
+        }]},\r\n    \"provisioningState\": \"Succeeded\",\r\n    \"instanceView\"\
+        : {\r\n      \"vmAgent\": {\r\n        \"vmAgentVersion\": \"WALinuxAgent-2.0.16\"\
+        ,\r\n        \"statuses\": [\r\n          {\r\n            \"code\": \"ProvisioningState/succeeded\"\
+        ,\r\n            \"level\": \"Info\",\r\n            \"displayStatus\": \"\
+        Ready\",\r\n            \"message\": \"GuestAgent is running and accepting\
+        \ new configurations.\",\r\n            \"time\": \"2017-02-12T05:46:14+00:00\"\
+        \r\n          }\r\n        ],\r\n        \"extensionHandlers\": []\r\n   \
+        \   },\r\n      \"disks\": [\r\n        {\r\n          \"name\": \"osdisk_vJe7inxoHG\"\
+        ,\r\n          \"statuses\": [\r\n            {\r\n              \"code\"\
+        : \"ProvisioningState/succeeded\",\r\n              \"level\": \"Info\",\r\
+        \n              \"displayStatus\": \"Provisioning succeeded\",\r\n       \
+        \       \"time\": \"2017-02-12T05:44:15.585184+00:00\"\r\n            }\r\n\
+        \          ]\r\n        }\r\n      ],\r\n      \"statuses\": [\r\n       \
+        \ {\r\n          \"code\": \"ProvisioningState/succeeded\",\r\n          \"\
+        level\": \"Info\",\r\n          \"displayStatus\": \"Provisioning succeeded\"\
+        ,\r\n          \"time\": \"2017-02-12T05:45:48.9983754+00:00\"\r\n       \
+        \ },\r\n        {\r\n          \"code\": \"PowerState/running\",\r\n     \
+        \     \"level\": \"Info\",\r\n          \"displayStatus\": \"VM running\"\r\
+        \n        }\r\n      ]\r\n    }\r\n  },\r\n  \"type\": \"Microsoft.Compute/virtualMachines\"\
+        ,\r\n  \"location\": \"eastus\",\r\n  \"tags\": {\r\n    \"firsttag\": \"\
+        1\",\r\n    \"thirdtag\": \"\",\r\n    \"secondtag\": \"2\"\r\n  },\r\n  \"\
+        id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod\"\
+        ,\r\n  \"name\": \"vm-state-mod\"\r\n}"}
+    headers:
+      Cache-Control: [no-cache]
+      Content-Type: [application/json; charset=utf-8]
+      Date: ['Sun, 12 Feb 2017 05:46:31 GMT']
+      Expires: ['-1']
+      Pragma: [no-cache]
+      Server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
+      Strict-Transport-Security: [max-age=31536000; includeSubDomains]
+      Transfer-Encoding: [chunked]
+      Vary: [Accept-Encoding]
+      content-length: ['2657']
+    status: {code: 200, message: OK}
+- request:
+    body: '{"properties": {"type": "VMAccessForLinux", "publisher": "Microsoft.OSTCExtensions",
+      "typeHandlerVersion": "1.4", "settings": {}, "protectedSettings": {"username":
+      "foouser1", "password": "Foo12345"}}, "location": "eastus"}'
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Length: ['223']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [ada7165a-e757-11e6-89a8-64510658e3b3]
+      x-ms-client-request-id: [9ade41cc-f0e6-11e6-98e8-f4b7e2e85440]
     method: PUT
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod/extensions/enablevmaccess?api-version=2016-04-30-preview
   response:
@@ -927,16 +1014,16 @@ interactions:
         ,\r\n  \"location\": \"eastus\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod/extensions/enablevmaccess\"\
         ,\r\n  \"name\": \"enablevmaccess\"\r\n}"}
     headers:
-      Azure-AsyncOperation: ['https://management.azure.com/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/providers/Microsoft.Compute/locations/eastus/operations/16861409-4feb-46bd-8967-cabe6fe6ebaa?api-version=2016-04-30-preview']
+      Azure-AsyncOperation: ['https://management.azure.com/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/providers/Microsoft.Compute/locations/eastus/operations/82676c56-ec04-4dda-b567-c2eba87ee971?api-version=2016-04-30-preview']
       Cache-Control: [no-cache]
       Content-Length: ['541']
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 01:50:45 GMT']
+      Date: ['Sun, 12 Feb 2017 05:46:33 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
-      x-ms-ratelimit-remaining-subscription-writes: ['1197']
+      x-ms-ratelimit-remaining-subscription-writes: ['1196']
     status: {code: 201, message: Created}
 - request:
     body: null
@@ -945,20 +1032,20 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [ada7165a-e757-11e6-89a8-64510658e3b3]
+      x-ms-client-request-id: [9ade41cc-f0e6-11e6-98e8-f4b7e2e85440]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/eastus/operations/16861409-4feb-46bd-8967-cabe6fe6ebaa?api-version=2016-04-30-preview
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/eastus/operations/82676c56-ec04-4dda-b567-c2eba87ee971?api-version=2016-04-30-preview
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-01-31T01:50:45.1178448+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"16861409-4feb-46bd-8967-cabe6fe6ebaa\"\
+    body: {string: "{\r\n  \"startTime\": \"2017-02-12T05:46:31.6093826+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"82676c56-ec04-4dda-b567-c2eba87ee971\"\
         \r\n}"}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 01:51:15 GMT']
+      Date: ['Sun, 12 Feb 2017 05:47:03 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -974,20 +1061,20 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [ada7165a-e757-11e6-89a8-64510658e3b3]
+      x-ms-client-request-id: [9ade41cc-f0e6-11e6-98e8-f4b7e2e85440]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/eastus/operations/16861409-4feb-46bd-8967-cabe6fe6ebaa?api-version=2016-04-30-preview
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/eastus/operations/82676c56-ec04-4dda-b567-c2eba87ee971?api-version=2016-04-30-preview
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-01-31T01:50:45.1178448+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"16861409-4feb-46bd-8967-cabe6fe6ebaa\"\
+    body: {string: "{\r\n  \"startTime\": \"2017-02-12T05:46:31.6093826+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"82676c56-ec04-4dda-b567-c2eba87ee971\"\
         \r\n}"}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 01:51:46 GMT']
+      Date: ['Sun, 12 Feb 2017 05:47:34 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -1003,20 +1090,20 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [ada7165a-e757-11e6-89a8-64510658e3b3]
+      x-ms-client-request-id: [9ade41cc-f0e6-11e6-98e8-f4b7e2e85440]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/eastus/operations/16861409-4feb-46bd-8967-cabe6fe6ebaa?api-version=2016-04-30-preview
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/eastus/operations/82676c56-ec04-4dda-b567-c2eba87ee971?api-version=2016-04-30-preview
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-01-31T01:50:45.1178448+00:00\",\r\
-        \n  \"endTime\": \"2017-01-31T01:51:53.7611856+00:00\",\r\n  \"status\": \"\
-        Succeeded\",\r\n  \"name\": \"16861409-4feb-46bd-8967-cabe6fe6ebaa\"\r\n}"}
+    body: {string: "{\r\n  \"startTime\": \"2017-02-12T05:46:31.6093826+00:00\",\r\
+        \n  \"endTime\": \"2017-02-12T05:47:42.9996786+00:00\",\r\n  \"status\": \"\
+        Succeeded\",\r\n  \"name\": \"82676c56-ec04-4dda-b567-c2eba87ee971\"\r\n}"}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 01:52:16 GMT']
+      Date: ['Sun, 12 Feb 2017 05:48:05 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -1032,10 +1119,10 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [ada7165a-e757-11e6-89a8-64510658e3b3]
+      x-ms-client-request-id: [9ade41cc-f0e6-11e6-98e8-f4b7e2e85440]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod/extensions/enablevmaccess?api-version=2016-04-30-preview
   response:
@@ -1048,7 +1135,7 @@ interactions:
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 01:52:17 GMT']
+      Date: ['Sun, 12 Feb 2017 05:48:05 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -1064,21 +1151,21 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [e5e21f42-e757-11e6-8f88-64510658e3b3]
+      x-ms-client-request-id: [d3f2deb6-f0e6-11e6-9304-f4b7e2e85440]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod?api-version=2016-04-30-preview&$expand=instanceView
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod?$expand=instanceView&api-version=2016-04-30-preview
   response:
-    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"c05b0fe2-cdfc-47e5-903a-d751c65b9ff9\"\
+    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"987654cb-f4fa-4426-8f3f-c9fda42418e2\"\
         ,\r\n    \"hardwareProfile\": {\r\n      \"vmSize\": \"Standard_DS1\"\r\n\
         \    },\r\n    \"storageProfile\": {\r\n      \"imageReference\": {\r\n  \
         \      \"publisher\": \"Canonical\",\r\n        \"offer\": \"UbuntuServer\"\
         ,\r\n        \"sku\": \"14.04.4-LTS\",\r\n        \"version\": \"latest\"\r\
         \n      },\r\n      \"osDisk\": {\r\n        \"osType\": \"Linux\",\r\n  \
-        \      \"name\": \"osdisk_67DTRZjyk0\",\r\n        \"createOption\": \"FromImage\"\
-        ,\r\n        \"vhd\": {\r\n          \"uri\": \"https://ab394fvkdj34.blob.core.windows.net/vhds/osdisk_67DTRZjyk0.vhd\"\
+        \      \"name\": \"osdisk_vJe7inxoHG\",\r\n        \"createOption\": \"FromImage\"\
+        ,\r\n        \"vhd\": {\r\n          \"uri\": \"https://ab394fvkdj39.blob.core.windows.net/vhds/osdisk_vJe7inxoHG.vhd\"\
         \r\n        },\r\n        \"caching\": \"ReadWrite\"\r\n      },\r\n     \
         \ \"dataDisks\": []\r\n    },\r\n    \"osProfile\": {\r\n      \"computerName\"\
         : \"vm-state-mod\",\r\n      \"adminUsername\": \"ubuntu\",\r\n      \"linuxConfiguration\"\
@@ -1090,17 +1177,17 @@ interactions:
         ,\r\n        \"statuses\": [\r\n          {\r\n            \"code\": \"ProvisioningState/succeeded\"\
         ,\r\n            \"level\": \"Info\",\r\n            \"displayStatus\": \"\
         Ready\",\r\n            \"message\": \"GuestAgent is running and accepting\
-        \ new configurations.\",\r\n            \"time\": \"2017-01-31T01:52:11+00:00\"\
+        \ new configurations.\",\r\n            \"time\": \"2017-02-12T05:48:05+00:00\"\
         \r\n          }\r\n        ],\r\n        \"extensionHandlers\": [\r\n    \
         \      {\r\n            \"type\": \"Microsoft.OSTCExtensions.VMAccessForLinux\"\
         ,\r\n            \"typeHandlerVersion\": \"1.4.6.0\",\r\n            \"status\"\
         : {\r\n              \"code\": \"ProvisioningState/succeeded\",\r\n      \
         \        \"level\": \"Info\",\r\n              \"displayStatus\": \"Ready\"\
         \r\n            }\r\n          }\r\n        ]\r\n      },\r\n      \"disks\"\
-        : [\r\n        {\r\n          \"name\": \"osdisk_67DTRZjyk0\",\r\n       \
+        : [\r\n        {\r\n          \"name\": \"osdisk_vJe7inxoHG\",\r\n       \
         \   \"statuses\": [\r\n            {\r\n              \"code\": \"ProvisioningState/succeeded\"\
         ,\r\n              \"level\": \"Info\",\r\n              \"displayStatus\"\
-        : \"Provisioning succeeded\",\r\n              \"time\": \"2017-01-31T01:50:45.2741093+00:00\"\
+        : \"Provisioning succeeded\",\r\n              \"time\": \"2017-02-12T05:46:31.7968432+00:00\"\
         \r\n            }\r\n          ]\r\n        }\r\n      ],\r\n      \"extensions\"\
         : [\r\n        {\r\n          \"name\": \"enablevmaccess\",\r\n          \"\
         type\": \"Microsoft.OSTCExtensions.VMAccessForLinux\",\r\n          \"typeHandlerVersion\"\
@@ -1111,11 +1198,11 @@ interactions:
         \          ]\r\n        }\r\n      ],\r\n      \"statuses\": [\r\n       \
         \ {\r\n          \"code\": \"ProvisioningState/succeeded\",\r\n          \"\
         level\": \"Info\",\r\n          \"displayStatus\": \"Provisioning succeeded\"\
-        ,\r\n          \"time\": \"2017-01-31T01:51:53.7455752+00:00\"\r\n       \
-        \ },\r\n        {\r\n          \"code\": \"PowerState/running\",\r\n     \
-        \     \"level\": \"Info\",\r\n          \"displayStatus\": \"VM running\"\r\
-        \n        }\r\n      ]\r\n    }\r\n  },\r\n  \"resources\": [\r\n    {\r\n\
-        \      \"properties\": {\r\n        \"publisher\": \"Microsoft.OSTCExtensions\"\
+        ,\r\n          \"time\": \"2017-02-12T05:47:42.98407+00:00\"\r\n        },\r\
+        \n        {\r\n          \"code\": \"PowerState/running\",\r\n          \"\
+        level\": \"Info\",\r\n          \"displayStatus\": \"VM running\"\r\n    \
+        \    }\r\n      ]\r\n    }\r\n  },\r\n  \"resources\": [\r\n    {\r\n    \
+        \  \"properties\": {\r\n        \"publisher\": \"Microsoft.OSTCExtensions\"\
         ,\r\n        \"type\": \"VMAccessForLinux\",\r\n        \"typeHandlerVersion\"\
         : \"1.4\",\r\n        \"autoUpgradeMinorVersion\": false,\r\n        \"settings\"\
         : {},\r\n        \"provisioningState\": \"Succeeded\"\r\n      },\r\n    \
@@ -1123,35 +1210,116 @@ interactions:
         location\": \"eastus\",\r\n      \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod/extensions/enablevmaccess\"\
         ,\r\n      \"name\": \"enablevmaccess\"\r\n    }\r\n  ],\r\n  \"type\": \"\
         Microsoft.Compute/virtualMachines\",\r\n  \"location\": \"eastus\",\r\n  \"\
-        tags\": {\r\n    \"secondtag\": \"2\",\r\n    \"firsttag\": \"1\",\r\n   \
-        \ \"thirdtag\": \"\"\r\n  },\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod\"\
+        tags\": {\r\n    \"firsttag\": \"1\",\r\n    \"thirdtag\": \"\",\r\n    \"\
+        secondtag\": \"2\"\r\n  },\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod\"\
         ,\r\n  \"name\": \"vm-state-mod\"\r\n}"}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 01:52:18 GMT']
+      Date: ['Sun, 12 Feb 2017 05:48:06 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
       Transfer-Encoding: [chunked]
       Vary: [Accept-Encoding]
-      content-length: ['4054']
+      content-length: ['4052']
+    status: {code: 200, message: OK}
+- request:
+    body: null
+    headers:
+      Accept: [application/json]
+      Accept-Encoding: ['gzip, deflate']
+      Connection: [keep-alive]
+      Content-Type: [application/json; charset=utf-8]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
+      accept-language: [en-US]
+      x-ms-client-request-id: [d4365952-f0e6-11e6-a7ed-f4b7e2e85440]
+    method: GET
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod?$expand=instanceView&api-version=2016-04-30-preview
+  response:
+    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"987654cb-f4fa-4426-8f3f-c9fda42418e2\"\
+        ,\r\n    \"hardwareProfile\": {\r\n      \"vmSize\": \"Standard_DS1\"\r\n\
+        \    },\r\n    \"storageProfile\": {\r\n      \"imageReference\": {\r\n  \
+        \      \"publisher\": \"Canonical\",\r\n        \"offer\": \"UbuntuServer\"\
+        ,\r\n        \"sku\": \"14.04.4-LTS\",\r\n        \"version\": \"latest\"\r\
+        \n      },\r\n      \"osDisk\": {\r\n        \"osType\": \"Linux\",\r\n  \
+        \      \"name\": \"osdisk_vJe7inxoHG\",\r\n        \"createOption\": \"FromImage\"\
+        ,\r\n        \"vhd\": {\r\n          \"uri\": \"https://ab394fvkdj39.blob.core.windows.net/vhds/osdisk_vJe7inxoHG.vhd\"\
+        \r\n        },\r\n        \"caching\": \"ReadWrite\"\r\n      },\r\n     \
+        \ \"dataDisks\": []\r\n    },\r\n    \"osProfile\": {\r\n      \"computerName\"\
+        : \"vm-state-mod\",\r\n      \"adminUsername\": \"ubuntu\",\r\n      \"linuxConfiguration\"\
+        : {\r\n        \"disablePasswordAuthentication\": false\r\n      },\r\n  \
+        \    \"secrets\": []\r\n    },\r\n    \"networkProfile\": {\"networkInterfaces\"\
+        :[{\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/networkInterfaces/vm-state-modVMNic\"\
+        }]},\r\n    \"provisioningState\": \"Succeeded\",\r\n    \"instanceView\"\
+        : {\r\n      \"vmAgent\": {\r\n        \"vmAgentVersion\": \"WALinuxAgent-2.0.16\"\
+        ,\r\n        \"statuses\": [\r\n          {\r\n            \"code\": \"ProvisioningState/succeeded\"\
+        ,\r\n            \"level\": \"Info\",\r\n            \"displayStatus\": \"\
+        Ready\",\r\n            \"message\": \"GuestAgent is running and accepting\
+        \ new configurations.\",\r\n            \"time\": \"2017-02-12T05:48:05+00:00\"\
+        \r\n          }\r\n        ],\r\n        \"extensionHandlers\": [\r\n    \
+        \      {\r\n            \"type\": \"Microsoft.OSTCExtensions.VMAccessForLinux\"\
+        ,\r\n            \"typeHandlerVersion\": \"1.4.6.0\",\r\n            \"status\"\
+        : {\r\n              \"code\": \"ProvisioningState/succeeded\",\r\n      \
+        \        \"level\": \"Info\",\r\n              \"displayStatus\": \"Ready\"\
+        \r\n            }\r\n          }\r\n        ]\r\n      },\r\n      \"disks\"\
+        : [\r\n        {\r\n          \"name\": \"osdisk_vJe7inxoHG\",\r\n       \
+        \   \"statuses\": [\r\n            {\r\n              \"code\": \"ProvisioningState/succeeded\"\
+        ,\r\n              \"level\": \"Info\",\r\n              \"displayStatus\"\
+        : \"Provisioning succeeded\",\r\n              \"time\": \"2017-02-12T05:46:31.7968432+00:00\"\
+        \r\n            }\r\n          ]\r\n        }\r\n      ],\r\n      \"extensions\"\
+        : [\r\n        {\r\n          \"name\": \"enablevmaccess\",\r\n          \"\
+        type\": \"Microsoft.OSTCExtensions.VMAccessForLinux\",\r\n          \"typeHandlerVersion\"\
+        : \"1.4.6.0\",\r\n          \"statuses\": [\r\n            {\r\n         \
+        \     \"code\": \"ProvisioningState/succeeded\",\r\n              \"level\"\
+        : \"Info\",\r\n              \"displayStatus\": \"Provisioning succeeded\"\
+        ,\r\n              \"message\": \"Enable succeeded.\"\r\n            }\r\n\
+        \          ]\r\n        }\r\n      ],\r\n      \"statuses\": [\r\n       \
+        \ {\r\n          \"code\": \"ProvisioningState/succeeded\",\r\n          \"\
+        level\": \"Info\",\r\n          \"displayStatus\": \"Provisioning succeeded\"\
+        ,\r\n          \"time\": \"2017-02-12T05:47:42.98407+00:00\"\r\n        },\r\
+        \n        {\r\n          \"code\": \"PowerState/running\",\r\n          \"\
+        level\": \"Info\",\r\n          \"displayStatus\": \"VM running\"\r\n    \
+        \    }\r\n      ]\r\n    }\r\n  },\r\n  \"resources\": [\r\n    {\r\n    \
+        \  \"properties\": {\r\n        \"publisher\": \"Microsoft.OSTCExtensions\"\
+        ,\r\n        \"type\": \"VMAccessForLinux\",\r\n        \"typeHandlerVersion\"\
+        : \"1.4\",\r\n        \"autoUpgradeMinorVersion\": false,\r\n        \"settings\"\
+        : {},\r\n        \"provisioningState\": \"Succeeded\"\r\n      },\r\n    \
+        \  \"type\": \"Microsoft.Compute/virtualMachines/extensions\",\r\n      \"\
+        location\": \"eastus\",\r\n      \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod/extensions/enablevmaccess\"\
+        ,\r\n      \"name\": \"enablevmaccess\"\r\n    }\r\n  ],\r\n  \"type\": \"\
+        Microsoft.Compute/virtualMachines\",\r\n  \"location\": \"eastus\",\r\n  \"\
+        tags\": {\r\n    \"firsttag\": \"1\",\r\n    \"thirdtag\": \"\",\r\n    \"\
+        secondtag\": \"2\"\r\n  },\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod\"\
+        ,\r\n  \"name\": \"vm-state-mod\"\r\n}"}
+    headers:
+      Cache-Control: [no-cache]
+      Content-Type: [application/json; charset=utf-8]
+      Date: ['Sun, 12 Feb 2017 05:48:06 GMT']
+      Expires: ['-1']
+      Pragma: [no-cache]
+      Server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
+      Strict-Transport-Security: [max-age=31536000; includeSubDomains]
+      Transfer-Encoding: [chunked]
+      Vary: [Accept-Encoding]
+      content-length: ['4052']
     status: {code: 200, message: OK}
 - request:
-    body: '{"properties": {"settings": {}, "protectedSettings": {"remove_user": "foouser1"},
-      "typeHandlerVersion": "1.4", "type": "VMAccessForLinux", "publisher": "Microsoft.OSTCExtensions"},
-      "location": "eastus"}'
+    body: '{"properties": {"type": "VMAccessForLinux", "publisher": "Microsoft.OSTCExtensions",
+      "typeHandlerVersion": "1.4", "settings": {}, "protectedSettings": {"remove_user":
+      "foouser1"}}, "location": "eastus"}'
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Length: ['202']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [e61a5a5e-e757-11e6-99d5-64510658e3b3]
+      x-ms-client-request-id: [d46b8f92-f0e6-11e6-9fbf-f4b7e2e85440]
     method: PUT
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod/extensions/enablevmaccess?api-version=2016-04-30-preview
   response:
@@ -1162,10 +1330,10 @@ interactions:
         ,\r\n  \"location\": \"eastus\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod/extensions/enablevmaccess\"\
         ,\r\n  \"name\": \"enablevmaccess\"\r\n}"}
     headers:
-      Azure-AsyncOperation: ['https://management.azure.com/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/providers/Microsoft.Compute/locations/eastus/operations/870a2d3e-46b7-4648-9585-bcc6e310ba5a?api-version=2016-04-30-preview']
+      Azure-AsyncOperation: ['https://management.azure.com/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/providers/Microsoft.Compute/locations/eastus/operations/dff2744e-8e45-4d8a-a15a-01345258887a?api-version=2016-04-30-preview']
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 01:52:18 GMT']
+      Date: ['Sun, 12 Feb 2017 05:48:07 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -1173,7 +1341,7 @@ interactions:
       Transfer-Encoding: [chunked]
       Vary: [Accept-Encoding]
       content-length: ['541']
-      x-ms-ratelimit-remaining-subscription-writes: ['1199']
+      x-ms-ratelimit-remaining-subscription-writes: ['1197']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -1182,20 +1350,20 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [e61a5a5e-e757-11e6-99d5-64510658e3b3]
+      x-ms-client-request-id: [d46b8f92-f0e6-11e6-9fbf-f4b7e2e85440]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/eastus/operations/870a2d3e-46b7-4648-9585-bcc6e310ba5a?api-version=2016-04-30-preview
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/eastus/operations/dff2744e-8e45-4d8a-a15a-01345258887a?api-version=2016-04-30-preview
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-01-31T01:52:18.8551059+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"870a2d3e-46b7-4648-9585-bcc6e310ba5a\"\
+    body: {string: "{\r\n  \"startTime\": \"2017-02-12T05:48:06.9081253+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"dff2744e-8e45-4d8a-a15a-01345258887a\"\
         \r\n}"}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 01:52:49 GMT']
+      Date: ['Sun, 12 Feb 2017 05:48:38 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -1211,20 +1379,20 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [e61a5a5e-e757-11e6-99d5-64510658e3b3]
+      x-ms-client-request-id: [d46b8f92-f0e6-11e6-9fbf-f4b7e2e85440]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/eastus/operations/870a2d3e-46b7-4648-9585-bcc6e310ba5a?api-version=2016-04-30-preview
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/eastus/operations/dff2744e-8e45-4d8a-a15a-01345258887a?api-version=2016-04-30-preview
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-01-31T01:52:18.8551059+00:00\",\r\
-        \n  \"endTime\": \"2017-01-31T01:53:09.2209873+00:00\",\r\n  \"status\": \"\
-        Succeeded\",\r\n  \"name\": \"870a2d3e-46b7-4648-9585-bcc6e310ba5a\"\r\n}"}
+    body: {string: "{\r\n  \"startTime\": \"2017-02-12T05:48:06.9081253+00:00\",\r\
+        \n  \"endTime\": \"2017-02-12T05:49:04.5020297+00:00\",\r\n  \"status\": \"\
+        Succeeded\",\r\n  \"name\": \"dff2744e-8e45-4d8a-a15a-01345258887a\"\r\n}"}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 01:53:19 GMT']
+      Date: ['Sun, 12 Feb 2017 05:49:09 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -1240,10 +1408,10 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [e61a5a5e-e757-11e6-99d5-64510658e3b3]
+      x-ms-client-request-id: [d46b8f92-f0e6-11e6-9fbf-f4b7e2e85440]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod/extensions/enablevmaccess?api-version=2016-04-30-preview
   response:
@@ -1256,7 +1424,7 @@ interactions:
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 01:53:20 GMT']
+      Date: ['Sun, 12 Feb 2017 05:49:09 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -1272,22 +1440,22 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          networkmanagementclient/0.30.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          networkmanagementclient/0.30.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [0b480828-e758-11e6-b578-64510658e3b3]
+      x-ms-client-request-id: [fa5f6b68-f0e6-11e6-8fdb-f4b7e2e85440]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/networkSecurityGroups/mynsg?api-version=2016-09-01
   response:
     body: {string: "{\r\n  \"name\": \"mynsg\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/networkSecurityGroups/mynsg\"\
-        ,\r\n  \"etag\": \"W/\\\"28d54eeb-7a37-4c03-bbc9-cf3a410e8a4b\\\"\",\r\n \
+        ,\r\n  \"etag\": \"W/\\\"f840d38f-2f24-41e3-a905-418460ca43b5\\\"\",\r\n \
         \ \"type\": \"Microsoft.Network/networkSecurityGroups\",\r\n  \"location\"\
-        : \"eastus\",\r\n  \"tags\": {\r\n    \"secondtag\": \"2\",\r\n    \"firsttag\"\
-        : \"1\",\r\n    \"thirdtag\": \"\"\r\n  },\r\n  \"properties\": {\r\n    \"\
-        provisioningState\": \"Succeeded\",\r\n    \"resourceGuid\": \"9242b078-27f4-45f7-b283-d429f44f8da3\"\
+        : \"eastus\",\r\n  \"tags\": {\r\n    \"firsttag\": \"1\",\r\n    \"thirdtag\"\
+        : \"\",\r\n    \"secondtag\": \"2\"\r\n  },\r\n  \"properties\": {\r\n   \
+        \ \"provisioningState\": \"Succeeded\",\r\n    \"resourceGuid\": \"a3630384-b524-4b44-9778-641c0a70063b\"\
         ,\r\n    \"securityRules\": [\r\n      {\r\n        \"name\": \"default-allow-ssh\"\
         ,\r\n        \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/networkSecurityGroups/mynsg/securityRules/default-allow-ssh\"\
-        ,\r\n        \"etag\": \"W/\\\"28d54eeb-7a37-4c03-bbc9-cf3a410e8a4b\\\"\"\
+        ,\r\n        \"etag\": \"W/\\\"f840d38f-2f24-41e3-a905-418460ca43b5\\\"\"\
         ,\r\n        \"properties\": {\r\n          \"provisioningState\": \"Succeeded\"\
         ,\r\n          \"protocol\": \"Tcp\",\r\n          \"sourcePortRange\": \"\
         *\",\r\n          \"destinationPortRange\": \"22\",\r\n          \"sourceAddressPrefix\"\
@@ -1296,7 +1464,7 @@ interactions:
         : \"Inbound\"\r\n        }\r\n      }\r\n    ],\r\n    \"defaultSecurityRules\"\
         : [\r\n      {\r\n        \"name\": \"AllowVnetInBound\",\r\n        \"id\"\
         : \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/networkSecurityGroups/mynsg/defaultSecurityRules/AllowVnetInBound\"\
-        ,\r\n        \"etag\": \"W/\\\"28d54eeb-7a37-4c03-bbc9-cf3a410e8a4b\\\"\"\
+        ,\r\n        \"etag\": \"W/\\\"f840d38f-2f24-41e3-a905-418460ca43b5\\\"\"\
         ,\r\n        \"properties\": {\r\n          \"provisioningState\": \"Succeeded\"\
         ,\r\n          \"description\": \"Allow inbound traffic from all VMs in VNET\"\
         ,\r\n          \"protocol\": \"*\",\r\n          \"sourcePortRange\": \"*\"\
@@ -1306,7 +1474,7 @@ interactions:
         \          \"direction\": \"Inbound\"\r\n        }\r\n      },\r\n      {\r\
         \n        \"name\": \"AllowAzureLoadBalancerInBound\",\r\n        \"id\":\
         \ \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/networkSecurityGroups/mynsg/defaultSecurityRules/AllowAzureLoadBalancerInBound\"\
-        ,\r\n        \"etag\": \"W/\\\"28d54eeb-7a37-4c03-bbc9-cf3a410e8a4b\\\"\"\
+        ,\r\n        \"etag\": \"W/\\\"f840d38f-2f24-41e3-a905-418460ca43b5\\\"\"\
         ,\r\n        \"properties\": {\r\n          \"provisioningState\": \"Succeeded\"\
         ,\r\n          \"description\": \"Allow inbound traffic from azure load balancer\"\
         ,\r\n          \"protocol\": \"*\",\r\n          \"sourcePortRange\": \"*\"\
@@ -1315,7 +1483,7 @@ interactions:
         ,\r\n          \"access\": \"Allow\",\r\n          \"priority\": 65001,\r\n\
         \          \"direction\": \"Inbound\"\r\n        }\r\n      },\r\n      {\r\
         \n        \"name\": \"DenyAllInBound\",\r\n        \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/networkSecurityGroups/mynsg/defaultSecurityRules/DenyAllInBound\"\
-        ,\r\n        \"etag\": \"W/\\\"28d54eeb-7a37-4c03-bbc9-cf3a410e8a4b\\\"\"\
+        ,\r\n        \"etag\": \"W/\\\"f840d38f-2f24-41e3-a905-418460ca43b5\\\"\"\
         ,\r\n        \"properties\": {\r\n          \"provisioningState\": \"Succeeded\"\
         ,\r\n          \"description\": \"Deny all inbound traffic\",\r\n        \
         \  \"protocol\": \"*\",\r\n          \"sourcePortRange\": \"*\",\r\n     \
@@ -1324,7 +1492,7 @@ interactions:
         access\": \"Deny\",\r\n          \"priority\": 65500,\r\n          \"direction\"\
         : \"Inbound\"\r\n        }\r\n      },\r\n      {\r\n        \"name\": \"\
         AllowVnetOutBound\",\r\n        \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/networkSecurityGroups/mynsg/defaultSecurityRules/AllowVnetOutBound\"\
-        ,\r\n        \"etag\": \"W/\\\"28d54eeb-7a37-4c03-bbc9-cf3a410e8a4b\\\"\"\
+        ,\r\n        \"etag\": \"W/\\\"f840d38f-2f24-41e3-a905-418460ca43b5\\\"\"\
         ,\r\n        \"properties\": {\r\n          \"provisioningState\": \"Succeeded\"\
         ,\r\n          \"description\": \"Allow outbound traffic from all VMs to all\
         \ VMs in VNET\",\r\n          \"protocol\": \"*\",\r\n          \"sourcePortRange\"\
@@ -1333,7 +1501,7 @@ interactions:
         ,\r\n          \"access\": \"Allow\",\r\n          \"priority\": 65000,\r\n\
         \          \"direction\": \"Outbound\"\r\n        }\r\n      },\r\n      {\r\
         \n        \"name\": \"AllowInternetOutBound\",\r\n        \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/networkSecurityGroups/mynsg/defaultSecurityRules/AllowInternetOutBound\"\
-        ,\r\n        \"etag\": \"W/\\\"28d54eeb-7a37-4c03-bbc9-cf3a410e8a4b\\\"\"\
+        ,\r\n        \"etag\": \"W/\\\"f840d38f-2f24-41e3-a905-418460ca43b5\\\"\"\
         ,\r\n        \"properties\": {\r\n          \"provisioningState\": \"Succeeded\"\
         ,\r\n          \"description\": \"Allow outbound traffic from all VMs to Internet\"\
         ,\r\n          \"protocol\": \"*\",\r\n          \"sourcePortRange\": \"*\"\
@@ -1342,7 +1510,7 @@ interactions:
         \      \"access\": \"Allow\",\r\n          \"priority\": 65001,\r\n      \
         \    \"direction\": \"Outbound\"\r\n        }\r\n      },\r\n      {\r\n \
         \       \"name\": \"DenyAllOutBound\",\r\n        \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/networkSecurityGroups/mynsg/defaultSecurityRules/DenyAllOutBound\"\
-        ,\r\n        \"etag\": \"W/\\\"28d54eeb-7a37-4c03-bbc9-cf3a410e8a4b\\\"\"\
+        ,\r\n        \"etag\": \"W/\\\"f840d38f-2f24-41e3-a905-418460ca43b5\\\"\"\
         ,\r\n        \"properties\": {\r\n          \"provisioningState\": \"Succeeded\"\
         ,\r\n          \"description\": \"Deny all outbound traffic\",\r\n       \
         \   \"protocol\": \"*\",\r\n          \"sourcePortRange\": \"*\",\r\n    \
@@ -1355,8 +1523,8 @@ interactions:
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 01:53:21 GMT']
-      ETag: [W/"28d54eeb-7a37-4c03-bbc9-cf3a410e8a4b"]
+      Date: ['Sun, 12 Feb 2017 05:49:11 GMT']
+      ETag: [W/"f840d38f-2f24-41e3-a905-418460ca43b5"]
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -1372,35 +1540,35 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          networkmanagementclient/0.30.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          networkmanagementclient/0.30.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [0bbd156e-e758-11e6-afb0-64510658e3b3]
+      x-ms-client-request-id: [fb178e74-f0e6-11e6-be24-f4b7e2e85440]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/publicIPAddresses/mypubip?api-version=2016-09-01
   response:
     body: {string: "{\r\n  \"name\": \"mypubip\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/publicIPAddresses/mypubip\"\
-        ,\r\n  \"etag\": \"W/\\\"3ed35929-892b-4a38-9250-af542a8c97e1\\\"\",\r\n \
+        ,\r\n  \"etag\": \"W/\\\"2d92028c-3228-454b-bf81-a4487d157c3d\\\"\",\r\n \
         \ \"type\": \"Microsoft.Network/publicIPAddresses\",\r\n  \"location\": \"\
-        eastus\",\r\n  \"tags\": {\r\n    \"secondtag\": \"2\",\r\n    \"firsttag\"\
-        : \"1\",\r\n    \"thirdtag\": \"\"\r\n  },\r\n  \"properties\": {\r\n    \"\
-        provisioningState\": \"Succeeded\",\r\n    \"resourceGuid\": \"b7e37011-797b-469a-b1b9-d34ab5f33d3a\"\
-        ,\r\n    \"ipAddress\": \"40.71.99.3\",\r\n    \"publicIPAddressVersion\"\
+        eastus\",\r\n  \"tags\": {\r\n    \"firsttag\": \"1\",\r\n    \"thirdtag\"\
+        : \"\",\r\n    \"secondtag\": \"2\"\r\n  },\r\n  \"properties\": {\r\n   \
+        \ \"provisioningState\": \"Succeeded\",\r\n    \"resourceGuid\": \"42e08a80-8dd0-4de5-9118-890ede4f1dc8\"\
+        ,\r\n    \"ipAddress\": \"40.121.214.78\",\r\n    \"publicIPAddressVersion\"\
         : \"IPv4\",\r\n    \"publicIPAllocationMethod\": \"Dynamic\",\r\n    \"idleTimeoutInMinutes\"\
         : 4,\r\n    \"ipConfiguration\": {\r\n      \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/networkInterfaces/vm-state-modVMNic/ipConfigurations/ipconfigvm-state-mod\"\
         \r\n    }\r\n  }\r\n}"}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 01:53:22 GMT']
-      ETag: [W/"3ed35929-892b-4a38-9250-af542a8c97e1"]
+      Date: ['Sun, 12 Feb 2017 05:49:12 GMT']
+      ETag: [W/"2d92028c-3228-454b-bf81-a4487d157c3d"]
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
       Transfer-Encoding: [chunked]
       Vary: [Accept-Encoding]
-      content-length: ['919']
+      content-length: ['922']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -1409,23 +1577,23 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          networkmanagementclient/0.30.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          networkmanagementclient/0.30.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [0c26bf36-e758-11e6-b46b-64510658e3b3]
+      x-ms-client-request-id: [fba559b4-f0e6-11e6-aee4-f4b7e2e85440]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/virtualNetworks/myvnet?api-version=2016-09-01
   response:
     body: {string: "{\r\n  \"name\": \"myvnet\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/virtualNetworks/myvnet\"\
-        ,\r\n  \"etag\": \"W/\\\"4142f211-8cc9-4553-9ca0-cf512339d274\\\"\",\r\n \
+        ,\r\n  \"etag\": \"W/\\\"52d0a7ac-f50d-4791-a551-ddb52fbec08f\\\"\",\r\n \
         \ \"type\": \"Microsoft.Network/virtualNetworks\",\r\n  \"location\": \"eastus\"\
-        ,\r\n  \"tags\": {\r\n    \"secondtag\": \"2\",\r\n    \"firsttag\": \"1\"\
-        ,\r\n    \"thirdtag\": \"\"\r\n  },\r\n  \"properties\": {\r\n    \"provisioningState\"\
-        : \"Succeeded\",\r\n    \"resourceGuid\": \"17381e96-d5c9-4a52-b26d-9caaff5a836a\"\
+        ,\r\n  \"tags\": {\r\n    \"firsttag\": \"1\",\r\n    \"thirdtag\": \"\",\r\
+        \n    \"secondtag\": \"2\"\r\n  },\r\n  \"properties\": {\r\n    \"provisioningState\"\
+        : \"Succeeded\",\r\n    \"resourceGuid\": \"ba2b967e-6094-4006-8130-c440c5b7e24d\"\
         ,\r\n    \"addressSpace\": {\r\n      \"addressPrefixes\": [\r\n        \"\
         10.0.0.0/16\"\r\n      ]\r\n    },\r\n    \"subnets\": [\r\n      {\r\n  \
         \      \"name\": \"vm-state-modSubnet\",\r\n        \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/virtualNetworks/myvnet/subnets/vm-state-modSubnet\"\
-        ,\r\n        \"etag\": \"W/\\\"4142f211-8cc9-4553-9ca0-cf512339d274\\\"\"\
+        ,\r\n        \"etag\": \"W/\\\"52d0a7ac-f50d-4791-a551-ddb52fbec08f\\\"\"\
         ,\r\n        \"properties\": {\r\n          \"provisioningState\": \"Succeeded\"\
         ,\r\n          \"addressPrefix\": \"10.0.0.0/24\",\r\n          \"ipConfigurations\"\
         : [\r\n            {\r\n              \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/networkInterfaces/vm-state-modVMNic/ipConfigurations/ipconfigvm-state-mod\"\
@@ -1434,8 +1602,8 @@ interactions:
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 01:53:23 GMT']
-      ETag: [W/"4142f211-8cc9-4553-9ca0-cf512339d274"]
+      Date: ['Sun, 12 Feb 2017 05:49:13 GMT']
+      ETag: [W/"52d0a7ac-f50d-4791-a551-ddb52fbec08f"]
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -1451,20 +1619,20 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          storagemanagementclient/0.31.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          storagemanagementclient/0.31.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [0ca1819c-e758-11e6-8070-64510658e3b3]
+      x-ms-client-request-id: [fc3f9368-f0e6-11e6-a44c-f4b7e2e85440]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Storage/storageAccounts/ab394fvkdj34?api-version=2016-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Storage/storageAccounts/ab394fvkdj39?api-version=2016-12-01
   response:
-    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Storage/storageAccounts/ab394fvkdj34","kind":"Storage","location":"eastus","name":"ab394fvkdj34","properties":{"creationTime":"2017-01-31T01:48:40.0006563Z","primaryEndpoints":{"blob":"https://ab394fvkdj34.blob.core.windows.net/","file":"https://ab394fvkdj34.file.core.windows.net/","queue":"https://ab394fvkdj34.queue.core.windows.net/","table":"https://ab394fvkdj34.table.core.windows.net/"},"primaryLocation":"eastus","provisioningState":"Succeeded","statusOfPrimary":"available"},"sku":{"name":"Standard_LRS","tier":"Standard"},"tags":{"firsttag":"1","secondtag":"2","thirdtag":""},"type":"Microsoft.Storage/storageAccounts"}
+    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Storage/storageAccounts/ab394fvkdj39","kind":"Storage","location":"eastus","name":"ab394fvkdj39","properties":{"creationTime":"2017-02-12T05:43:51.9016036Z","primaryEndpoints":{"blob":"https://ab394fvkdj39.blob.core.windows.net/","file":"https://ab394fvkdj39.file.core.windows.net/","queue":"https://ab394fvkdj39.queue.core.windows.net/","table":"https://ab394fvkdj39.table.core.windows.net/"},"primaryLocation":"eastus","provisioningState":"Succeeded","statusOfPrimary":"available"},"sku":{"name":"Standard_LRS","tier":"Standard"},"tags":{"firsttag":"1","secondtag":"2","thirdtag":""},"type":"Microsoft.Storage/storageAccounts"}
 
         '}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json]
-      Date: ['Tue, 31 Jan 2017 01:53:23 GMT']
+      Date: ['Sun, 12 Feb 2017 05:49:14 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-Azure-Storage-Resource-Provider/1.0, Microsoft-HTTPAPI/2.0]
@@ -1481,25 +1649,25 @@ interactions:
       Connection: [keep-alive]
       Content-Length: ['0']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [0d196178-e758-11e6-8f81-64510658e3b3]
+      x-ms-client-request-id: [fce5aa3e-f0e6-11e6-b8b1-f4b7e2e85440]
     method: POST
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod/powerOff?api-version=2016-04-30-preview
   response:
     body: {string: ''}
     headers:
-      Azure-AsyncOperation: ['https://management.azure.com/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/providers/Microsoft.Compute/locations/eastus/operations/51777e61-5a04-448c-8f2f-f0ef96142b8b?api-version=2016-04-30-preview']
+      Azure-AsyncOperation: ['https://management.azure.com/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/providers/Microsoft.Compute/locations/eastus/operations/3278ac2a-6a35-47c4-97ca-1cfe33455cfb?api-version=2016-04-30-preview']
       Cache-Control: [no-cache]
       Content-Length: ['0']
-      Date: ['Tue, 31 Jan 2017 01:53:24 GMT']
+      Date: ['Sun, 12 Feb 2017 05:49:15 GMT']
       Expires: ['-1']
-      Location: ['https://management.azure.com/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/providers/Microsoft.Compute/locations/eastus/operations/51777e61-5a04-448c-8f2f-f0ef96142b8b?monitor=true&api-version=2016-04-30-preview']
+      Location: ['https://management.azure.com/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/providers/Microsoft.Compute/locations/eastus/operations/3278ac2a-6a35-47c4-97ca-1cfe33455cfb?monitor=true&api-version=2016-04-30-preview']
       Pragma: [no-cache]
       Server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
-      x-ms-ratelimit-remaining-subscription-writes: ['1199']
+      x-ms-ratelimit-remaining-subscription-writes: ['1198']
     status: {code: 202, message: Accepted}
 - request:
     body: null
@@ -1508,27 +1676,27 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [0d196178-e758-11e6-8f81-64510658e3b3]
+      x-ms-client-request-id: [fce5aa3e-f0e6-11e6-b8b1-f4b7e2e85440]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/eastus/operations/51777e61-5a04-448c-8f2f-f0ef96142b8b?api-version=2016-04-30-preview
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/eastus/operations/3278ac2a-6a35-47c4-97ca-1cfe33455cfb?api-version=2016-04-30-preview
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-01-31T01:53:24.2680711+00:00\",\r\
-        \n  \"endTime\": \"2017-01-31T01:53:31.3774374+00:00\",\r\n  \"status\": \"\
-        Succeeded\",\r\n  \"name\": \"51777e61-5a04-448c-8f2f-f0ef96142b8b\"\r\n}"}
+    body: {string: "{\r\n  \"startTime\": \"2017-02-12T05:49:14.564512+00:00\",\r\n\
+        \  \"endTime\": \"2017-02-12T05:49:35.7363746+00:00\",\r\n  \"status\": \"\
+        Succeeded\",\r\n  \"name\": \"3278ac2a-6a35-47c4-97ca-1cfe33455cfb\"\r\n}"}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 01:53:54 GMT']
+      Date: ['Sun, 12 Feb 2017 05:49:46 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
       Transfer-Encoding: [chunked]
       Vary: [Accept-Encoding]
-      content-length: ['184']
+      content-length: ['183']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -1537,21 +1705,21 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [1fc594ae-e758-11e6-9407-64510658e3b3]
+      x-ms-client-request-id: [10526b62-f0e7-11e6-ad77-f4b7e2e85440]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod?api-version=2016-04-30-preview&$expand=instanceView
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod?$expand=instanceView&api-version=2016-04-30-preview
   response:
-    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"c05b0fe2-cdfc-47e5-903a-d751c65b9ff9\"\
+    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"987654cb-f4fa-4426-8f3f-c9fda42418e2\"\
         ,\r\n    \"hardwareProfile\": {\r\n      \"vmSize\": \"Standard_DS1\"\r\n\
         \    },\r\n    \"storageProfile\": {\r\n      \"imageReference\": {\r\n  \
         \      \"publisher\": \"Canonical\",\r\n        \"offer\": \"UbuntuServer\"\
         ,\r\n        \"sku\": \"14.04.4-LTS\",\r\n        \"version\": \"latest\"\r\
         \n      },\r\n      \"osDisk\": {\r\n        \"osType\": \"Linux\",\r\n  \
-        \      \"name\": \"osdisk_67DTRZjyk0\",\r\n        \"createOption\": \"FromImage\"\
-        ,\r\n        \"vhd\": {\r\n          \"uri\": \"https://ab394fvkdj34.blob.core.windows.net/vhds/osdisk_67DTRZjyk0.vhd\"\
+        \      \"name\": \"osdisk_vJe7inxoHG\",\r\n        \"createOption\": \"FromImage\"\
+        ,\r\n        \"vhd\": {\r\n          \"uri\": \"https://ab394fvkdj39.blob.core.windows.net/vhds/osdisk_vJe7inxoHG.vhd\"\
         \r\n        },\r\n        \"caching\": \"ReadWrite\"\r\n      },\r\n     \
         \ \"dataDisks\": []\r\n    },\r\n    \"osProfile\": {\r\n      \"computerName\"\
         : \"vm-state-mod\",\r\n      \"adminUsername\": \"ubuntu\",\r\n      \"linuxConfiguration\"\
@@ -1563,17 +1731,17 @@ interactions:
         ,\r\n        \"statuses\": [\r\n          {\r\n            \"code\": \"ProvisioningState/succeeded\"\
         ,\r\n            \"level\": \"Info\",\r\n            \"displayStatus\": \"\
         Ready\",\r\n            \"message\": \"GuestAgent is running and accepting\
-        \ new configurations.\",\r\n            \"time\": \"2017-01-31T01:53:06+00:00\"\
+        \ new configurations.\",\r\n            \"time\": \"2017-02-12T05:49:26+00:00\"\
         \r\n          }\r\n        ],\r\n        \"extensionHandlers\": [\r\n    \
         \      {\r\n            \"type\": \"Microsoft.OSTCExtensions.VMAccessForLinux\"\
         ,\r\n            \"typeHandlerVersion\": \"1.4.6.0\",\r\n            \"status\"\
         : {\r\n              \"code\": \"ProvisioningState/succeeded\",\r\n      \
         \        \"level\": \"Info\",\r\n              \"displayStatus\": \"Ready\"\
         \r\n            }\r\n          }\r\n        ]\r\n      },\r\n      \"disks\"\
-        : [\r\n        {\r\n          \"name\": \"osdisk_67DTRZjyk0\",\r\n       \
+        : [\r\n        {\r\n          \"name\": \"osdisk_vJe7inxoHG\",\r\n       \
         \   \"statuses\": [\r\n            {\r\n              \"code\": \"ProvisioningState/succeeded\"\
         ,\r\n              \"level\": \"Info\",\r\n              \"displayStatus\"\
-        : \"Provisioning succeeded\",\r\n              \"time\": \"2017-01-31T01:52:18.90203+00:00\"\
+        : \"Provisioning succeeded\",\r\n              \"time\": \"2017-02-12T05:48:06.9549916+00:00\"\
         \r\n            }\r\n          ]\r\n        }\r\n      ],\r\n      \"extensions\"\
         : [\r\n        {\r\n          \"name\": \"enablevmaccess\",\r\n          \"\
         type\": \"Microsoft.OSTCExtensions.VMAccessForLinux\",\r\n          \"typeHandlerVersion\"\
@@ -1584,7 +1752,7 @@ interactions:
         \          ]\r\n        }\r\n      ],\r\n      \"statuses\": [\r\n       \
         \ {\r\n          \"code\": \"ProvisioningState/succeeded\",\r\n          \"\
         level\": \"Info\",\r\n          \"displayStatus\": \"Provisioning succeeded\"\
-        ,\r\n          \"time\": \"2017-01-31T01:53:31.3618102+00:00\"\r\n       \
+        ,\r\n          \"time\": \"2017-02-12T05:49:35.7207789+00:00\"\r\n       \
         \ },\r\n        {\r\n          \"code\": \"PowerState/stopped\",\r\n     \
         \     \"level\": \"Info\",\r\n          \"displayStatus\": \"VM stopped\"\r\
         \n        }\r\n      ]\r\n    }\r\n  },\r\n  \"resources\": [\r\n    {\r\n\
@@ -1596,20 +1764,20 @@ interactions:
         location\": \"eastus\",\r\n      \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod/extensions/enablevmaccess\"\
         ,\r\n      \"name\": \"enablevmaccess\"\r\n    }\r\n  ],\r\n  \"type\": \"\
         Microsoft.Compute/virtualMachines\",\r\n  \"location\": \"eastus\",\r\n  \"\
-        tags\": {\r\n    \"secondtag\": \"2\",\r\n    \"firsttag\": \"1\",\r\n   \
-        \ \"thirdtag\": \"\"\r\n  },\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod\"\
+        tags\": {\r\n    \"firsttag\": \"1\",\r\n    \"thirdtag\": \"\",\r\n    \"\
+        secondtag\": \"2\"\r\n  },\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod\"\
         ,\r\n  \"name\": \"vm-state-mod\"\r\n}"}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 01:53:55 GMT']
+      Date: ['Sun, 12 Feb 2017 05:49:47 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
       Transfer-Encoding: [chunked]
       Vary: [Accept-Encoding]
-      content-length: ['4052']
+      content-length: ['4054']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -1619,25 +1787,25 @@ interactions:
       Connection: [keep-alive]
       Content-Length: ['0']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [20415364-e758-11e6-9e6e-64510658e3b3]
+      x-ms-client-request-id: [10eb7d90-f0e7-11e6-92d4-f4b7e2e85440]
     method: POST
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod/start?api-version=2016-04-30-preview
   response:
     body: {string: ''}
     headers:
-      Azure-AsyncOperation: ['https://management.azure.com/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/providers/Microsoft.Compute/locations/eastus/operations/631ced5c-0378-495e-8553-f41ed04a1348?api-version=2016-04-30-preview']
+      Azure-AsyncOperation: ['https://management.azure.com/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/providers/Microsoft.Compute/locations/eastus/operations/ead6983b-5066-4a9b-9767-bd9926fadbcf?api-version=2016-04-30-preview']
       Cache-Control: [no-cache]
       Content-Length: ['0']
-      Date: ['Tue, 31 Jan 2017 01:53:56 GMT']
+      Date: ['Sun, 12 Feb 2017 05:49:49 GMT']
       Expires: ['-1']
-      Location: ['https://management.azure.com/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/providers/Microsoft.Compute/locations/eastus/operations/631ced5c-0378-495e-8553-f41ed04a1348?monitor=true&api-version=2016-04-30-preview']
+      Location: ['https://management.azure.com/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/providers/Microsoft.Compute/locations/eastus/operations/ead6983b-5066-4a9b-9767-bd9926fadbcf?monitor=true&api-version=2016-04-30-preview']
       Pragma: [no-cache]
       Server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
-      x-ms-ratelimit-remaining-subscription-writes: ['1198']
+      x-ms-ratelimit-remaining-subscription-writes: ['1195']
     status: {code: 202, message: Accepted}
 - request:
     body: null
@@ -1646,27 +1814,27 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [20415364-e758-11e6-9e6e-64510658e3b3]
+      x-ms-client-request-id: [10eb7d90-f0e7-11e6-92d4-f4b7e2e85440]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/eastus/operations/631ced5c-0378-495e-8553-f41ed04a1348?api-version=2016-04-30-preview
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/eastus/operations/ead6983b-5066-4a9b-9767-bd9926fadbcf?api-version=2016-04-30-preview
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-01-31T01:53:56.1276273+00:00\",\r\
-        \n  \"endTime\": \"2017-01-31T01:54:24.3465608+00:00\",\r\n  \"status\": \"\
-        Succeeded\",\r\n  \"name\": \"631ced5c-0378-495e-8553-f41ed04a1348\"\r\n}"}
+    body: {string: "{\r\n  \"startTime\": \"2017-02-12T05:49:48.1426357+00:00\",\r\
+        \n  \"endTime\": \"2017-02-12T05:50:16.332209+00:00\",\r\n  \"status\": \"\
+        Succeeded\",\r\n  \"name\": \"ead6983b-5066-4a9b-9767-bd9926fadbcf\"\r\n}"}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 01:54:26 GMT']
+      Date: ['Sun, 12 Feb 2017 05:50:19 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
       Transfer-Encoding: [chunked]
       Vary: [Accept-Encoding]
-      content-length: ['184']
+      content-length: ['183']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -1675,21 +1843,21 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [32ec4d86-e758-11e6-b588-64510658e3b3]
+      x-ms-client-request-id: [23cd025e-f0e7-11e6-9ade-f4b7e2e85440]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod?api-version=2016-04-30-preview&$expand=instanceView
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod?$expand=instanceView&api-version=2016-04-30-preview
   response:
-    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"c05b0fe2-cdfc-47e5-903a-d751c65b9ff9\"\
+    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"987654cb-f4fa-4426-8f3f-c9fda42418e2\"\
         ,\r\n    \"hardwareProfile\": {\r\n      \"vmSize\": \"Standard_DS1\"\r\n\
         \    },\r\n    \"storageProfile\": {\r\n      \"imageReference\": {\r\n  \
         \      \"publisher\": \"Canonical\",\r\n        \"offer\": \"UbuntuServer\"\
         ,\r\n        \"sku\": \"14.04.4-LTS\",\r\n        \"version\": \"latest\"\r\
         \n      },\r\n      \"osDisk\": {\r\n        \"osType\": \"Linux\",\r\n  \
-        \      \"name\": \"osdisk_67DTRZjyk0\",\r\n        \"createOption\": \"FromImage\"\
-        ,\r\n        \"vhd\": {\r\n          \"uri\": \"https://ab394fvkdj34.blob.core.windows.net/vhds/osdisk_67DTRZjyk0.vhd\"\
+        \      \"name\": \"osdisk_vJe7inxoHG\",\r\n        \"createOption\": \"FromImage\"\
+        ,\r\n        \"vhd\": {\r\n          \"uri\": \"https://ab394fvkdj39.blob.core.windows.net/vhds/osdisk_vJe7inxoHG.vhd\"\
         \r\n        },\r\n        \"caching\": \"ReadWrite\"\r\n      },\r\n     \
         \ \"dataDisks\": []\r\n    },\r\n    \"osProfile\": {\r\n      \"computerName\"\
         : \"vm-state-mod\",\r\n      \"adminUsername\": \"ubuntu\",\r\n      \"linuxConfiguration\"\
@@ -1701,17 +1869,17 @@ interactions:
         ,\r\n        \"statuses\": [\r\n          {\r\n            \"code\": \"ProvisioningState/succeeded\"\
         ,\r\n            \"level\": \"Info\",\r\n            \"displayStatus\": \"\
         Ready\",\r\n            \"message\": \"GuestAgent is running and accepting\
-        \ new configurations.\",\r\n            \"time\": \"2017-01-31T01:53:06+00:00\"\
+        \ new configurations.\",\r\n            \"time\": \"2017-02-12T05:49:26+00:00\"\
         \r\n          }\r\n        ],\r\n        \"extensionHandlers\": [\r\n    \
         \      {\r\n            \"type\": \"Microsoft.OSTCExtensions.VMAccessForLinux\"\
         ,\r\n            \"typeHandlerVersion\": \"1.4.6.0\",\r\n            \"status\"\
         : {\r\n              \"code\": \"ProvisioningState/succeeded\",\r\n      \
         \        \"level\": \"Info\",\r\n              \"displayStatus\": \"Ready\"\
         \r\n            }\r\n          }\r\n        ]\r\n      },\r\n      \"disks\"\
-        : [\r\n        {\r\n          \"name\": \"osdisk_67DTRZjyk0\",\r\n       \
+        : [\r\n        {\r\n          \"name\": \"osdisk_vJe7inxoHG\",\r\n       \
         \   \"statuses\": [\r\n            {\r\n              \"code\": \"ProvisioningState/succeeded\"\
         ,\r\n              \"level\": \"Info\",\r\n              \"displayStatus\"\
-        : \"Provisioning succeeded\",\r\n              \"time\": \"2017-01-31T01:52:18.90203+00:00\"\
+        : \"Provisioning succeeded\",\r\n              \"time\": \"2017-02-12T05:48:06.9549916+00:00\"\
         \r\n            }\r\n          ]\r\n        }\r\n      ],\r\n      \"extensions\"\
         : [\r\n        {\r\n          \"name\": \"enablevmaccess\",\r\n          \"\
         type\": \"Microsoft.OSTCExtensions.VMAccessForLinux\",\r\n          \"typeHandlerVersion\"\
@@ -1722,7 +1890,7 @@ interactions:
         \          ]\r\n        }\r\n      ],\r\n      \"statuses\": [\r\n       \
         \ {\r\n          \"code\": \"ProvisioningState/succeeded\",\r\n          \"\
         level\": \"Info\",\r\n          \"displayStatus\": \"Provisioning succeeded\"\
-        ,\r\n          \"time\": \"2017-01-31T01:54:24.3309239+00:00\"\r\n       \
+        ,\r\n          \"time\": \"2017-02-12T05:50:16.3166082+00:00\"\r\n       \
         \ },\r\n        {\r\n          \"code\": \"PowerState/running\",\r\n     \
         \     \"level\": \"Info\",\r\n          \"displayStatus\": \"VM running\"\r\
         \n        }\r\n      ]\r\n    }\r\n  },\r\n  \"resources\": [\r\n    {\r\n\
@@ -1734,20 +1902,20 @@ interactions:
         location\": \"eastus\",\r\n      \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod/extensions/enablevmaccess\"\
         ,\r\n      \"name\": \"enablevmaccess\"\r\n    }\r\n  ],\r\n  \"type\": \"\
         Microsoft.Compute/virtualMachines\",\r\n  \"location\": \"eastus\",\r\n  \"\
-        tags\": {\r\n    \"secondtag\": \"2\",\r\n    \"firsttag\": \"1\",\r\n   \
-        \ \"thirdtag\": \"\"\r\n  },\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod\"\
+        tags\": {\r\n    \"firsttag\": \"1\",\r\n    \"thirdtag\": \"\",\r\n    \"\
+        secondtag\": \"2\"\r\n  },\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod\"\
         ,\r\n  \"name\": \"vm-state-mod\"\r\n}"}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 01:54:27 GMT']
+      Date: ['Sun, 12 Feb 2017 05:50:21 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
       Transfer-Encoding: [chunked]
       Vary: [Accept-Encoding]
-      content-length: ['4052']
+      content-length: ['4054']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -1757,25 +1925,25 @@ interactions:
       Connection: [keep-alive]
       Content-Length: ['0']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [3368d5a4-e758-11e6-a23a-64510658e3b3]
+      x-ms-client-request-id: [245ac4d4-f0e7-11e6-8ba2-f4b7e2e85440]
     method: POST
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod/restart?api-version=2016-04-30-preview
   response:
     body: {string: ''}
     headers:
-      Azure-AsyncOperation: ['https://management.azure.com/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/providers/Microsoft.Compute/locations/eastus/operations/d45ced79-e80d-41b6-b878-d2d50f589784?api-version=2016-04-30-preview']
+      Azure-AsyncOperation: ['https://management.azure.com/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/providers/Microsoft.Compute/locations/eastus/operations/b6f1231e-54c9-4bf2-8f06-1b67ac36ac96?api-version=2016-04-30-preview']
       Cache-Control: [no-cache]
       Content-Length: ['0']
-      Date: ['Tue, 31 Jan 2017 01:54:28 GMT']
+      Date: ['Sun, 12 Feb 2017 05:50:22 GMT']
       Expires: ['-1']
-      Location: ['https://management.azure.com/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/providers/Microsoft.Compute/locations/eastus/operations/d45ced79-e80d-41b6-b878-d2d50f589784?monitor=true&api-version=2016-04-30-preview']
+      Location: ['https://management.azure.com/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/providers/Microsoft.Compute/locations/eastus/operations/b6f1231e-54c9-4bf2-8f06-1b67ac36ac96?monitor=true&api-version=2016-04-30-preview']
       Pragma: [no-cache]
       Server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
-      x-ms-ratelimit-remaining-subscription-writes: ['1198']
+      x-ms-ratelimit-remaining-subscription-writes: ['1194']
     status: {code: 202, message: Accepted}
 - request:
     body: null
@@ -1784,27 +1952,27 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [3368d5a4-e758-11e6-a23a-64510658e3b3]
+      x-ms-client-request-id: [245ac4d4-f0e7-11e6-8ba2-f4b7e2e85440]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/eastus/operations/d45ced79-e80d-41b6-b878-d2d50f589784?api-version=2016-04-30-preview
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/eastus/operations/b6f1231e-54c9-4bf2-8f06-1b67ac36ac96?api-version=2016-04-30-preview
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-01-31T01:54:28.5341193+00:00\",\r\
-        \n  \"endTime\": \"2017-01-31T01:54:28.674706+00:00\",\r\n  \"status\": \"\
-        Succeeded\",\r\n  \"name\": \"d45ced79-e80d-41b6-b878-d2d50f589784\"\r\n}"}
+    body: {string: "{\r\n  \"startTime\": \"2017-02-12T05:50:20.7697427+00:00\",\r\
+        \n  \"endTime\": \"2017-02-12T05:50:20.9259994+00:00\",\r\n  \"status\": \"\
+        Succeeded\",\r\n  \"name\": \"b6f1231e-54c9-4bf2-8f06-1b67ac36ac96\"\r\n}"}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 01:54:59 GMT']
+      Date: ['Sun, 12 Feb 2017 05:50:52 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
       Transfer-Encoding: [chunked]
       Vary: [Accept-Encoding]
-      content-length: ['183']
+      content-length: ['184']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -1813,21 +1981,21 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [4623b454-e758-11e6-bf56-64510658e3b3]
+      x-ms-client-request-id: [3738741e-f0e7-11e6-9cc5-f4b7e2e85440]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod?api-version=2016-04-30-preview&$expand=instanceView
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod?$expand=instanceView&api-version=2016-04-30-preview
   response:
-    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"c05b0fe2-cdfc-47e5-903a-d751c65b9ff9\"\
+    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"987654cb-f4fa-4426-8f3f-c9fda42418e2\"\
         ,\r\n    \"hardwareProfile\": {\r\n      \"vmSize\": \"Standard_DS1\"\r\n\
         \    },\r\n    \"storageProfile\": {\r\n      \"imageReference\": {\r\n  \
         \      \"publisher\": \"Canonical\",\r\n        \"offer\": \"UbuntuServer\"\
         ,\r\n        \"sku\": \"14.04.4-LTS\",\r\n        \"version\": \"latest\"\r\
         \n      },\r\n      \"osDisk\": {\r\n        \"osType\": \"Linux\",\r\n  \
-        \      \"name\": \"osdisk_67DTRZjyk0\",\r\n        \"createOption\": \"FromImage\"\
-        ,\r\n        \"vhd\": {\r\n          \"uri\": \"https://ab394fvkdj34.blob.core.windows.net/vhds/osdisk_67DTRZjyk0.vhd\"\
+        \      \"name\": \"osdisk_vJe7inxoHG\",\r\n        \"createOption\": \"FromImage\"\
+        ,\r\n        \"vhd\": {\r\n          \"uri\": \"https://ab394fvkdj39.blob.core.windows.net/vhds/osdisk_vJe7inxoHG.vhd\"\
         \r\n        },\r\n        \"caching\": \"ReadWrite\"\r\n      },\r\n     \
         \ \"dataDisks\": []\r\n    },\r\n    \"osProfile\": {\r\n      \"computerName\"\
         : \"vm-state-mod\",\r\n      \"adminUsername\": \"ubuntu\",\r\n      \"linuxConfiguration\"\
@@ -1839,17 +2007,17 @@ interactions:
         ,\r\n        \"statuses\": [\r\n          {\r\n            \"code\": \"ProvisioningState/succeeded\"\
         ,\r\n            \"level\": \"Info\",\r\n            \"displayStatus\": \"\
         Ready\",\r\n            \"message\": \"GuestAgent is running and accepting\
-        \ new configurations.\",\r\n            \"time\": \"2017-01-31T01:53:06+00:00\"\
+        \ new configurations.\",\r\n            \"time\": \"2017-02-12T05:49:26+00:00\"\
         \r\n          }\r\n        ],\r\n        \"extensionHandlers\": [\r\n    \
         \      {\r\n            \"type\": \"Microsoft.OSTCExtensions.VMAccessForLinux\"\
         ,\r\n            \"typeHandlerVersion\": \"1.4.6.0\",\r\n            \"status\"\
         : {\r\n              \"code\": \"ProvisioningState/succeeded\",\r\n      \
         \        \"level\": \"Info\",\r\n              \"displayStatus\": \"Ready\"\
         \r\n            }\r\n          }\r\n        ]\r\n      },\r\n      \"disks\"\
-        : [\r\n        {\r\n          \"name\": \"osdisk_67DTRZjyk0\",\r\n       \
+        : [\r\n        {\r\n          \"name\": \"osdisk_vJe7inxoHG\",\r\n       \
         \   \"statuses\": [\r\n            {\r\n              \"code\": \"ProvisioningState/succeeded\"\
         ,\r\n              \"level\": \"Info\",\r\n              \"displayStatus\"\
-        : \"Provisioning succeeded\",\r\n              \"time\": \"2017-01-31T01:52:18.90203+00:00\"\
+        : \"Provisioning succeeded\",\r\n              \"time\": \"2017-02-12T05:48:06.9549916+00:00\"\
         \r\n            }\r\n          ]\r\n        }\r\n      ],\r\n      \"extensions\"\
         : [\r\n        {\r\n          \"name\": \"enablevmaccess\",\r\n          \"\
         type\": \"Microsoft.OSTCExtensions.VMAccessForLinux\",\r\n          \"typeHandlerVersion\"\
@@ -1860,7 +2028,7 @@ interactions:
         \          ]\r\n        }\r\n      ],\r\n      \"statuses\": [\r\n       \
         \ {\r\n          \"code\": \"ProvisioningState/succeeded\",\r\n          \"\
         level\": \"Info\",\r\n          \"displayStatus\": \"Provisioning succeeded\"\
-        ,\r\n          \"time\": \"2017-01-31T01:54:28.6590578+00:00\"\r\n       \
+        ,\r\n          \"time\": \"2017-02-12T05:50:20.9103557+00:00\"\r\n       \
         \ },\r\n        {\r\n          \"code\": \"PowerState/running\",\r\n     \
         \     \"level\": \"Info\",\r\n          \"displayStatus\": \"VM running\"\r\
         \n        }\r\n      ]\r\n    }\r\n  },\r\n  \"resources\": [\r\n    {\r\n\
@@ -1872,20 +2040,20 @@ interactions:
         location\": \"eastus\",\r\n      \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod/extensions/enablevmaccess\"\
         ,\r\n      \"name\": \"enablevmaccess\"\r\n    }\r\n  ],\r\n  \"type\": \"\
         Microsoft.Compute/virtualMachines\",\r\n  \"location\": \"eastus\",\r\n  \"\
-        tags\": {\r\n    \"secondtag\": \"2\",\r\n    \"firsttag\": \"1\",\r\n   \
-        \ \"thirdtag\": \"\"\r\n  },\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod\"\
+        tags\": {\r\n    \"firsttag\": \"1\",\r\n    \"thirdtag\": \"\",\r\n    \"\
+        secondtag\": \"2\"\r\n  },\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod\"\
         ,\r\n  \"name\": \"vm-state-mod\"\r\n}"}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 01:54:59 GMT']
+      Date: ['Sun, 12 Feb 2017 05:50:53 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
       Transfer-Encoding: [chunked]
       Vary: [Accept-Encoding]
-      content-length: ['4052']
+      content-length: ['4054']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -1895,25 +2063,25 @@ interactions:
       Connection: [keep-alive]
       Content-Length: ['0']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [46a23488-e758-11e6-a317-64510658e3b3]
+      x-ms-client-request-id: [37ce7000-f0e7-11e6-a701-f4b7e2e85440]
     method: POST
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod/deallocate?api-version=2016-04-30-preview
   response:
     body: {string: ''}
     headers:
-      Azure-AsyncOperation: ['https://management.azure.com/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/providers/Microsoft.Compute/locations/eastus/operations/017a81b6-7a63-4ccc-92fa-19681fb2f8da?api-version=2016-04-30-preview']
+      Azure-AsyncOperation: ['https://management.azure.com/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/providers/Microsoft.Compute/locations/eastus/operations/8ab02d35-1e86-4bbf-9033-742c7ed3d158?api-version=2016-04-30-preview']
       Cache-Control: [no-cache]
       Content-Length: ['0']
-      Date: ['Tue, 31 Jan 2017 01:55:00 GMT']
+      Date: ['Sun, 12 Feb 2017 05:50:54 GMT']
       Expires: ['-1']
-      Location: ['https://management.azure.com/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/providers/Microsoft.Compute/locations/eastus/operations/017a81b6-7a63-4ccc-92fa-19681fb2f8da?monitor=true&api-version=2016-04-30-preview']
+      Location: ['https://management.azure.com/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/providers/Microsoft.Compute/locations/eastus/operations/8ab02d35-1e86-4bbf-9033-742c7ed3d158?monitor=true&api-version=2016-04-30-preview']
       Pragma: [no-cache]
       Server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
-      x-ms-ratelimit-remaining-subscription-writes: ['1199']
+      x-ms-ratelimit-remaining-subscription-writes: ['1193']
     status: {code: 202, message: Accepted}
 - request:
     body: null
@@ -1922,20 +2090,20 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [46a23488-e758-11e6-a317-64510658e3b3]
+      x-ms-client-request-id: [37ce7000-f0e7-11e6-a701-f4b7e2e85440]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/eastus/operations/017a81b6-7a63-4ccc-92fa-19681fb2f8da?api-version=2016-04-30-preview
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/eastus/operations/8ab02d35-1e86-4bbf-9033-742c7ed3d158?api-version=2016-04-30-preview
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-01-31T01:55:00.7530654+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"017a81b6-7a63-4ccc-92fa-19681fb2f8da\"\
+    body: {string: "{\r\n  \"startTime\": \"2017-02-12T05:50:53.4414801+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"8ab02d35-1e86-4bbf-9033-742c7ed3d158\"\
         \r\n}"}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 01:55:31 GMT']
+      Date: ['Sun, 12 Feb 2017 05:51:25 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -1951,49 +2119,20 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [46a23488-e758-11e6-a317-64510658e3b3]
+      x-ms-client-request-id: [37ce7000-f0e7-11e6-a701-f4b7e2e85440]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/eastus/operations/017a81b6-7a63-4ccc-92fa-19681fb2f8da?api-version=2016-04-30-preview
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/eastus/operations/8ab02d35-1e86-4bbf-9033-742c7ed3d158?api-version=2016-04-30-preview
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-01-31T01:55:00.7530654+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"017a81b6-7a63-4ccc-92fa-19681fb2f8da\"\
-        \r\n}"}
+    body: {string: "{\r\n  \"startTime\": \"2017-02-12T05:50:53.4414801+00:00\",\r\
+        \n  \"endTime\": \"2017-02-12T05:51:54.1306338+00:00\",\r\n  \"status\": \"\
+        Succeeded\",\r\n  \"name\": \"8ab02d35-1e86-4bbf-9033-742c7ed3d158\"\r\n}"}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 01:56:01 GMT']
-      Expires: ['-1']
-      Pragma: [no-cache]
-      Server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
-      Strict-Transport-Security: [max-age=31536000; includeSubDomains]
-      Transfer-Encoding: [chunked]
-      Vary: [Accept-Encoding]
-      content-length: ['134']
-    status: {code: 200, message: OK}
-- request:
-    body: null
-    headers:
-      Accept: [application/json]
-      Accept-Encoding: ['gzip, deflate']
-      Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
-      accept-language: [en-US]
-      x-ms-client-request-id: [46a23488-e758-11e6-a317-64510658e3b3]
-    method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/eastus/operations/017a81b6-7a63-4ccc-92fa-19681fb2f8da?api-version=2016-04-30-preview
-  response:
-    body: {string: "{\r\n  \"startTime\": \"2017-01-31T01:55:00.7530654+00:00\",\r\
-        \n  \"endTime\": \"2017-01-31T01:56:21.3629272+00:00\",\r\n  \"status\": \"\
-        Succeeded\",\r\n  \"name\": \"017a81b6-7a63-4ccc-92fa-19681fb2f8da\"\r\n}"}
-    headers:
-      Cache-Control: [no-cache]
-      Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 01:56:32 GMT']
+      Date: ['Sun, 12 Feb 2017 05:51:55 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -2009,21 +2148,21 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [7db41e0a-e758-11e6-a805-64510658e3b3]
+      x-ms-client-request-id: [5d2a0590-f0e7-11e6-b251-f4b7e2e85440]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod?api-version=2016-04-30-preview&$expand=instanceView
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod?$expand=instanceView&api-version=2016-04-30-preview
   response:
-    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"c05b0fe2-cdfc-47e5-903a-d751c65b9ff9\"\
+    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"987654cb-f4fa-4426-8f3f-c9fda42418e2\"\
         ,\r\n    \"hardwareProfile\": {\r\n      \"vmSize\": \"Standard_DS1\"\r\n\
         \    },\r\n    \"storageProfile\": {\r\n      \"imageReference\": {\r\n  \
         \      \"publisher\": \"Canonical\",\r\n        \"offer\": \"UbuntuServer\"\
         ,\r\n        \"sku\": \"14.04.4-LTS\",\r\n        \"version\": \"latest\"\r\
         \n      },\r\n      \"osDisk\": {\r\n        \"osType\": \"Linux\",\r\n  \
-        \      \"name\": \"osdisk_67DTRZjyk0\",\r\n        \"createOption\": \"FromImage\"\
-        ,\r\n        \"vhd\": {\r\n          \"uri\": \"https://ab394fvkdj34.blob.core.windows.net/vhds/osdisk_67DTRZjyk0.vhd\"\
+        \      \"name\": \"osdisk_vJe7inxoHG\",\r\n        \"createOption\": \"FromImage\"\
+        ,\r\n        \"vhd\": {\r\n          \"uri\": \"https://ab394fvkdj39.blob.core.windows.net/vhds/osdisk_vJe7inxoHG.vhd\"\
         \r\n        },\r\n        \"caching\": \"ReadWrite\"\r\n      },\r\n     \
         \ \"dataDisks\": []\r\n    },\r\n    \"osProfile\": {\r\n      \"computerName\"\
         : \"vm-state-mod\",\r\n      \"adminUsername\": \"ubuntu\",\r\n      \"linuxConfiguration\"\
@@ -2035,17 +2174,17 @@ interactions:
         ,\r\n        \"statuses\": [\r\n          {\r\n            \"code\": \"ProvisioningState/succeeded\"\
         ,\r\n            \"level\": \"Info\",\r\n            \"displayStatus\": \"\
         Ready\",\r\n            \"message\": \"GuestAgent is running and accepting\
-        \ new configurations.\",\r\n            \"time\": \"2017-01-31T01:53:06+00:00\"\
+        \ new configurations.\",\r\n            \"time\": \"2017-02-12T05:49:26+00:00\"\
         \r\n          }\r\n        ],\r\n        \"extensionHandlers\": [\r\n    \
         \      {\r\n            \"type\": \"Microsoft.OSTCExtensions.VMAccessForLinux\"\
         ,\r\n            \"typeHandlerVersion\": \"1.4.6.0\",\r\n            \"status\"\
         : {\r\n              \"code\": \"ProvisioningState/succeeded\",\r\n      \
         \        \"level\": \"Info\",\r\n              \"displayStatus\": \"Ready\"\
         \r\n            }\r\n          }\r\n        ]\r\n      },\r\n      \"disks\"\
-        : [\r\n        {\r\n          \"name\": \"osdisk_67DTRZjyk0\",\r\n       \
+        : [\r\n        {\r\n          \"name\": \"osdisk_vJe7inxoHG\",\r\n       \
         \   \"statuses\": [\r\n            {\r\n              \"code\": \"ProvisioningState/succeeded\"\
         ,\r\n              \"level\": \"Info\",\r\n              \"displayStatus\"\
-        : \"Provisioning succeeded\",\r\n              \"time\": \"2017-01-31T01:56:21.3316848+00:00\"\
+        : \"Provisioning succeeded\",\r\n              \"time\": \"2017-02-12T05:51:54.1150027+00:00\"\
         \r\n            }\r\n          ]\r\n        }\r\n      ],\r\n      \"extensions\"\
         : [\r\n        {\r\n          \"name\": \"enablevmaccess\",\r\n          \"\
         type\": \"Microsoft.OSTCExtensions.VMAccessForLinux\",\r\n          \"typeHandlerVersion\"\
@@ -2056,9 +2195,9 @@ interactions:
         \          ]\r\n        }\r\n      ],\r\n      \"statuses\": [\r\n       \
         \ {\r\n          \"code\": \"ProvisioningState/succeeded\",\r\n          \"\
         level\": \"Info\",\r\n          \"displayStatus\": \"Provisioning succeeded\"\
-        ,\r\n          \"time\": \"2017-01-31T01:56:21.347299+00:00\"\r\n        },\r\
-        \n        {\r\n          \"code\": \"PowerState/deallocated\",\r\n       \
-        \   \"level\": \"Info\",\r\n          \"displayStatus\": \"VM deallocated\"\
+        ,\r\n          \"time\": \"2017-02-12T05:51:54.1150027+00:00\"\r\n       \
+        \ },\r\n        {\r\n          \"code\": \"PowerState/deallocated\",\r\n \
+        \         \"level\": \"Info\",\r\n          \"displayStatus\": \"VM deallocated\"\
         \r\n        }\r\n      ]\r\n    }\r\n  },\r\n  \"resources\": [\r\n    {\r\
         \n      \"properties\": {\r\n        \"publisher\": \"Microsoft.OSTCExtensions\"\
         ,\r\n        \"type\": \"VMAccessForLinux\",\r\n        \"typeHandlerVersion\"\
@@ -2068,20 +2207,20 @@ interactions:
         location\": \"eastus\",\r\n      \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod/extensions/enablevmaccess\"\
         ,\r\n      \"name\": \"enablevmaccess\"\r\n    }\r\n  ],\r\n  \"type\": \"\
         Microsoft.Compute/virtualMachines\",\r\n  \"location\": \"eastus\",\r\n  \"\
-        tags\": {\r\n    \"secondtag\": \"2\",\r\n    \"firsttag\": \"1\",\r\n   \
-        \ \"thirdtag\": \"\"\r\n  },\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod\"\
+        tags\": {\r\n    \"firsttag\": \"1\",\r\n    \"thirdtag\": \"\",\r\n    \"\
+        secondtag\": \"2\"\r\n  },\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod\"\
         ,\r\n  \"name\": \"vm-state-mod\"\r\n}"}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 01:56:32 GMT']
+      Date: ['Sun, 12 Feb 2017 05:51:57 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
       Transfer-Encoding: [chunked]
       Vary: [Accept-Encoding]
-      content-length: ['4061']
+      content-length: ['4062']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -2090,21 +2229,21 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [7e3ed706-e758-11e6-ab70-64510658e3b3]
+      x-ms-client-request-id: [5dbb5350-f0e7-11e6-8f1e-f4b7e2e85440]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod?api-version=2016-04-30-preview
   response:
-    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"c05b0fe2-cdfc-47e5-903a-d751c65b9ff9\"\
+    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"987654cb-f4fa-4426-8f3f-c9fda42418e2\"\
         ,\r\n    \"hardwareProfile\": {\r\n      \"vmSize\": \"Standard_DS1\"\r\n\
         \    },\r\n    \"storageProfile\": {\r\n      \"imageReference\": {\r\n  \
         \      \"publisher\": \"Canonical\",\r\n        \"offer\": \"UbuntuServer\"\
         ,\r\n        \"sku\": \"14.04.4-LTS\",\r\n        \"version\": \"latest\"\r\
         \n      },\r\n      \"osDisk\": {\r\n        \"osType\": \"Linux\",\r\n  \
-        \      \"name\": \"osdisk_67DTRZjyk0\",\r\n        \"createOption\": \"FromImage\"\
-        ,\r\n        \"vhd\": {\r\n          \"uri\": \"https://ab394fvkdj34.blob.core.windows.net/vhds/osdisk_67DTRZjyk0.vhd\"\
+        \      \"name\": \"osdisk_vJe7inxoHG\",\r\n        \"createOption\": \"FromImage\"\
+        ,\r\n        \"vhd\": {\r\n          \"uri\": \"https://ab394fvkdj39.blob.core.windows.net/vhds/osdisk_vJe7inxoHG.vhd\"\
         \r\n        },\r\n        \"caching\": \"ReadWrite\"\r\n      },\r\n     \
         \ \"dataDisks\": []\r\n    },\r\n    \"osProfile\": {\r\n      \"computerName\"\
         : \"vm-state-mod\",\r\n      \"adminUsername\": \"ubuntu\",\r\n      \"linuxConfiguration\"\
@@ -2120,13 +2259,13 @@ interactions:
         location\": \"eastus\",\r\n      \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod/extensions/enablevmaccess\"\
         ,\r\n      \"name\": \"enablevmaccess\"\r\n    }\r\n  ],\r\n  \"type\": \"\
         Microsoft.Compute/virtualMachines\",\r\n  \"location\": \"eastus\",\r\n  \"\
-        tags\": {\r\n    \"secondtag\": \"2\",\r\n    \"firsttag\": \"1\",\r\n   \
-        \ \"thirdtag\": \"\"\r\n  },\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod\"\
+        tags\": {\r\n    \"firsttag\": \"1\",\r\n    \"thirdtag\": \"\",\r\n    \"\
+        secondtag\": \"2\"\r\n  },\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod\"\
         ,\r\n  \"name\": \"vm-state-mod\"\r\n}"}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 01:56:34 GMT']
+      Date: ['Sun, 12 Feb 2017 05:51:57 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -2136,35 +2275,36 @@ interactions:
       content-length: ['2091']
     status: {code: 200, message: OK}
 - request:
-    body: '{"properties": {"storageProfile": {"dataDisks": [], "osDisk": {"createOption":
-      "fromImage", "caching": "ReadWrite", "osType": "Linux", "vhd": {"uri": "https://ab394fvkdj34.blob.core.windows.net/vhds/osdisk_67DTRZjyk0.vhd"},
-      "name": "osdisk_67DTRZjyk0"}, "imageReference": {"sku": "14.04.4-LTS", "publisher":
-      "Canonical", "offer": "UbuntuServer", "version": "latest"}}, "hardwareProfile":
-      {"vmSize": "Standard_A4"}, "networkProfile": {"networkInterfaces": [{"id": "/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/networkInterfaces/vm-state-modVMNic"}]},
-      "osProfile": {"adminUsername": "ubuntu", "computerName": "vm-state-mod", "secrets":
-      [], "linuxConfiguration": {"disablePasswordAuthentication": false}}}, "tags":
-      {"secondtag": "2", "firsttag": "1", "thirdtag": ""}, "location": "eastus"}'
+    body: '{"tags": {"firsttag": "1", "thirdtag": "", "secondtag": "2"}, "properties":
+      {"osProfile": {"computerName": "vm-state-mod", "adminUsername": "ubuntu", "linuxConfiguration":
+      {"disablePasswordAuthentication": false}, "secrets": []}, "storageProfile":
+      {"dataDisks": [], "imageReference": {"offer": "UbuntuServer", "sku": "14.04.4-LTS",
+      "publisher": "Canonical", "version": "latest"}, "osDisk": {"createOption": "fromImage",
+      "caching": "ReadWrite", "osType": "Linux", "name": "osdisk_vJe7inxoHG", "vhd":
+      {"uri": "https://ab394fvkdj39.blob.core.windows.net/vhds/osdisk_vJe7inxoHG.vhd"}}},
+      "networkProfile": {"networkInterfaces": [{"id": "/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Network/networkInterfaces/vm-state-modVMNic"}]},
+      "hardwareProfile": {"vmSize": "Standard_A4"}}, "location": "eastus"}'
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Length: ['864']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [7e8283da-e758-11e6-85ab-64510658e3b3]
+      x-ms-client-request-id: [5df11468-f0e7-11e6-8a51-f4b7e2e85440]
     method: PUT
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod?api-version=2016-04-30-preview
   response:
-    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"c05b0fe2-cdfc-47e5-903a-d751c65b9ff9\"\
+    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"987654cb-f4fa-4426-8f3f-c9fda42418e2\"\
         ,\r\n    \"hardwareProfile\": {\r\n      \"vmSize\": \"Standard_A4\"\r\n \
         \   },\r\n    \"storageProfile\": {\r\n      \"imageReference\": {\r\n   \
         \     \"publisher\": \"Canonical\",\r\n        \"offer\": \"UbuntuServer\"\
         ,\r\n        \"sku\": \"14.04.4-LTS\",\r\n        \"version\": \"latest\"\r\
         \n      },\r\n      \"osDisk\": {\r\n        \"osType\": \"Linux\",\r\n  \
-        \      \"name\": \"osdisk_67DTRZjyk0\",\r\n        \"createOption\": \"FromImage\"\
-        ,\r\n        \"vhd\": {\r\n          \"uri\": \"https://ab394fvkdj34.blob.core.windows.net/vhds/osdisk_67DTRZjyk0.vhd\"\
+        \      \"name\": \"osdisk_vJe7inxoHG\",\r\n        \"createOption\": \"FromImage\"\
+        ,\r\n        \"vhd\": {\r\n          \"uri\": \"https://ab394fvkdj39.blob.core.windows.net/vhds/osdisk_vJe7inxoHG.vhd\"\
         \r\n        },\r\n        \"caching\": \"ReadWrite\"\r\n      },\r\n     \
         \ \"dataDisks\": []\r\n    },\r\n    \"osProfile\": {\r\n      \"computerName\"\
         : \"vm-state-mod\",\r\n      \"adminUsername\": \"ubuntu\",\r\n      \"linuxConfiguration\"\
@@ -2180,14 +2320,14 @@ interactions:
         location\": \"eastus\",\r\n      \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod/extensions/enablevmaccess\"\
         ,\r\n      \"name\": \"enablevmaccess\"\r\n    }\r\n  ],\r\n  \"type\": \"\
         Microsoft.Compute/virtualMachines\",\r\n  \"location\": \"eastus\",\r\n  \"\
-        tags\": {\r\n    \"secondtag\": \"2\",\r\n    \"firsttag\": \"1\",\r\n   \
-        \ \"thirdtag\": \"\"\r\n  },\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod\"\
+        tags\": {\r\n    \"firsttag\": \"1\",\r\n    \"thirdtag\": \"\",\r\n    \"\
+        secondtag\": \"2\"\r\n  },\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod\"\
         ,\r\n  \"name\": \"vm-state-mod\"\r\n}"}
     headers:
-      Azure-AsyncOperation: ['https://management.azure.com/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/providers/Microsoft.Compute/locations/eastus/operations/f8cc0c65-495e-4e14-bca1-ed8361052504?api-version=2016-04-30-preview']
+      Azure-AsyncOperation: ['https://management.azure.com/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/providers/Microsoft.Compute/locations/eastus/operations/9e9da7f3-8cb4-4e5f-8a00-a1beceaf3f70?api-version=2016-04-30-preview']
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 01:56:35 GMT']
+      Date: ['Sun, 12 Feb 2017 05:52:00 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -2195,7 +2335,7 @@ interactions:
       Transfer-Encoding: [chunked]
       Vary: [Accept-Encoding]
       content-length: ['2089']
-      x-ms-ratelimit-remaining-subscription-writes: ['1199']
+      x-ms-ratelimit-remaining-subscription-writes: ['1192']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -2204,20 +2344,20 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [7e8283da-e758-11e6-85ab-64510658e3b3]
+      x-ms-client-request-id: [5df11468-f0e7-11e6-8a51-f4b7e2e85440]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/eastus/operations/f8cc0c65-495e-4e14-bca1-ed8361052504?api-version=2016-04-30-preview
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/eastus/operations/9e9da7f3-8cb4-4e5f-8a00-a1beceaf3f70?api-version=2016-04-30-preview
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-01-31T01:56:35.1442898+00:00\",\r\
-        \n  \"endTime\": \"2017-01-31T01:56:37.4567701+00:00\",\r\n  \"status\": \"\
-        Succeeded\",\r\n  \"name\": \"f8cc0c65-495e-4e14-bca1-ed8361052504\"\r\n}"}
+    body: {string: "{\r\n  \"startTime\": \"2017-02-12T05:51:58.0680938+00:00\",\r\
+        \n  \"endTime\": \"2017-02-12T05:52:01.8649535+00:00\",\r\n  \"status\": \"\
+        Succeeded\",\r\n  \"name\": \"9e9da7f3-8cb4-4e5f-8a00-a1beceaf3f70\"\r\n}"}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 01:57:05 GMT']
+      Date: ['Sun, 12 Feb 2017 05:52:31 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -2233,21 +2373,21 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [7e8283da-e758-11e6-85ab-64510658e3b3]
+      x-ms-client-request-id: [5df11468-f0e7-11e6-8a51-f4b7e2e85440]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod?api-version=2016-04-30-preview
   response:
-    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"c05b0fe2-cdfc-47e5-903a-d751c65b9ff9\"\
+    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"987654cb-f4fa-4426-8f3f-c9fda42418e2\"\
         ,\r\n    \"hardwareProfile\": {\r\n      \"vmSize\": \"Standard_A4\"\r\n \
         \   },\r\n    \"storageProfile\": {\r\n      \"imageReference\": {\r\n   \
         \     \"publisher\": \"Canonical\",\r\n        \"offer\": \"UbuntuServer\"\
         ,\r\n        \"sku\": \"14.04.4-LTS\",\r\n        \"version\": \"latest\"\r\
         \n      },\r\n      \"osDisk\": {\r\n        \"osType\": \"Linux\",\r\n  \
-        \      \"name\": \"osdisk_67DTRZjyk0\",\r\n        \"createOption\": \"FromImage\"\
-        ,\r\n        \"vhd\": {\r\n          \"uri\": \"https://ab394fvkdj34.blob.core.windows.net/vhds/osdisk_67DTRZjyk0.vhd\"\
+        \      \"name\": \"osdisk_vJe7inxoHG\",\r\n        \"createOption\": \"FromImage\"\
+        ,\r\n        \"vhd\": {\r\n          \"uri\": \"https://ab394fvkdj39.blob.core.windows.net/vhds/osdisk_vJe7inxoHG.vhd\"\
         \r\n        },\r\n        \"caching\": \"ReadWrite\"\r\n      },\r\n     \
         \ \"dataDisks\": []\r\n    },\r\n    \"osProfile\": {\r\n      \"computerName\"\
         : \"vm-state-mod\",\r\n      \"adminUsername\": \"ubuntu\",\r\n      \"linuxConfiguration\"\
@@ -2263,13 +2403,13 @@ interactions:
         location\": \"eastus\",\r\n      \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod/extensions/enablevmaccess\"\
         ,\r\n      \"name\": \"enablevmaccess\"\r\n    }\r\n  ],\r\n  \"type\": \"\
         Microsoft.Compute/virtualMachines\",\r\n  \"location\": \"eastus\",\r\n  \"\
-        tags\": {\r\n    \"secondtag\": \"2\",\r\n    \"firsttag\": \"1\",\r\n   \
-        \ \"thirdtag\": \"\"\r\n  },\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod\"\
+        tags\": {\r\n    \"firsttag\": \"1\",\r\n    \"thirdtag\": \"\",\r\n    \"\
+        secondtag\": \"2\"\r\n  },\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod\"\
         ,\r\n  \"name\": \"vm-state-mod\"\r\n}"}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 01:57:06 GMT']
+      Date: ['Sun, 12 Feb 2017 05:52:31 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -2286,25 +2426,25 @@ interactions:
       Connection: [keep-alive]
       Content-Length: ['0']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [925f7b6c-e758-11e6-a93b-64510658e3b3]
+      x-ms-client-request-id: [7200f51e-f0e7-11e6-baeb-f4b7e2e85440]
     method: DELETE
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines/vm-state-mod?api-version=2016-04-30-preview
   response:
     body: {string: ''}
     headers:
-      Azure-AsyncOperation: ['https://management.azure.com/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/providers/Microsoft.Compute/locations/eastus/operations/272cdb62-8809-4e73-8c09-d2f9ab08481f?api-version=2016-04-30-preview']
+      Azure-AsyncOperation: ['https://management.azure.com/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/providers/Microsoft.Compute/locations/eastus/operations/605826a3-1a1f-4bd6-b17a-9e0b5b6e0c10?api-version=2016-04-30-preview']
       Cache-Control: [no-cache]
       Content-Length: ['0']
-      Date: ['Tue, 31 Jan 2017 01:57:07 GMT']
+      Date: ['Sun, 12 Feb 2017 05:52:32 GMT']
       Expires: ['-1']
-      Location: ['https://management.azure.com/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/providers/Microsoft.Compute/locations/eastus/operations/272cdb62-8809-4e73-8c09-d2f9ab08481f?monitor=true&api-version=2016-04-30-preview']
+      Location: ['https://management.azure.com/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/providers/Microsoft.Compute/locations/eastus/operations/605826a3-1a1f-4bd6-b17a-9e0b5b6e0c10?monitor=true&api-version=2016-04-30-preview']
       Pragma: [no-cache]
       Server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
-      x-ms-ratelimit-remaining-subscription-writes: ['1199']
+      x-ms-ratelimit-remaining-subscription-writes: ['1197']
     status: {code: 202, message: Accepted}
 - request:
     body: null
@@ -2313,20 +2453,20 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [925f7b6c-e758-11e6-a93b-64510658e3b3]
+      x-ms-client-request-id: [7200f51e-f0e7-11e6-baeb-f4b7e2e85440]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/eastus/operations/272cdb62-8809-4e73-8c09-d2f9ab08481f?api-version=2016-04-30-preview
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/eastus/operations/605826a3-1a1f-4bd6-b17a-9e0b5b6e0c10?api-version=2016-04-30-preview
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-01-31T01:57:07.9729421+00:00\",\r\
-        \n  \"endTime\": \"2017-01-31T01:57:18.2855126+00:00\",\r\n  \"status\": \"\
-        Succeeded\",\r\n  \"name\": \"272cdb62-8809-4e73-8c09-d2f9ab08481f\"\r\n}"}
+    body: {string: "{\r\n  \"startTime\": \"2017-02-12T05:52:31.2086772+00:00\",\r\
+        \n  \"endTime\": \"2017-02-12T05:52:41.7242553+00:00\",\r\n  \"status\": \"\
+        Succeeded\",\r\n  \"name\": \"605826a3-1a1f-4bd6-b17a-9e0b5b6e0c10\"\r\n}"}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 01:57:38 GMT']
+      Date: ['Sun, 12 Feb 2017 05:53:02 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -2342,10 +2482,10 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.0 (Windows-10.0.14393) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
-          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b2+dev]
+      User-Agent: [python/3.5.0 (Windows-10.0.10586) requests/2.9.1 msrest/0.4.4 msrest_azure/0.4.7
+          computemanagementclient/0.33.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [a5aced64-e758-11e6-af68-64510658e3b3]
+      x-ms-client-request-id: [85784e10-f0e7-11e6-93fe-f4b7e2e85440]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vm_state_mod/providers/Microsoft.Compute/virtualMachines?api-version=2016-04-30-preview
   response:
@@ -2353,7 +2493,7 @@ interactions:
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 01:57:39 GMT']
+      Date: ['Sun, 12 Feb 2017 05:53:05 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
diff --git a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py
index ed05c1fcb..69e4aa2dc 100644
--- a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py
+++ b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py
@@ -386,7 +386,7 @@ class VMCreateAndStateModificationsScenarioTest(ResourceGroupVCRTestBase):  # py
         self.vm_name = 'vm-state-mod'
         self.nsg_name = 'mynsg'
         self.ip_name = 'mypubip'
-        self.storage_name = 'ab394fvkdj34'
+        self.storage_name = 'ab394fvkdj39'
         self.vnet_name = 'myvnet'
 
     def test_vm_create_state_modifications(self):
@@ -432,8 +432,8 @@ class VMCreateAndStateModificationsScenarioTest(ResourceGroupVCRTestBase):  # py
         ])
         self._check_vm_power_state('PowerState/running')
 
-        self.cmd('vm access set-linux-user -g {} -n {} -u foouser1 -p Foo12345 '.format(self.resource_group, self.vm_name))
-        self.cmd('vm access delete-linux-user -g {} -n {} -u foouser1'.format(self.resource_group, self.vm_name))
+        self.cmd('vm user update -g {} -n {} -u foouser1 -p Foo12345 '.format(self.resource_group, self.vm_name))
+        self.cmd('vm user delete -g {} -n {} -u foouser1'.format(self.resource_group, self.vm_name))
 
         self.cmd('network nsg show --resource-group {} --name {}'.format(
             self.resource_group, self.nsg_name), checks=[