Repository: Azure/azure-cli

Issue:
az vmss update fails when trying to update image url for VM scale set
I am trying to update os image used in my VMSS, and ran following command but it fails:
az vmss update -g myrg -n myvmss --set virtualMachineProfile.storageProfile.osDisk.image.uri=https://mystorage.blob.core.windows.net/system/Microsoft.Compute/Images/vsts-buildimagetask/Release-2-osDisk.6efa6e4e-d44c-4554-bee5-d32361220902.vhd

Error is:
create_or_update() takes at least 4 arguments (3 given)
Traceback (most recent call last):
  File "/opt/az/local/lib/python2.7/site-packages/azure/cli/main.py", line 37, in main
    cmd_result = APPLICATION.execute(args)
  File "/opt/az/local/lib/python2.7/site-packages/azure/cli/core/application.py", line 157, in execute
    result = expanded_arg.func(params)
  File "/opt/az/local/lib/python2.7/site-packages/azure/cli/core/commands/arm.py", line 309, in handler
    opres = setter(client, **setterargs) if client else setter(**setterargs)
  File "/opt/az/local/lib/python2.7/site-packages/azure/cli/command_modules/vm/custom.py", line 1490, in vmss_set
    raw=no_wait, **kwargs)
TypeError: create_or_update() takes at least 4 arguments (3 given)

log file gist: https://gist.githubusercontent.com/bishal-pdMSFT/ffd9aa642a43de16ed56a9f887734e51/raw/2c708c0e2c281401c05ca9dad277f23d68d707d6/AzCliVmssUpdateError

### Environment summary

**Install Method:** How did you install the CLI? (e.g. pip, interactive script, apt-get, Docker, MSI, nightly)  
Answer here: apt-get

**CLI Version:** What version of the CLI and modules are installed? (Available with `az --version`)  
Answer here: 2.0.2

**OS Version:** What OS and version are you using?  
Answer here: Ubuntu 14.04

**Shell Type:** What shell are you using? (e.g. bash, cmd.exe, PowerShell)  
Answer here: bash

### Description



Discussion:
codecov-io: # [Codecov](https://codecov.io/gh/Azure/azure-cli/pull/2773?src=pr&el=h1) Report
> Merging [#2773](https://codecov.io/gh/Azure/azure-cli/pull/2773?src=pr&el=desc) into [master](https://codecov.io/gh/Azure/azure-cli/commit/8dda58ca3c3c1af427df59846384b6b7302acc07?src=pr&el=desc) will **increase** coverage by `0.02%`.
> The diff coverage is `100%`.

[![Impacted file tree graph](https://codecov.io/gh/Azure/azure-cli/pull/2773/graphs/tree.svg?src=pr&width=650&token=2pog0TKvF8&height=150)](https://codecov.io/gh/Azure/azure-cli/pull/2773?src=pr&el=tree)

```diff
@@            Coverage Diff             @@
##           master    #2773      +/-   ##
==========================================
+ Coverage   62.83%   62.86%   +0.02%     
==========================================
  Files         480      480              
  Lines       25783    25789       +6     
  Branches     3904     3904              
==========================================
+ Hits        16201    16211      +10     
+ Misses       8574     8566       -8     
- Partials     1008     1012       +4
```


| [Impacted Files](https://codecov.io/gh/Azure/azure-cli/pull/2773?src=pr&el=tree) | Coverage Δ | |
|---|---|---|
| [...source/azure/cli/command\_modules/resource/\_help.py](https://codecov.io/gh/Azure/azure-cli/pull/2773?src=pr&el=tree#diff-c3JjL2NvbW1hbmRfbW9kdWxlcy9henVyZS1jbGktcmVzb3VyY2UvYXp1cmUvY2xpL2NvbW1hbmRfbW9kdWxlcy9yZXNvdXJjZS9faGVscC5weQ==) | `100% <ø> (ø)` | :arrow_up: |
| [...azure-cli-vm/azure/cli/command\_modules/vm/\_help.py](https://codecov.io/gh/Azure/azure-cli/pull/2773?src=pr&el=tree#diff-c3JjL2NvbW1hbmRfbW9kdWxlcy9henVyZS1jbGktdm0vYXp1cmUvY2xpL2NvbW1hbmRfbW9kdWxlcy92bS9faGVscC5weQ==) | `100% <100%> (ø)` | :arrow_up: |
| [...zure-cli-vm/azure/cli/command\_modules/vm/custom.py](https://codecov.io/gh/Azure/azure-cli/pull/2773?src=pr&el=tree#diff-c3JjL2NvbW1hbmRfbW9kdWxlcy9henVyZS1jbGktdm0vYXp1cmUvY2xpL2NvbW1hbmRfbW9kdWxlcy92bS9jdXN0b20ucHk=) | `72.99% <100%> (+0.42%)` | :arrow_up: |
| [src/azure-cli-core/azure/cli/core/util.py](https://codecov.io/gh/Azure/azure-cli/pull/2773?src=pr&el=tree#diff-c3JjL2F6dXJlLWNsaS1jb3JlL2F6dXJlL2NsaS9jb3JlL3V0aWwucHk=) | `68.99% <0%> (ø)` | :arrow_up: |
| [...dback/azure/cli/command\_modules/feedback/custom.py](https://codecov.io/gh/Azure/azure-cli/pull/2773?src=pr&el=tree#diff-c3JjL2NvbW1hbmRfbW9kdWxlcy9henVyZS1jbGktZmVlZGJhY2svYXp1cmUvY2xpL2NvbW1hbmRfbW9kdWxlcy9mZWVkYmFjay9jdXN0b20ucHk=) | `34.69% <0%> (ø)` | :arrow_up: |
| [...-cli-role/azure/cli/command\_modules/role/custom.py](https://codecov.io/gh/Azure/azure-cli/pull/2773?src=pr&el=tree#diff-c3JjL2NvbW1hbmRfbW9kdWxlcy9henVyZS1jbGktcm9sZS9henVyZS9jbGkvY29tbWFuZF9tb2R1bGVzL3JvbGUvY3VzdG9tLnB5) | `19.28% <0%> (ø)` | :arrow_up: |

------

[Continue to review full report at Codecov](https://codecov.io/gh/Azure/azure-cli/pull/2773?src=pr&el=continue).
> **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta)
> `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
> Powered by [Codecov](https://codecov.io/gh/Azure/azure-cli/pull/2773?src=pr&el=footer). Last update [8dda58c...8aacf90](https://codecov.io/gh/Azure/azure-cli/pull/2773?src=pr&el=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments).

Patch:
diff --git a/azure-cli.pyproj b/azure-cli.pyproj
index bea939442..329dab752 100644
--- a/azure-cli.pyproj
+++ b/azure-cli.pyproj
@@ -600,6 +600,7 @@
     <Folder Include="azure-cli-core\azure\cli\core\test_utils\" />
     <Folder Include="azure-cli-core\tests\" />
     <Folder Include="azure-cli-core\tests\__pycache__\" />
+    <Folder Include="azure-cli-nspkg\" />
     <Folder Include="azure-cli-testsdk\" />
     <Folder Include="azure-cli-testsdk\azure\" />
     <Folder Include="azure-cli-testsdk\azure\cli\" />
@@ -788,17 +789,25 @@
     <Folder Include="command_modules\azure-cli-dls\" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="azure-cli-core\HISTORY.rst" />
     <Content Include="azure-cli-core\setup.cfg" />
+    <Content Include="azure-cli-nspkg\HISTORY.rst" />
+    <Content Include="azure-cli-testsdk\HISTORY.rst" />
     <Content Include="azure-cli\az.completion.sh" />
+    <Content Include="azure-cli\HISTORY.rst" />
     <Content Include="azure-cli\setup.cfg" />
     <Content Include="command_modules\azure-cli-acr\azure\cli\command_modules\acr\template.json" />
+    <Content Include="command_modules\azure-cli-acr\HISTORY.rst" />
     <Content Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\azuredeploy.json" />
     <Content Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\swagger_create_acs.json" />
+    <Content Include="command_modules\azure-cli-acs\HISTORY.rst" />
+    <Content Include="command_modules\azure-cli-appservice\HISTORY.rst" />
     <Content Include="command_modules\azure-cli-appservice\README.rst" />
     <Content Include="command_modules\azure-cli-appservice\setup.cfg" />
     <Content Include="command_modules\azure-cli-appservice\tests\sample_web\.gitignore" />
     <Content Include="command_modules\azure-cli-appservice\tests\sample_web\package.json" />
     <Content Include="command_modules\azure-cli-appservice\tests\sample_web\server.js" />
+    <Content Include="command_modules\azure-cli-batch\HISTORY.rst" />
     <Content Include="command_modules\azure-cli-batch\tests\data\batch-pool-create-invalid.json" />
     <Content Include="command_modules\azure-cli-batch\tests\data\batch-pool-create.json" />
     <Content Include="command_modules\azure-cli-batch\tests\data\batch-pool-update.json" />
@@ -812,24 +821,35 @@
     <Content Include="command_modules\azure-cli-batch\tests\data\batchtest.cer" />
     <Content Include="command_modules\azure-cli-batch\tests\data\batchUpdatePool.json" />
     <Content Include="command_modules\azure-cli-batch\tests\README.md" />
+    <Content Include="command_modules\azure-cli-cloud\HISTORY.rst" />
+    <Content Include="command_modules\azure-cli-component\HISTORY.rst" />
+    <Content Include="command_modules\azure-cli-configure\HISTORY.rst" />
+    <Content Include="command_modules\azure-cli-container\HISTORY.rst" />
     <Content Include="command_modules\azure-cli-dla\HISTORY.rst" />
     <Content Include="command_modules\azure-cli-dla\MANIFEST.in" />
     <Content Include="command_modules\azure-cli-dla\README.rst" />
     <Content Include="command_modules\azure-cli-dls\HISTORY.rst" />
     <Content Include="command_modules\azure-cli-dls\MANIFEST.in" />
     <Content Include="command_modules\azure-cli-dls\README.rst" />
+    <Content Include="command_modules\azure-cli-documentdb\HISTORY.rst" />
+    <Content Include="command_modules\azure-cli-feedback\HISTORY.rst" />
     <Content Include="command_modules\azure-cli-find\HISTORY.rst" />
     <Content Include="command_modules\azure-cli-find\MANIFEST.in" />
     <Content Include="command_modules\azure-cli-find\README.rst" />
     <Content Include="command_modules\azure-cli-find\setup.cfg" />
     <Content Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub_device\swagger_iot_hub_device_identity.json" />
+    <Content Include="command_modules\azure-cli-iot\HISTORY.rst" />
+    <Content Include="command_modules\azure-cli-keyvault\HISTORY.rst" />
     <Content Include="command_modules\azure-cli-keyvault\tests\policy.json" />
     <Content Include="command_modules\azure-cli-keyvault\tests\policy2.json" />
     <Content Include="command_modules\azure-cli-keyvault\tests\policy_import_pem.json" />
     <Content Include="command_modules\azure-cli-keyvault\tests\policy_import_pfx.json" />
     <Content Include="command_modules\azure-cli-keyvault\tests\policy_pending.json" />
     <Content Include="command_modules\azure-cli-keyvault\tests\test_secret.txt" />
+    <Content Include="command_modules\azure-cli-lab\HISTORY.rst" />
     <Content Include="command_modules\azure-cli-monitor\azure\cli\command_modules\monitor\autoscale-parameters-template.json" />
+    <Content Include="command_modules\azure-cli-monitor\HISTORY.rst" />
+    <Content Include="command_modules\azure-cli-network\HISTORY.rst" />
     <Content Include="command_modules\azure-cli-network\tests\zone_files\fail1.txt" />
     <Content Include="command_modules\azure-cli-network\tests\zone_files\fail2.txt" />
     <Content Include="command_modules\azure-cli-network\tests\zone_files\fail3.txt" />
@@ -840,15 +860,23 @@
     <Content Include="command_modules\azure-cli-network\tests\zone_files\zone3.txt" />
     <Content Include="command_modules\azure-cli-network\tests\zone_files\zone4.txt" />
     <Content Include="command_modules\azure-cli-network\tests\zone_files\zone5.txt" />
+    <Content Include="command_modules\azure-cli-profile\HISTORY.rst" />
+    <Content Include="command_modules\azure-cli-redis\HISTORY.rst" />
+    <Content Include="command_modules\azure-cli-resource\HISTORY.rst" />
     <Content Include="command_modules\azure-cli-resource\tests\sample_policy_rule.json" />
     <Content Include="command_modules\azure-cli-resource\tests\simple_deploy.json" />
     <Content Include="command_modules\azure-cli-resource\tests\simple_deploy_parameters.json" />
+    <Content Include="command_modules\azure-cli-role\HISTORY.rst" />
+    <Content Include="command_modules\azure-cli-sql\HISTORY.rst" />
+    <Content Include="command_modules\azure-cli-storage\HISTORY.rst" />
     <Content Include="command_modules\azure-cli-storage\tests\Readme.md" />
     <Content Include="command_modules\azure-cli-storage\tests\scripts\purge_test_sample.sh" />
     <Content Include="command_modules\azure-cli-storage\tests\scripts\run_integration.sh" />
     <Content Include="command_modules\azure-cli-storage\tests\scripts\set_test_env.sh" />
     <Content Include="command_modules\azure-cli-storage\tests\testfile.rst" />
     <Content Include="command_modules\azure-cli-storage\tests\testpage.rst" />
+    <Content Include="command_modules\azure-cli-taskhelp\HISTORY.rst" />
+    <Content Include="command_modules\azure-cli-vm\HISTORY.rst" />
     <Content Include="command_modules\azure-cli-vm\tests\aliases.json" />
     <Content Include="command_modules\azure-cli-vm\tests\keyvault\policy.json" />
     <Content Include="command_modules\azure-cli-vm\tests\sample-public.json" />
diff --git a/src/command_modules/azure-cli-acs/HISTORY.rst b/src/command_modules/azure-cli-acs/HISTORY.rst
index 787a4344c..553734f48 100644
--- a/src/command_modules/azure-cli-acs/HISTORY.rst
+++ b/src/command_modules/azure-cli-acs/HISTORY.rst
@@ -3,6 +3,11 @@
 Release History
 ===============
 
+Unreleased
+++++++++++++++++++
+
+* remove windows profile before PUT call for scale command (#2755)
+
 2.0.2 (2017-04-03)
 ++++++++++++++++++
 
diff --git a/src/command_modules/azure-cli-acs/azure/cli/command_modules/acs/custom.py b/src/command_modules/azure-cli-acs/azure/cli/command_modules/acs/custom.py
index d928b38ec..9c1bb80d1 100644
--- a/src/command_modules/azure-cli-acs/azure/cli/command_modules/acs/custom.py
+++ b/src/command_modules/azure-cli-acs/azure/cli/command_modules/acs/custom.py
@@ -764,6 +764,9 @@ def update_acs(client, resource_group_name, container_service_name, new_agent_co
     if instance.orchestrator_profile.orchestrator_type == ContainerServiceOchestratorTypes.kubernetes:
         instance.service_principal_profile = None
 
+    # null out the windows profile so that validation doesn't complain about not having the admin password
+    instance.windows_profile = None
+
     return client.create_or_update(resource_group_name, container_service_name, instance)
 
 
diff --git a/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/_help.py b/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/_help.py
index bcff81d87..9709b10ea 100644
--- a/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/_help.py
+++ b/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/_help.py
@@ -5,7 +5,7 @@
 
 from azure.cli.core.help_files import helps #pylint: disable=unused-import
 
-#pylint: disable=line-too-long
+#pylint: disable=line-too-long, too-many-lines
 helps['lock'] = """
     type: group
     short-summary: Manage Azure locks.
diff --git a/src/command_modules/azure-cli-vm/HISTORY.rst b/src/command_modules/azure-cli-vm/HISTORY.rst
index 1d8f6777f..6894110ab 100644
--- a/src/command_modules/azure-cli-vm/HISTORY.rst
+++ b/src/command_modules/azure-cli-vm/HISTORY.rst
@@ -5,6 +5,7 @@ Release History
 2.0.3 (unreleased)
 ++++++++++++++++++
 * vm/vmss: support create from a market place image which requires plan info(#1209)
+* Fix bug with `vmss update` and `vm availability-set update`
 
 2.0.2 (2017-04-03)
 ++++++++++++++++++
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 61046e4e2..abdcc5955 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
@@ -3,9 +3,9 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
 
-from azure.cli.core.help_files import helps
+# pylint: disable=line-too-long, too-many-lines
 
-# pylint: disable=line-too-long
+from azure.cli.core.help_files import helps
 
 image_long_summary = """                      URN aliases: CentOS, CoreOS, Debian, openSUSE, RHEL, SLES, UbuntuLTS, Win2008R2SP1, Win2012Datacenter, Win2012R2Datacenter.
                       Example URN: MicrosoftWindowsServer:WindowsServer:2012-R2-Datacenter:latest
@@ -146,7 +146,7 @@ helps['vm availability-set create'] = """
     long-summary: For more information, see https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-manage-availability.
     examples:
         - name: Create an availability set.
-          text: az vm availability-set create -n MyAvSet -g MyResourceGroup
+          text: az vm availability-set create -n MyAvSet -g MyResourceGroup --platform-fault-domain-count 2 --platform-update-domain-count 2
 """
 
 helps['vm availability-set update'] = """
@@ -239,11 +239,6 @@ helps['vm update'] = """
           text: az <command> -n name -g group --remove networkProfile.networkInterfaces 3
 """.format(generic_update_help)
 
-helps['vm show'] = """
-    type: command
-    short-summary: Get information about an Azure Virtual Machine.
-"""
-
 helps['vmss get-instance-view'] = """
     type: command
     parameters:
@@ -258,6 +253,16 @@ helps['vmss reimage'] = """
           short-summary: "One or more VM scale sets or specific VM instance IDs. If provided, no other 'Resource Id' arguments should be specified."
 """
 
+helps['vmss disk'] = """
+    type: group
+    short-summary: Manage the managed data disks associated with a virtual machine scale set.
+"""
+
+helps['vmss nic'] = """
+    type: group
+    short-summary: Manage the network interfaces associated with a virtual machine scale set.
+"""
+
 helps['vmss show'] = """
     type: command
     parameters:
@@ -265,6 +270,16 @@ helps['vmss show'] = """
           short-summary: "One or more VM scale sets or specific VM instance IDs. If provided, no other 'Resource Id' arguments should be specified."
 """
 
+helps['vmss update'] = """
+    type: command
+    short-summary: Update a virtual machine scale set.
+"""
+
+helps['vmss wait'] = """
+    type: command
+    short-summary: Place the CLI in a waiting state until a condition of the scale set is met.
+"""
+
 helps['vm convert'] = """
     type: command
     short-summary: Convert a VM with unmanaged disks to use managed disks.
@@ -445,7 +460,7 @@ disk_long_summary = """
 
 helps['vm disk'] = """
     type: group
-    short-summary: Manage the data disks attached to a VM.
+    short-summary: Manage the managed data disks attached to a VM.
     long-summary: >
 {0}
 """.format(disk_long_summary)
@@ -506,6 +521,11 @@ helps['vm disk attach'] = """
           text: az vm disk attach -g MyResourceGroup --vm-name MyVm --disk disk_name --new
 """
 
+helps['vm encryption'] = """
+    type: group
+    short-summary: Manage encryption of VM disks.
+"""
+
 helps['vm extension'] = """
     type: group
     short-summary: Extend the functionality of your VMs with extensions.
@@ -842,6 +862,7 @@ helps['vm redeploy'] = """
 
 helps['vm resize'] = """
     type: command
+    short-summary: Update VM size.
     examples:
         - name: Resize a VM.
           text: az vm resize -g MyResourceGroup -n MyVm --size Standard_DS3_v2
@@ -858,6 +879,7 @@ helps['vm restart'] = """
 
 helps['vm show'] = """
     type: command
+    short-summary: Show details of a VM.
     examples:
         - name: Show information about a VM.
           text: az vm show -g MyResourceGroup -n MyVm -d
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 bdadd1dc3..05ee1573d 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
@@ -1473,17 +1473,18 @@ def availset_get(resource_group_name, name):
     return _compute_client_factory().availability_sets.get(resource_group_name, name)
 
 
-def availset_set(**kwargs):
-    return _compute_client_factory().availability_sets.create_or_update(**kwargs)
+def availset_set(resource_group_name, name, **kwargs):
+    return _compute_client_factory().availability_sets.create_or_update(resource_group_name, name,
+                                                                        **kwargs)
 
 
 def vmss_get(resource_group_name, name):
     return _compute_client_factory().virtual_machine_scale_sets.get(resource_group_name, name)
 
 
-def vmss_set(no_wait=False, **kwargs):
+def vmss_set(resource_group_name, name, no_wait=False, **kwargs):
     return _compute_client_factory().virtual_machine_scale_sets.create_or_update(
-        raw=no_wait, **kwargs)
+        resource_group_name, name, raw=no_wait, **kwargs)
 
 
 def convert_av_set_to_managed_disk(resource_group_name, availability_set_name):


Test patch:
diff --git a/src/command_modules/azure-cli-vm/tests/recordings/test_vm_availset.yaml b/src/command_modules/azure-cli-vm/tests/recordings/test_vm_availset.yaml
index 390590a73..88f576df2 100644
--- a/src/command_modules/azure-cli-vm/tests/recordings/test_vm_availset.yaml
+++ b/src/command_modules/azure-cli-vm/tests/recordings/test_vm_availset.yaml
@@ -6,19 +6,19 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.13.0 msrest/0.4.7
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.7
           msrest_azure/0.4.7 resourcemanagementclient/0.30.2 Azure-SDK-For-Python
           AZURECLI/TEST/2.0.2+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [4e286f26-197b-11e7-95e7-a0b3ccf7272a]
+      x-ms-client-request-id: [3742f976-1a26-11e7-b428-a0b3ccf7272a]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cliTestRg_Availset?api-version=2016-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_avail_set?api-version=2016-09-01
   response:
-    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cliTestRg_Availset","name":"cliTestRg_Availset","location":"westus","tags":{"use":"az-test"},"properties":{"provisioningState":"Succeeded"}}'}
+    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_avail_set","name":"cli_test_avail_set","location":"westus","tags":{"use":"az-test"},"properties":{"provisioningState":"Succeeded"}}'}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 04 Apr 2017 21:11:46 GMT']
+      Date: ['Wed, 05 Apr 2017 17:35:09 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
@@ -26,37 +26,37 @@ interactions:
       content-length: ['226']
     status: {code: 200, message: OK}
 - request:
-    body: '{"properties": {"parameters": {}, "template": {"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
-      "outputs": {}, "variables": {}, "contentVersion": "1.0.0.0", "resources": [{"type":
-      "Microsoft.Compute/availabilitySets", "tags": {}, "location": "westus", "sku":
-      {"name": "Aligned"}, "properties": {"platformFaultDomainCount": 2, "platformUpdateDomainCount":
-      2}, "apiVersion": "2016-04-30-preview", "name": "availset-test"}], "parameters":
-      {}}, "mode": "Incremental"}}'
+    body: '{"properties": {"parameters": {}, "mode": "Incremental", "template": {"parameters":
+      {}, "contentVersion": "1.0.0.0", "resources": [{"apiVersion": "2016-04-30-preview",
+      "name": "availset-test", "type": "Microsoft.Compute/availabilitySets", "tags":
+      {}, "properties": {"platformUpdateDomainCount": 2, "platformFaultDomainCount":
+      2}, "sku": {"name": "Aligned"}, "location": "westus"}], "outputs": {}, "variables":
+      {}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#"}}}'
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Length: ['509']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.13.0 msrest/0.4.7
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.7
           msrest_azure/0.4.7 resourcemanagementclient/0.30.2 Azure-SDK-For-Python
           AZURECLI/TEST/2.0.2+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [4e3ac158-197b-11e7-bbe5-a0b3ccf7272a]
+      x-ms-client-request-id: [375684e2-1a26-11e7-9b5e-a0b3ccf7272a]
     method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cliTestRg_Availset/providers/Microsoft.Resources/deployments/mock-deployment?api-version=2016-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_avail_set/providers/Microsoft.Resources/deployments/mock-deployment?api-version=2016-09-01
   response:
-    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cliTestRg_Availset/providers/Microsoft.Resources/deployments/av_set_deploy_Z45qIWH5DYFgYEvvrBrZWCCBvdlvRPfI","name":"av_set_deploy_Z45qIWH5DYFgYEvvrBrZWCCBvdlvRPfI","properties":{"templateHash":"11394658800043119878","parameters":{},"mode":"Incremental","provisioningState":"Accepted","timestamp":"2017-04-04T21:11:47.8613677Z","duration":"PT0.5122453S","correlationId":"d1f30e5f-bc20-42c9-aba3-9cb4a438f725","providers":[{"namespace":"Microsoft.Compute","resourceTypes":[{"resourceType":"availabilitySets","locations":["westus"]}]}],"dependencies":[]}}'}
+    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_avail_set/providers/Microsoft.Resources/deployments/av_set_deploy_SPDoW3eXYMD22OhOalVEdpS9W5DHL3Nn","name":"av_set_deploy_SPDoW3eXYMD22OhOalVEdpS9W5DHL3Nn","properties":{"templateHash":"8041814817506538688","parameters":{},"mode":"Incremental","provisioningState":"Accepted","timestamp":"2017-04-05T17:35:11.2753176Z","duration":"PT0.6118988S","correlationId":"18abcfb7-7f45-4334-b035-d18c53869277","providers":[{"namespace":"Microsoft.Compute","resourceTypes":[{"resourceType":"availabilitySets","locations":["westus"]}]}],"dependencies":[]}}'}
     headers:
-      Azure-AsyncOperation: ['https://management.azure.com/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/resourcegroups/cliTestRg_Availset/providers/Microsoft.Resources/deployments/av_set_deploy_Z45qIWH5DYFgYEvvrBrZWCCBvdlvRPfI/operationStatuses/08587102665781284905?api-version=2016-09-01']
+      Azure-AsyncOperation: ['https://management.azure.com/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/resourcegroups/cli_test_avail_set/providers/Microsoft.Resources/deployments/av_set_deploy_SPDoW3eXYMD22OhOalVEdpS9W5DHL3Nn/operationStatuses/08587101931748141948?api-version=2016-09-01']
       Cache-Control: [no-cache]
-      Content-Length: ['633']
+      Content-Length: ['632']
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 04 Apr 2017 21:11:47 GMT']
+      Date: ['Wed, 05 Apr 2017 17:35:10 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
-      x-ms-ratelimit-remaining-subscription-writes: ['1199']
+      x-ms-ratelimit-remaining-subscription-writes: ['1198']
     status: {code: 201, message: Created}
 - request:
     body: null
@@ -65,19 +65,19 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.13.0 msrest/0.4.7
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.7
           msrest_azure/0.4.7 resourcemanagementclient/0.30.2 Azure-SDK-For-Python
           AZURECLI/TEST/2.0.2+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [4e3ac158-197b-11e7-bbe5-a0b3ccf7272a]
+      x-ms-client-request-id: [375684e2-1a26-11e7-9b5e-a0b3ccf7272a]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cliTestRg_Availset/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08587102665781284905?api-version=2016-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_avail_set/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08587101931748141948?api-version=2016-09-01
   response:
     body: {string: '{"status":"Succeeded"}'}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 04 Apr 2017 21:12:17 GMT']
+      Date: ['Wed, 05 Apr 2017 17:35:41 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
@@ -91,24 +91,24 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.13.0 msrest/0.4.7
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.7
           msrest_azure/0.4.7 resourcemanagementclient/0.30.2 Azure-SDK-For-Python
           AZURECLI/TEST/2.0.2+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [4e3ac158-197b-11e7-bbe5-a0b3ccf7272a]
+      x-ms-client-request-id: [375684e2-1a26-11e7-9b5e-a0b3ccf7272a]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cliTestRg_Availset/providers/Microsoft.Resources/deployments/mock-deployment?api-version=2016-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_avail_set/providers/Microsoft.Resources/deployments/mock-deployment?api-version=2016-09-01
   response:
-    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cliTestRg_Availset/providers/Microsoft.Resources/deployments/av_set_deploy_Z45qIWH5DYFgYEvvrBrZWCCBvdlvRPfI","name":"av_set_deploy_Z45qIWH5DYFgYEvvrBrZWCCBvdlvRPfI","properties":{"templateHash":"11394658800043119878","parameters":{},"mode":"Incremental","provisioningState":"Succeeded","timestamp":"2017-04-04T21:11:55.0818441Z","duration":"PT7.7327217S","correlationId":"d1f30e5f-bc20-42c9-aba3-9cb4a438f725","providers":[{"namespace":"Microsoft.Compute","resourceTypes":[{"resourceType":"availabilitySets","locations":["westus"]}]}],"dependencies":[],"outputs":{},"outputResources":[{"id":"Microsoft.Compute/availabilitySets/availset-test"}]}}'}
+    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_avail_set/providers/Microsoft.Resources/deployments/av_set_deploy_SPDoW3eXYMD22OhOalVEdpS9W5DHL3Nn","name":"av_set_deploy_SPDoW3eXYMD22OhOalVEdpS9W5DHL3Nn","properties":{"templateHash":"8041814817506538688","parameters":{},"mode":"Incremental","provisioningState":"Succeeded","timestamp":"2017-04-05T17:35:18.2863144Z","duration":"PT7.6228956S","correlationId":"18abcfb7-7f45-4334-b035-d18c53869277","providers":[{"namespace":"Microsoft.Compute","resourceTypes":[{"resourceType":"availabilitySets","locations":["westus"]}]}],"dependencies":[],"outputs":{},"outputResources":[{"id":"Microsoft.Compute/availabilitySets/availset-test"}]}}'}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 04 Apr 2017 21:12:18 GMT']
+      Date: ['Wed, 05 Apr 2017 17:35:41 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
       Vary: [Accept-Encoding]
-      content-length: ['725']
+      content-length: ['724']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -117,24 +117,24 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.13.0 msrest/0.4.7
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.7
           msrest_azure/0.4.7 computemanagementclient/0.33.1rc1 Azure-SDK-For-Python
           AZURECLI/TEST/2.0.2+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [61eb12c2-197b-11e7-aa2f-a0b3ccf7272a]
+      x-ms-client-request-id: [4b061b0a-1a26-11e7-bd7b-a0b3ccf7272a]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cliTestRg_Availset/providers/Microsoft.Compute/availabilitySets/availset-test?api-version=2016-04-30-preview
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_avail_set/providers/Microsoft.Compute/availabilitySets/availset-test?api-version=2016-04-30-preview
   response:
     body: {string: "{\r\n  \"properties\": {\r\n    \"platformUpdateDomainCount\"\
         : 2,\r\n    \"platformFaultDomainCount\": 2,\r\n    \"virtualMachines\": []\r\
         \n  },\r\n  \"type\": \"Microsoft.Compute/availabilitySets\",\r\n  \"location\"\
-        : \"westus\",\r\n  \"tags\": {},\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cliTestRg_Availset/providers/Microsoft.Compute/availabilitySets/availset-test\"\
+        : \"westus\",\r\n  \"tags\": {},\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_avail_set/providers/Microsoft.Compute/availabilitySets/availset-test\"\
         ,\r\n  \"name\": \"availset-test\",\r\n  \"sku\": {\r\n    \"name\": \"Aligned\"\
         \r\n  }\r\n}"}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 04 Apr 2017 21:12:19 GMT']
+      Date: ['Wed, 05 Apr 2017 17:35:42 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -150,32 +150,103 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.13.0 msrest/0.4.7
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.7
           msrest_azure/0.4.7 computemanagementclient/0.33.1rc1 Azure-SDK-For-Python
           AZURECLI/TEST/2.0.2+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [626d9c90-197b-11e7-a7bf-a0b3ccf7272a]
+      x-ms-client-request-id: [4b89e2a6-1a26-11e7-aff7-a0b3ccf7272a]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cliTestRg_Availset/providers/Microsoft.Compute/availabilitySets?api-version=2016-04-30-preview
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_avail_set/providers/Microsoft.Compute/availabilitySets/availset-test?api-version=2016-04-30-preview
+  response:
+    body: {string: "{\r\n  \"properties\": {\r\n    \"platformUpdateDomainCount\"\
+        : 2,\r\n    \"platformFaultDomainCount\": 2,\r\n    \"virtualMachines\": []\r\
+        \n  },\r\n  \"type\": \"Microsoft.Compute/availabilitySets\",\r\n  \"location\"\
+        : \"westus\",\r\n  \"tags\": {},\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_avail_set/providers/Microsoft.Compute/availabilitySets/availset-test\"\
+        ,\r\n  \"name\": \"availset-test\",\r\n  \"sku\": {\r\n    \"name\": \"Aligned\"\
+        \r\n  }\r\n}"}
+    headers:
+      Cache-Control: [no-cache]
+      Content-Type: [application/json; charset=utf-8]
+      Date: ['Wed, 05 Apr 2017 17:35:43 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: ['449']
+    status: {code: 200, message: OK}
+- request:
+    body: '{"properties": {"virtualMachines": [], "platformUpdateDomainCount": 2,
+      "platformFaultDomainCount": 2}, "sku": {"name": "Aligned"}, "location": "westus",
+      "tags": {"test": "success"}}'
+    headers:
+      Accept: [application/json]
+      Accept-Encoding: ['gzip, deflate']
+      Connection: [keep-alive]
+      Content-Length: ['181']
+      Content-Type: [application/json; charset=utf-8]
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.7
+          msrest_azure/0.4.7 computemanagementclient/0.33.1rc1 Azure-SDK-For-Python
+          AZURECLI/TEST/2.0.2+dev]
+      accept-language: [en-US]
+      x-ms-client-request-id: [4bc632d2-1a26-11e7-9654-a0b3ccf7272a]
+    method: PUT
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_avail_set/providers/Microsoft.Compute/availabilitySets/availset-test?api-version=2016-04-30-preview
+  response:
+    body: {string: "{\r\n  \"properties\": {\r\n    \"platformUpdateDomainCount\"\
+        : 2,\r\n    \"platformFaultDomainCount\": 2\r\n  },\r\n  \"type\": \"Microsoft.Compute/availabilitySets\"\
+        ,\r\n  \"location\": \"westus\",\r\n  \"tags\": {\r\n    \"test\": \"success\"\
+        \r\n  },\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_avail_set/providers/Microsoft.Compute/availabilitySets/availset-test\"\
+        ,\r\n  \"name\": \"availset-test\",\r\n  \"sku\": {\r\n    \"name\": \"Aligned\"\
+        \r\n  }\r\n}"}
+    headers:
+      Cache-Control: [no-cache]
+      Content-Type: [application/json; charset=utf-8]
+      Date: ['Wed, 05 Apr 2017 17:35:44 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: ['448']
+      x-ms-ratelimit-remaining-subscription-writes: ['1199']
+    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.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.7
+          msrest_azure/0.4.7 computemanagementclient/0.33.1rc1 Azure-SDK-For-Python
+          AZURECLI/TEST/2.0.2+dev]
+      accept-language: [en-US]
+      x-ms-client-request-id: [4cac9c86-1a26-11e7-b434-a0b3ccf7272a]
+    method: GET
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_avail_set/providers/Microsoft.Compute/availabilitySets?api-version=2016-04-30-preview
   response:
     body: {string: "{\r\n  \"value\": [\r\n    {\r\n      \"properties\": {\r\n  \
         \      \"platformUpdateDomainCount\": 2,\r\n        \"platformFaultDomainCount\"\
         : 2,\r\n        \"virtualMachines\": []\r\n      },\r\n      \"type\": \"\
         Microsoft.Compute/availabilitySets\",\r\n      \"location\": \"westus\",\r\
-        \n      \"tags\": {},\r\n      \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cliTestRg_Availset/providers/Microsoft.Compute/availabilitySets/availset-test\"\
+        \n      \"tags\": {\r\n        \"test\": \"success\"\r\n      },\r\n     \
+        \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_avail_set/providers/Microsoft.Compute/availabilitySets/availset-test\"\
         ,\r\n      \"name\": \"availset-test\",\r\n      \"sku\": {\r\n        \"\
         name\": \"Aligned\"\r\n      }\r\n    }\r\n  ]\r\n}"}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 04 Apr 2017 21:12:20 GMT']
+      Date: ['Wed, 05 Apr 2017 17:35:45 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: ['534']
+      content-length: ['569']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -184,13 +255,13 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.13.0 msrest/0.4.7
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.7
           msrest_azure/0.4.7 computemanagementclient/0.33.1rc1 Azure-SDK-For-Python
           AZURECLI/TEST/2.0.2+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [62f493f6-197b-11e7-9f88-a0b3ccf7272a]
+      x-ms-client-request-id: [4d2ba6c6-1a26-11e7-ba66-a0b3ccf7272a]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cliTestRg_Availset/providers/Microsoft.Compute/availabilitySets/availset-test/vmSizes?api-version=2016-04-30-preview
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_avail_set/providers/Microsoft.Compute/availabilitySets/availset-test/vmSizes?api-version=2016-04-30-preview
   response:
     body: {string: "{\r\n  \"value\": [\r\n    {\r\n      \"name\": \"Standard_DS1_v2\"\
         ,\r\n      \"numberOfCores\": 1,\r\n      \"osDiskSizeInMB\": 1047552,\r\n\
@@ -517,7 +588,7 @@ interactions:
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 04 Apr 2017 21:12:21 GMT']
+      Date: ['Wed, 05 Apr 2017 17:35:45 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -533,31 +604,32 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.13.0 msrest/0.4.7
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.7
           msrest_azure/0.4.7 computemanagementclient/0.33.1rc1 Azure-SDK-For-Python
           AZURECLI/TEST/2.0.2+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [639e81dc-197b-11e7-85b0-a0b3ccf7272a]
+      x-ms-client-request-id: [4dca4c80-1a26-11e7-82f4-a0b3ccf7272a]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cliTestRg_Availset/providers/Microsoft.Compute/availabilitySets/availset-test?api-version=2016-04-30-preview
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_avail_set/providers/Microsoft.Compute/availabilitySets/availset-test?api-version=2016-04-30-preview
   response:
     body: {string: "{\r\n  \"properties\": {\r\n    \"platformUpdateDomainCount\"\
         : 2,\r\n    \"platformFaultDomainCount\": 2,\r\n    \"virtualMachines\": []\r\
         \n  },\r\n  \"type\": \"Microsoft.Compute/availabilitySets\",\r\n  \"location\"\
-        : \"westus\",\r\n  \"tags\": {},\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cliTestRg_Availset/providers/Microsoft.Compute/availabilitySets/availset-test\"\
+        : \"westus\",\r\n  \"tags\": {\r\n    \"test\": \"success\"\r\n  },\r\n  \"\
+        id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_avail_set/providers/Microsoft.Compute/availabilitySets/availset-test\"\
         ,\r\n  \"name\": \"availset-test\",\r\n  \"sku\": {\r\n    \"name\": \"Aligned\"\
         \r\n  }\r\n}"}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 04 Apr 2017 21:12:22 GMT']
+      Date: ['Wed, 05 Apr 2017 17:35: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: ['449']
+      content-length: ['476']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -567,24 +639,24 @@ interactions:
       Connection: [keep-alive]
       Content-Length: ['0']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.13.0 msrest/0.4.7
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.7
           msrest_azure/0.4.7 computemanagementclient/0.33.1rc1 Azure-SDK-For-Python
           AZURECLI/TEST/2.0.2+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [6444777e-197b-11e7-9414-a0b3ccf7272a]
+      x-ms-client-request-id: [4e5daefa-1a26-11e7-ae0d-a0b3ccf7272a]
     method: DELETE
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cliTestRg_Availset/providers/Microsoft.Compute/availabilitySets/availset-test?api-version=2016-04-30-preview
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_avail_set/providers/Microsoft.Compute/availabilitySets/availset-test?api-version=2016-04-30-preview
   response:
     body: {string: ''}
     headers:
       Cache-Control: [no-cache]
       Content-Length: ['0']
-      Date: ['Tue, 04 Apr 2017 21:12:24 GMT']
+      Date: ['Wed, 05 Apr 2017 17:35:48 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: ['1198']
+      x-ms-ratelimit-remaining-subscription-writes: ['1197']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -593,19 +665,19 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.13.0 msrest/0.4.7
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.7
           msrest_azure/0.4.7 computemanagementclient/0.33.1rc1 Azure-SDK-For-Python
           AZURECLI/TEST/2.0.2+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [652fe500-197b-11e7-83aa-a0b3ccf7272a]
+      x-ms-client-request-id: [4f558e4c-1a26-11e7-8914-a0b3ccf7272a]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cliTestRg_Availset/providers/Microsoft.Compute/availabilitySets?api-version=2016-04-30-preview
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_avail_set/providers/Microsoft.Compute/availabilitySets?api-version=2016-04-30-preview
   response:
     body: {string: '{"value":[]}'}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 04 Apr 2017 21:12:24 GMT']
+      Date: ['Wed, 05 Apr 2017 17:35:49 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
diff --git a/src/command_modules/azure-cli-vm/tests/recordings/test_vmss_create_none_options.yaml b/src/command_modules/azure-cli-vm/tests/recordings/test_vmss_create_none_options.yaml
index c1d002b79..7f4a2c0b3 100644
--- a/src/command_modules/azure-cli-vm/tests/recordings/test_vmss_create_none_options.yaml
+++ b/src/command_modules/azure-cli-vm/tests/recordings/test_vmss_create_none_options.yaml
@@ -6,62 +6,62 @@ 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/2.7.11 (Windows-10-10.0.14393) requests/2.9.1 msrest/0.4.6
+          msrest_azure/0.4.7 resourcemanagementclient/0.30.2 Azure-SDK-For-Python
+          AZURECLI/TEST/2.0.2+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [4bdb5d0c-e75c-11e6-9bb5-64510658e3b3]
+      x-ms-client-request-id: [510486a1-1a26-11e7-a3e8-a0b3ccf7272a]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_vmss_create_none_options?api-version=2016-09-01
   response:
-    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_none_options","name":"cli_test_vmss_create_none_options","location":"westus","tags":{"use":"az-test"},"properties":{"provisioningState":"Succeeded"}}'}
+    body: {string: !!python/unicode '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_none_options","name":"cli_test_vmss_create_none_options","location":"westus","tags":{"use":"az-test"},"properties":{"provisioningState":"Succeeded"}}'}
     headers:
-      Cache-Control: [no-cache]
-      Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 02:23:47 GMT']
-      Expires: ['-1']
-      Pragma: [no-cache]
-      Strict-Transport-Security: [max-age=31536000; includeSubDomains]
-      Vary: [Accept-Encoding]
+      cache-control: [no-cache]
       content-length: ['256']
+      content-type: [application/json; charset=utf-8]
+      date: ['Wed, 05 Apr 2017 17:35:52 GMT']
+      expires: ['-1']
+      pragma: [no-cache]
+      strict-transport-security: [max-age=31536000; includeSubDomains]
+      vary: [Accept-Encoding]
     status: {code: 200, message: OK}
 - request:
     body: null
     headers:
       Connection: [close]
       Host: [raw.githubusercontent.com]
-      User-Agent: [Python-urllib/3.5]
+      User-Agent: [Python-urllib/2.7]
     method: GET
     uri: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/master/arm-compute/quickstart-templates/aliases.json
   response:
-    body: {string: "{\n  \"$schema\":\"http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json\"\
+    body: {string: !!python/unicode "{\n  \"$schema\":\"http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json\"\
         ,\n  \"contentVersion\":\"1.0.0.0\",\n  \"parameters\":{},\n  \"variables\"\
         :{},\n  \"resources\":[],\n\n  \"outputs\":{\n    \"aliases\":{\n      \"\
-        metadata\":{\n        \"description\":\"This list of aliases is used by Azure\
-        \ XPLAT CLI, Azure Powershell, and Azure Portal as shorthands for commonly\
-        \ used VM images. If you change this file, please verify that this doesn't\
-        \ break VMSS creation from Portal :).\"\n      },\n      \"type\":\"object\"\
-        ,\n      \"value\":{\n\n        \"Linux\":{\n          \"CentOS\":{\n    \
-        \        \"publisher\":\"OpenLogic\",\n            \"offer\":\"CentOS\",\n\
-        \            \"sku\":\"7.2\",\n            \"version\":\"latest\"\n      \
-        \    },\n          \"CoreOS\":{\n            \"publisher\":\"CoreOS\",\n \
-        \           \"offer\":\"CoreOS\",\n            \"sku\":\"Stable\",\n     \
-        \       \"version\":\"latest\"\n          },\n          \"Debian\":{\n   \
-        \         \"publisher\":\"credativ\",\n            \"offer\":\"Debian\",\n\
-        \            \"sku\":\"8\",\n            \"version\":\"latest\"\n        \
-        \  },\n          \"openSUSE\":{\n            \"publisher\":\"SUSE\",\n   \
-        \         \"offer\":\"openSUSE\",\n            \"sku\":\"13.2\",\n       \
-        \     \"version\":\"latest\"\n          },\n          \"RHEL\":{\n       \
-        \     \"publisher\":\"RedHat\",\n            \"offer\":\"RHEL\",\n       \
-        \     \"sku\":\"7.2\",\n            \"version\":\"latest\"\n          },\n\
-        \          \"SLES\":{\n            \"publisher\":\"SUSE\",\n            \"\
-        offer\":\"SLES\",\n            \"sku\":\"12-SP1\",\n            \"version\"\
-        :\"latest\"\n          },\n          \"UbuntuLTS\":{\n            \"publisher\"\
-        :\"Canonical\",\n            \"offer\":\"UbuntuServer\",\n            \"sku\"\
-        :\"14.04.4-LTS\",\n            \"version\":\"latest\"\n          }\n     \
-        \   },\n\n        \"Windows\":{\n          \"Win2012R2Datacenter\":{\n   \
-        \         \"publisher\":\"MicrosoftWindowsServer\",\n            \"offer\"\
-        :\"WindowsServer\",\n            \"sku\":\"2012-R2-Datacenter\",\n       \
-        \     \"version\":\"latest\"\n          },\n          \"Win2012Datacenter\"\
+        type\":\"object\",\n      \"value\":{\n\n        \"Linux\":{\n          \"\
+        CentOS\":{\n            \"publisher\":\"OpenLogic\",\n            \"offer\"\
+        :\"CentOS\",\n            \"sku\":\"7.3\",\n            \"version\":\"latest\"\
+        \n          },\n          \"CoreOS\":{\n            \"publisher\":\"CoreOS\"\
+        ,\n            \"offer\":\"CoreOS\",\n            \"sku\":\"Stable\",\n  \
+        \          \"version\":\"latest\"\n          },\n          \"Debian\":{\n\
+        \            \"publisher\":\"credativ\",\n            \"offer\":\"Debian\"\
+        ,\n            \"sku\":\"8\",\n            \"version\":\"latest\"\n      \
+        \    },\n          \"openSUSE-Leap\": {\n            \"publisher\":\"SUSE\"\
+        ,\n            \"offer\":\"openSUSE-Leap\",\n            \"sku\":\"42.2\"\
+        ,\n            \"version\": \"latest\"\n          },\n          \"RHEL\":{\n\
+        \            \"publisher\":\"RedHat\",\n            \"offer\":\"RHEL\",\n\
+        \            \"sku\":\"7.3\",\n            \"version\":\"latest\"\n      \
+        \    },\n          \"SLES\":{\n            \"publisher\":\"SUSE\",\n     \
+        \       \"offer\":\"SLES\",\n            \"sku\":\"12-SP2\",\n           \
+        \ \"version\":\"latest\"\n          },\n          \"UbuntuLTS\":{\n      \
+        \      \"publisher\":\"Canonical\",\n            \"offer\":\"UbuntuServer\"\
+        ,\n            \"sku\":\"16.04-LTS\",\n            \"version\":\"latest\"\n\
+        \          }\n        },\n\n        \"Windows\":{\n          \"Win2016Datacenter\"\
+        :{\n            \"publisher\":\"MicrosoftWindowsServer\",\n            \"\
+        offer\":\"WindowsServer\",\n            \"sku\":\"2016-Datacenter\",\n   \
+        \         \"version\":\"latest\"\n          },\n          \"Win2012R2Datacenter\"\
+        :{\n            \"publisher\":\"MicrosoftWindowsServer\",\n            \"\
+        offer\":\"WindowsServer\",\n            \"sku\":\"2012-R2-Datacenter\",\n\
+        \            \"version\":\"latest\"\n          },\n          \"Win2012Datacenter\"\
         :{\n            \"publisher\":\"MicrosoftWindowsServer\",\n            \"\
         offer\":\"WindowsServer\",\n            \"sku\":\"2012-Datacenter\",\n   \
         \         \"version\":\"latest\"\n          },\n          \"Win2008R2SP1\"\
@@ -70,30 +70,30 @@ interactions:
         \     \"version\":\"latest\"\n          }\n        }\n      }\n    }\n  }\n\
         }\n"}
     headers:
-      Accept-Ranges: [bytes]
-      Access-Control-Allow-Origin: ['*']
-      Cache-Control: [max-age=300]
-      Connection: [close]
-      Content-Length: ['2297']
-      Content-Security-Policy: [default-src 'none'; style-src 'unsafe-inline']
-      Content-Type: [text/plain; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 02:23:48 GMT']
-      ETag: ['"db78eb36618a060181b32ac2de91b1733f382e01"']
-      Expires: ['Tue, 31 Jan 2017 02:28:48 GMT']
-      Source-Age: ['92']
-      Strict-Transport-Security: [max-age=31536000]
-      Vary: ['Authorization,Accept-Encoding']
-      Via: [1.1 varnish]
-      X-Cache: [HIT]
-      X-Cache-Hits: ['4']
-      X-Content-Type-Options: [nosniff]
-      X-Fastly-Request-ID: [e3d643fc88bf8216e8c0b03c54d6372bbae38ffe]
-      X-Frame-Options: [deny]
-      X-Geo-Block-List: ['']
-      X-GitHub-Request-Id: ['D59A:5F89:1173F0A:1201B89:588FF4D5']
-      X-Served-By: [cache-den6020-DEN]
-      X-Timer: ['S1485829428.113981,VS0,VE0']
-      X-XSS-Protection: [1; mode=block]
+      accept-ranges: [bytes]
+      access-control-allow-origin: ['*']
+      cache-control: [max-age=300]
+      connection: [close]
+      content-length: ['2235']
+      content-security-policy: [default-src 'none'; style-src 'unsafe-inline']
+      content-type: [text/plain; charset=utf-8]
+      date: ['Wed, 05 Apr 2017 17:35:54 GMT']
+      etag: ['"d6824855d13e27c5258a680eb60f635d088fd05e"']
+      expires: ['Wed, 05 Apr 2017 17:40:54 GMT']
+      source-age: ['0']
+      strict-transport-security: [max-age=31536000]
+      vary: ['Authorization,Accept-Encoding']
+      via: [1.1 varnish]
+      x-cache: [MISS]
+      x-cache-hits: ['0']
+      x-content-type-options: [nosniff]
+      x-fastly-request-id: [629fd3a682815aa9222dcda70eedfd53926468a4]
+      x-frame-options: [deny]
+      x-geo-block-list: ['']
+      x-github-request-id: ['21DA:04F8:2EAC905:3080E89:58E52AFA']
+      x-served-by: [cache-sea1021-SEA]
+      x-timer: ['S1491413754.234857,VS0,VE414']
+      x-xss-protection: [1; mode=block]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -102,78 +102,73 @@ 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/2.7.11 (Windows-10-10.0.14393) requests/2.9.1 msrest/0.4.6
+          msrest_azure/0.4.7 networkmanagementclient/0.30.1 Azure-SDK-For-Python AZURECLI/TEST/2.0.2+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [4c1c8576-e75c-11e6-b23d-64510658e3b3]
+      x-ms-client-request-id: [5203a71e-1a26-11e7-8815-a0b3ccf7272a]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_none_options/providers/Microsoft.Network/virtualNetworks?api-version=2016-09-01
   response:
-    body: {string: '{"value":[]}'}
+    body: {string: !!python/unicode '{"value":[]}'}
     headers:
-      Cache-Control: [no-cache]
-      Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 02:23:48 GMT']
-      Expires: ['-1']
-      Pragma: [no-cache]
-      Strict-Transport-Security: [max-age=31536000; includeSubDomains]
-      Vary: [Accept-Encoding]
+      cache-control: [no-cache]
       content-length: ['12']
+      content-type: [application/json; charset=utf-8]
+      date: ['Wed, 05 Apr 2017 17:35:53 GMT']
+      expires: ['-1']
+      pragma: [no-cache]
+      strict-transport-security: [max-age=31536000; includeSubDomains]
+      vary: [Accept-Encoding]
     status: {code: 200, message: OK}
 - request:
-    body: '{"properties": {"template": {"contentVersion": "1.0.0.0", "resources":
-      [{"dependsOn": [], "properties": {"addressSpace": {"addressPrefixes": ["10.0.0.0/16"]},
-      "subnets": [{"properties": {"addressPrefix": "10.0.0.0/24"}, "name": "vmss1Subnet"}]},
-      "type": "Microsoft.Network/virtualNetworks", "apiVersion": "2015-06-15", "tags":
-      {}, "name": "vmss1VNET", "location": "westus"}, {"dependsOn": ["Microsoft.Network/virtualNetworks/vmss1VNET"],
-      "properties": {"upgradePolicy": {"mode": "Manual"}, "singlePlacementGroup":
-      true, "virtualMachineProfile": {"networkProfile": {"networkInterfaceConfigurations":
-      [{"properties": {"primary": "true", "ipConfigurations": [{"properties": {"subnet":
-      {"id": "/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/resourceGroups/cli_test_vmss_create_none_options/providers/Microsoft.Network/virtualNetworks/vmss1VNET/subnets/vmss1Subnet"}},
-      "name": "vmss11i6rIPConfig"}]}, "name": "vmss11i6rNic"}]}, "storageProfile":
-      {"imageReference": {"offer": "Debian", "sku": "8", "publisher": "credativ",
-      "version": "latest"}, "osDisk": {"caching": "ReadOnly", "managedDisk": {"storageAccountType":
-      "Standard_LRS"}, "createOption": "FromImage"}}, "osProfile": {"adminUsername":
-      "yugangw", "computerNamePrefix": "vmss11i6r", "linuxConfiguration": {"disablePasswordAuthentication":
-      true, "ssh": {"publicKeys": [{"path": "/home/yugangw/.ssh/authorized_keys",
-      "keyData": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCbIg1guRHbI0lV11wWDt1r2cUdcNd27CJsg+SfgC7miZeubtwUhbsPdhMQsfDyhOWHq1+ZL0M+nJZV63d/1dhmhtgyOqejUwrPlzKhydsbrsdUor+JmNJDdW01v7BXHyuymT8G4s09jCasNOwiufbP/qp72ruu0bIA1nySsvlf9pCQAuFkAnVnf/rFhUlOkhtRpwcq8SUNY2zRHR/EKb/4NWY1JzR4sa3q2fWIJdrrX0DvLoa5g9bIEd4Df79ba7v+yiUBOS0zT2ll+z4g9izHK3EO5d8hL4jYxcjKs+wcslSYRWrascfscLgMlMGh0CdKeNTDjHpGPncaf3Z+FwwwjWeuiNBxv7bJo13/8B/098KlVDl4GZqsoBCEjPyJfV6hO0y/LkRGkk7oHWKgeWAfKtfLItRp00eZ4fcJNK9kCaSMmEugoZWcI7NGbZXzqFWqbpRI7NcDP9+WIQ+i9U5vqWsqd/zng4kbuAJ6UuKqIzB0upYrLShfQE3SAck8oaLhJqqq56VfDuASNpJKidV+zq27HfSBmbXnkR/5AK337dc3MXKJypoK/QPMLKUAP5XLPbs+NddJQV7EZXd29DLgp+fRIg3edpKdO7ZErWhv7d+3Kws+e1Y+ypmR2WIVSwVyBEUfgv2C8Ts9gnTF4pNcEY/S2aBicz5Ew2+jdyGNQQ==
-      test@example.com\n"}]}}}}, "overprovision": true}, "type": "Microsoft.Compute/virtualMachineScaleSets",
-      "apiVersion": "2016-04-30-preview", "tags": {}, "name": "vmss1", "sku": {"name":
-      "Standard_D1_v2", "tier": "Standard", "capacity": 2}, "location": "westus"}],
-      "variables": {"storageAccountNames": ["vmss11i6r0", "vmss11i6r1", "vmss11i6r2",
-      "vmss11i6r3", "vmss11i6r4"], "vhdContainers": ["[concat(''https://'', variables(''storageAccountNames'')[0],
-      ''.blob.core.windows.net/vhds'')]", "[concat(''https://'', variables(''storageAccountNames'')[1],
-      ''.blob.core.windows.net/vhds'')]", "[concat(''https://'', variables(''storageAccountNames'')[2],
-      ''.blob.core.windows.net/vhds'')]", "[concat(''https://'', variables(''storageAccountNames'')[3],
-      ''.blob.core.windows.net/vhds'')]", "[concat(''https://'', variables(''storageAccountNames'')[4],
-      ''.blob.core.windows.net/vhds'')]"]}, "outputs": {"VMSS": {"value": "[reference(resourceId(''Microsoft.Compute/virtualMachineScaleSets'',
-      ''vmss1''),providers(''Microsoft.Compute'', ''virtualMachineScaleSets'').apiVersions[0])]",
-      "type": "object"}}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
-      "parameters": {}}, "parameters": {}, "mode": "Incremental"}}'
+    body: !!python/unicode '{"properties": {"mode": "Incremental", "parameters": {},
+      "template": {"parameters": {}, "outputs": {"VMSS": {"type": "object", "value":
+      "[reference(resourceId(''Microsoft.Compute/virtualMachineScaleSets'', ''vmss1''),providers(''Microsoft.Compute'',
+      ''virtualMachineScaleSets'').apiVersions[0])]"}}, "variables": {}, "contentVersion":
+      "1.0.0.0", "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+      "resources": [{"name": "vmss1VNET", "tags": {}, "apiVersion": "2015-06-15",
+      "location": "westus", "dependsOn": [], "type": "Microsoft.Network/virtualNetworks",
+      "properties": {"subnets": [{"name": "vmss1Subnet", "properties": {"addressPrefix":
+      "10.0.0.0/24"}}], "addressSpace": {"addressPrefixes": ["10.0.0.0/16"]}}}, {"sku":
+      {"tier": "Standard", "capacity": 2, "name": "Standard_D1_v2"}, "name": "vmss1",
+      "tags": {}, "apiVersion": "2016-04-30-preview", "location": "westus", "dependsOn":
+      ["Microsoft.Network/virtualNetworks/vmss1VNET"], "type": "Microsoft.Compute/virtualMachineScaleSets",
+      "properties": {"singlePlacementGroup": true, "virtualMachineProfile": {"storageProfile":
+      {"imageReference": {"sku": "8", "publisher": "credativ", "version": "latest",
+      "offer": "Debian"}, "osDisk": {"caching": "ReadWrite", "managedDisk": {"storageAccountType":
+      "Standard_LRS"}, "createOption": "FromImage"}}, "osProfile": {"computerNamePrefix":
+      "vmss1247x", "adminUsername": "ubuntu", "linuxConfiguration": {"ssh": {"publicKeys":
+      [{"path": "/home/ubuntu/.ssh/authorized_keys", "keyData": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCbIg1guRHbI0lV11wWDt1r2cUdcNd27CJsg+SfgC7miZeubtwUhbsPdhMQsfDyhOWHq1+ZL0M+nJZV63d/1dhmhtgyOqejUwrPlzKhydsbrsdUor+JmNJDdW01v7BXHyuymT8G4s09jCasNOwiufbP/qp72ruu0bIA1nySsvlf9pCQAuFkAnVnf/rFhUlOkhtRpwcq8SUNY2zRHR/EKb/4NWY1JzR4sa3q2fWIJdrrX0DvLoa5g9bIEd4Df79ba7v+yiUBOS0zT2ll+z4g9izHK3EO5d8hL4jYxcjKs+wcslSYRWrascfscLgMlMGh0CdKeNTDjHpGPncaf3Z+FwwwjWeuiNBxv7bJo13/8B/098KlVDl4GZqsoBCEjPyJfV6hO0y/LkRGkk7oHWKgeWAfKtfLItRp00eZ4fcJNK9kCaSMmEugoZWcI7NGbZXzqFWqbpRI7NcDP9+WIQ+i9U5vqWsqd/zng4kbuAJ6UuKqIzB0upYrLShfQE3SAck8oaLhJqqq56VfDuASNpJKidV+zq27HfSBmbXnkR/5AK337dc3MXKJypoK/QPMLKUAP5XLPbs+NddJQV7EZXd29DLgp+fRIg3edpKdO7ZErWhv7d+3Kws+e1Y+ypmR2WIVSwVyBEUfgv2C8Ts9gnTF4pNcEY/S2aBicz5Ew2+jdyGNQQ==
+      test@example.com\n"}]}, "disablePasswordAuthentication": true}}, "networkProfile":
+      {"networkInterfaceConfigurations": [{"name": "vmss1247xNic", "properties": {"primary":
+      "true", "ipConfigurations": [{"name": "vmss1247xIPConfig", "properties": {"subnet":
+      {"id": "/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/resourceGroups/cli_test_vmss_create_none_options/providers/Microsoft.Network/virtualNetworks/vmss1VNET/subnets/vmss1Subnet"}}}]}}]}},
+      "overprovision": true, "upgradePolicy": {"mode": "Manual"}}}]}}}'
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Length: ['3326']
+      Content-Length: ['2753']
       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/2.7.11 (Windows-10-10.0.14393) requests/2.9.1 msrest/0.4.6
+          msrest_azure/0.4.7 resourcemanagementclient/0.30.2 Azure-SDK-For-Python
+          AZURECLI/TEST/2.0.2+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [4c40fd54-e75c-11e6-b444-64510658e3b3]
+      x-ms-client-request-id: [521dbecf-1a26-11e7-9c8c-a0b3ccf7272a]
     method: PUT
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_vmss_create_none_options/providers/Microsoft.Resources/deployments/mock-deployment?api-version=2016-09-01
   response:
-    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_none_options/providers/Microsoft.Resources/deployments/vmss_deploy_N5L40IU9kvBddIGfYy2Gb51rQeR9Fol0","name":"vmss_deploy_N5L40IU9kvBddIGfYy2Gb51rQeR9Fol0","properties":{"parameters":{},"mode":"Incremental","provisioningState":"Accepted","timestamp":"2017-01-31T02:23:49.4134276Z","duration":"PT0.612975S","correlationId":"fa45a063-c769-4a35-9c91-7c86415baa2e","providers":[{"namespace":"Microsoft.Network","resourceTypes":[{"resourceType":"virtualNetworks","locations":["westus"]}]},{"namespace":"Microsoft.Compute","resourceTypes":[{"resourceType":"virtualMachineScaleSets","locations":["westus"]}]}],"dependencies":[{"dependsOn":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_none_options/providers/Microsoft.Network/virtualNetworks/vmss1VNET","resourceType":"Microsoft.Network/virtualNetworks","resourceName":"vmss1VNET"}],"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_none_options/providers/Microsoft.Compute/virtualMachineScaleSets/vmss1","resourceType":"Microsoft.Compute/virtualMachineScaleSets","resourceName":"vmss1"}]}}'}
+    body: {string: !!python/unicode '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_none_options/providers/Microsoft.Resources/deployments/vmss_deploy_oexSGEOf0DQtjm9VsFUp9ahA99kjuRkp","name":"vmss_deploy_oexSGEOf0DQtjm9VsFUp9ahA99kjuRkp","properties":{"templateHash":"15286152982969927295","parameters":{},"mode":"Incremental","provisioningState":"Accepted","timestamp":"2017-04-05T17:35:55.8908997Z","duration":"PT0.5316267S","correlationId":"a0d7e709-a029-4ad7-9523-a2975d4f2751","providers":[{"namespace":"Microsoft.Network","resourceTypes":[{"resourceType":"virtualNetworks","locations":["westus"]}]},{"namespace":"Microsoft.Compute","resourceTypes":[{"resourceType":"virtualMachineScaleSets","locations":["westus"]}]}],"dependencies":[{"dependsOn":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_none_options/providers/Microsoft.Network/virtualNetworks/vmss1VNET","resourceType":"Microsoft.Network/virtualNetworks","resourceName":"vmss1VNET"}],"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_none_options/providers/Microsoft.Compute/virtualMachineScaleSets/vmss1","resourceType":"Microsoft.Compute/virtualMachineScaleSets","resourceName":"vmss1"}]}}'}
     headers:
-      Azure-AsyncOperation: ['https://management.azure.com/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/resourcegroups/cli_test_vmss_create_none_options/providers/Microsoft.Resources/deployments/vmss_deploy_N5L40IU9kvBddIGfYy2Gb51rQeR9Fol0/operationStatuses/08587157774566771962?api-version=2016-09-01']
-      Cache-Control: [no-cache]
-      Content-Length: ['1239']
-      Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 02:23:49 GMT']
-      Expires: ['-1']
-      Pragma: [no-cache]
-      Strict-Transport-Security: [max-age=31536000; includeSubDomains]
-      x-ms-ratelimit-remaining-subscription-writes: ['1198']
+      azure-asyncoperation: ['https://management.azure.com/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/resourcegroups/cli_test_vmss_create_none_options/providers/Microsoft.Resources/deployments/vmss_deploy_oexSGEOf0DQtjm9VsFUp9ahA99kjuRkp/operationStatuses/08587101931301183462?api-version=2016-09-01']
+      cache-control: [no-cache]
+      content-length: ['1278']
+      content-type: [application/json; charset=utf-8]
+      date: ['Wed, 05 Apr 2017 17:35:56 GMT']
+      expires: ['-1']
+      pragma: [no-cache]
+      strict-transport-security: [max-age=31536000; includeSubDomains]
+      x-ms-ratelimit-remaining-subscription-writes: ['1197']
     status: {code: 201, message: Created}
 - request:
     body: null
@@ -182,23 +177,24 @@ 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/2.7.11 (Windows-10-10.0.14393) requests/2.9.1 msrest/0.4.6
+          msrest_azure/0.4.7 resourcemanagementclient/0.30.2 Azure-SDK-For-Python
+          AZURECLI/TEST/2.0.2+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [4c40fd54-e75c-11e6-b444-64510658e3b3]
+      x-ms-client-request-id: [521dbecf-1a26-11e7-9c8c-a0b3ccf7272a]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_vmss_create_none_options/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08587157774566771962?api-version=2016-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_vmss_create_none_options/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08587101931301183462?api-version=2016-09-01
   response:
-    body: {string: '{"status":"Running"}'}
+    body: {string: !!python/unicode '{"status":"Running"}'}
     headers:
-      Cache-Control: [no-cache]
-      Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 02:24:19 GMT']
-      Expires: ['-1']
-      Pragma: [no-cache]
-      Strict-Transport-Security: [max-age=31536000; includeSubDomains]
-      Vary: [Accept-Encoding]
+      cache-control: [no-cache]
       content-length: ['20']
+      content-type: [application/json; charset=utf-8]
+      date: ['Wed, 05 Apr 2017 17:36:26 GMT']
+      expires: ['-1']
+      pragma: [no-cache]
+      strict-transport-security: [max-age=31536000; includeSubDomains]
+      vary: [Accept-Encoding]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -207,23 +203,24 @@ 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/2.7.11 (Windows-10-10.0.14393) requests/2.9.1 msrest/0.4.6
+          msrest_azure/0.4.7 resourcemanagementclient/0.30.2 Azure-SDK-For-Python
+          AZURECLI/TEST/2.0.2+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [4c40fd54-e75c-11e6-b444-64510658e3b3]
+      x-ms-client-request-id: [521dbecf-1a26-11e7-9c8c-a0b3ccf7272a]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_vmss_create_none_options/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08587157774566771962?api-version=2016-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_vmss_create_none_options/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08587101931301183462?api-version=2016-09-01
   response:
-    body: {string: '{"status":"Running"}'}
+    body: {string: !!python/unicode '{"status":"Running"}'}
     headers:
-      Cache-Control: [no-cache]
-      Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 02:24:50 GMT']
-      Expires: ['-1']
-      Pragma: [no-cache]
-      Strict-Transport-Security: [max-age=31536000; includeSubDomains]
-      Vary: [Accept-Encoding]
+      cache-control: [no-cache]
       content-length: ['20']
+      content-type: [application/json; charset=utf-8]
+      date: ['Wed, 05 Apr 2017 17:36:55 GMT']
+      expires: ['-1']
+      pragma: [no-cache]
+      strict-transport-security: [max-age=31536000; includeSubDomains]
+      vary: [Accept-Encoding]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -232,23 +229,24 @@ 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/2.7.11 (Windows-10-10.0.14393) requests/2.9.1 msrest/0.4.6
+          msrest_azure/0.4.7 resourcemanagementclient/0.30.2 Azure-SDK-For-Python
+          AZURECLI/TEST/2.0.2+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [4c40fd54-e75c-11e6-b444-64510658e3b3]
+      x-ms-client-request-id: [521dbecf-1a26-11e7-9c8c-a0b3ccf7272a]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_vmss_create_none_options/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08587157774566771962?api-version=2016-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_vmss_create_none_options/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08587101931301183462?api-version=2016-09-01
   response:
-    body: {string: '{"status":"Running"}'}
+    body: {string: !!python/unicode '{"status":"Running"}'}
     headers:
-      Cache-Control: [no-cache]
-      Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 02:25:20 GMT']
-      Expires: ['-1']
-      Pragma: [no-cache]
-      Strict-Transport-Security: [max-age=31536000; includeSubDomains]
-      Vary: [Accept-Encoding]
+      cache-control: [no-cache]
       content-length: ['20']
+      content-type: [application/json; charset=utf-8]
+      date: ['Wed, 05 Apr 2017 17:37:26 GMT']
+      expires: ['-1']
+      pragma: [no-cache]
+      strict-transport-security: [max-age=31536000; includeSubDomains]
+      vary: [Accept-Encoding]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -257,23 +255,24 @@ 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/2.7.11 (Windows-10-10.0.14393) requests/2.9.1 msrest/0.4.6
+          msrest_azure/0.4.7 resourcemanagementclient/0.30.2 Azure-SDK-For-Python
+          AZURECLI/TEST/2.0.2+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [4c40fd54-e75c-11e6-b444-64510658e3b3]
+      x-ms-client-request-id: [521dbecf-1a26-11e7-9c8c-a0b3ccf7272a]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_vmss_create_none_options/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08587157774566771962?api-version=2016-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_vmss_create_none_options/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08587101931301183462?api-version=2016-09-01
   response:
-    body: {string: '{"status":"Running"}'}
+    body: {string: !!python/unicode '{"status":"Running"}'}
     headers:
-      Cache-Control: [no-cache]
-      Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 02:25:49 GMT']
-      Expires: ['-1']
-      Pragma: [no-cache]
-      Strict-Transport-Security: [max-age=31536000; includeSubDomains]
-      Vary: [Accept-Encoding]
+      cache-control: [no-cache]
       content-length: ['20']
+      content-type: [application/json; charset=utf-8]
+      date: ['Wed, 05 Apr 2017 17:37:56 GMT']
+      expires: ['-1']
+      pragma: [no-cache]
+      strict-transport-security: [max-age=31536000; includeSubDomains]
+      vary: [Accept-Encoding]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -282,23 +281,52 @@ 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/2.7.11 (Windows-10-10.0.14393) requests/2.9.1 msrest/0.4.6
+          msrest_azure/0.4.7 resourcemanagementclient/0.30.2 Azure-SDK-For-Python
+          AZURECLI/TEST/2.0.2+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [4c40fd54-e75c-11e6-b444-64510658e3b3]
+      x-ms-client-request-id: [521dbecf-1a26-11e7-9c8c-a0b3ccf7272a]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_vmss_create_none_options/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08587157774566771962?api-version=2016-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_vmss_create_none_options/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08587101931301183462?api-version=2016-09-01
   response:
-    body: {string: '{"status":"Running"}'}
+    body: {string: !!python/unicode '{"status":"Succeeded"}'}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['22']
+      content-type: [application/json; charset=utf-8]
+      date: ['Wed, 05 Apr 2017 17:38:26 GMT']
+      expires: ['-1']
+      pragma: [no-cache]
+      strict-transport-security: [max-age=31536000; includeSubDomains]
+      vary: [Accept-Encoding]
+    status: {code: 200, message: OK}
+- request:
+    body: null
     headers:
-      Cache-Control: [no-cache]
+      Accept: [application/json]
+      Accept-Encoding: ['gzip, deflate']
+      Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 02:26:20 GMT']
-      Expires: ['-1']
-      Pragma: [no-cache]
-      Strict-Transport-Security: [max-age=31536000; includeSubDomains]
-      Vary: [Accept-Encoding]
-      content-length: ['20']
+      User-Agent: [python/2.7.11 (Windows-10-10.0.14393) requests/2.9.1 msrest/0.4.6
+          msrest_azure/0.4.7 resourcemanagementclient/0.30.2 Azure-SDK-For-Python
+          AZURECLI/TEST/2.0.2+dev]
+      accept-language: [en-US]
+      x-ms-client-request-id: [521dbecf-1a26-11e7-9c8c-a0b3ccf7272a]
+    method: GET
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_vmss_create_none_options/providers/Microsoft.Resources/deployments/mock-deployment?api-version=2016-09-01
+  response:
+    body: {string: !!python/unicode '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_none_options/providers/Microsoft.Resources/deployments/vmss_deploy_oexSGEOf0DQtjm9VsFUp9ahA99kjuRkp","name":"vmss_deploy_oexSGEOf0DQtjm9VsFUp9ahA99kjuRkp","properties":{"templateHash":"15286152982969927295","parameters":{},"mode":"Incremental","provisioningState":"Succeeded","timestamp":"2017-04-05T17:38:07.7332452Z","duration":"PT2M12.3739722S","correlationId":"a0d7e709-a029-4ad7-9523-a2975d4f2751","providers":[{"namespace":"Microsoft.Network","resourceTypes":[{"resourceType":"virtualNetworks","locations":["westus"]}]},{"namespace":"Microsoft.Compute","resourceTypes":[{"resourceType":"virtualMachineScaleSets","locations":["westus"]}]}],"dependencies":[{"dependsOn":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_none_options/providers/Microsoft.Network/virtualNetworks/vmss1VNET","resourceType":"Microsoft.Network/virtualNetworks","resourceName":"vmss1VNET"}],"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_none_options/providers/Microsoft.Compute/virtualMachineScaleSets/vmss1","resourceType":"Microsoft.Compute/virtualMachineScaleSets","resourceName":"vmss1"}],"outputs":{"vmss":{"type":"Object","value":{"singlePlacementGroup":true,"upgradePolicy":{"mode":"Manual"},"virtualMachineProfile":{"osProfile":{"computerNamePrefix":"vmss1247x","adminUsername":"ubuntu","linuxConfiguration":{"disablePasswordAuthentication":true,"ssh":{"publicKeys":[{"path":"/home/ubuntu/.ssh/authorized_keys","keyData":"ssh-rsa
+        AAAAB3NzaC1yc2EAAAADAQABAAACAQCbIg1guRHbI0lV11wWDt1r2cUdcNd27CJsg+SfgC7miZeubtwUhbsPdhMQsfDyhOWHq1+ZL0M+nJZV63d/1dhmhtgyOqejUwrPlzKhydsbrsdUor+JmNJDdW01v7BXHyuymT8G4s09jCasNOwiufbP/qp72ruu0bIA1nySsvlf9pCQAuFkAnVnf/rFhUlOkhtRpwcq8SUNY2zRHR/EKb/4NWY1JzR4sa3q2fWIJdrrX0DvLoa5g9bIEd4Df79ba7v+yiUBOS0zT2ll+z4g9izHK3EO5d8hL4jYxcjKs+wcslSYRWrascfscLgMlMGh0CdKeNTDjHpGPncaf3Z+FwwwjWeuiNBxv7bJo13/8B/098KlVDl4GZqsoBCEjPyJfV6hO0y/LkRGkk7oHWKgeWAfKtfLItRp00eZ4fcJNK9kCaSMmEugoZWcI7NGbZXzqFWqbpRI7NcDP9+WIQ+i9U5vqWsqd/zng4kbuAJ6UuKqIzB0upYrLShfQE3SAck8oaLhJqqq56VfDuASNpJKidV+zq27HfSBmbXnkR/5AK337dc3MXKJypoK/QPMLKUAP5XLPbs+NddJQV7EZXd29DLgp+fRIg3edpKdO7ZErWhv7d+3Kws+e1Y+ypmR2WIVSwVyBEUfgv2C8Ts9gnTF4pNcEY/S2aBicz5Ew2+jdyGNQQ==
+        test@example.com\n"}]}},"secrets":[]},"storageProfile":{"osDisk":{"createOption":"FromImage","caching":"ReadWrite","managedDisk":{"storageAccountType":"Standard_LRS"}},"imageReference":{"publisher":"credativ","offer":"Debian","sku":"8","version":"latest"}},"networkProfile":{"networkInterfaceConfigurations":[{"name":"vmss1247xNic","properties":{"primary":true,"ipConfigurations":[{"name":"vmss1247xIPConfig","properties":{"subnet":{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_none_options/providers/Microsoft.Network/virtualNetworks/vmss1VNET/subnets/vmss1Subnet"}}}]}}]}},"provisioningState":"Succeeded","overprovision":true,"uniqueId":"26fcde72-e107-4262-8d44-9a168484a948"}}},"outputResources":[{"id":"Microsoft.Compute/virtualMachineScaleSets/vmss1"},{"id":"Microsoft.Network/virtualNetworks/vmss1VNET"}]}}'}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['3210']
+      content-type: [application/json; charset=utf-8]
+      date: ['Wed, 05 Apr 2017 17:38:27 GMT']
+      expires: ['-1']
+      pragma: [no-cache]
+      strict-transport-security: [max-age=31536000; includeSubDomains]
+      vary: [Accept-Encoding]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -307,23 +335,173 @@ 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/2.7.11 (Windows-10-10.0.14393) requests/2.9.1 msrest/0.4.6
+          msrest_azure/0.4.7 computemanagementclient/0.33.1rc1 Azure-SDK-For-Python
+          AZURECLI/TEST/2.0.2+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [4c40fd54-e75c-11e6-b444-64510658e3b3]
+      x-ms-client-request-id: [ae4e0e80-1a26-11e7-8908-a0b3ccf7272a]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_vmss_create_none_options/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08587157774566771962?api-version=2016-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_none_options/providers/Microsoft.Compute/virtualMachineScaleSets/vmss1?api-version=2016-04-30-preview
   response:
-    body: {string: '{"status":"Succeeded"}'}
+    body: {string: !!python/unicode "{\r\n  \"sku\": {\r\n    \"name\": \"Standard_D1_v2\"\
+        ,\r\n    \"tier\": \"Standard\",\r\n    \"capacity\": 2\r\n  },\r\n  \"properties\"\
+        : {\r\n    \"singlePlacementGroup\": true,\r\n    \"upgradePolicy\": {\r\n\
+        \      \"mode\": \"Manual\"\r\n    },\r\n    \"virtualMachineProfile\": {\r\
+        \n      \"osProfile\": {\r\n        \"computerNamePrefix\": \"vmss1247x\"\
+        ,\r\n        \"adminUsername\": \"ubuntu\",\r\n        \"linuxConfiguration\"\
+        : {\r\n          \"disablePasswordAuthentication\": true,\r\n          \"\
+        ssh\": {\r\n            \"publicKeys\": [\r\n              {\r\n         \
+        \       \"path\": \"/home/ubuntu/.ssh/authorized_keys\",\r\n             \
+        \   \"keyData\": \"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCbIg1guRHbI0lV11wWDt1r2cUdcNd27CJsg+SfgC7miZeubtwUhbsPdhMQsfDyhOWHq1+ZL0M+nJZV63d/1dhmhtgyOqejUwrPlzKhydsbrsdUor+JmNJDdW01v7BXHyuymT8G4s09jCasNOwiufbP/qp72ruu0bIA1nySsvlf9pCQAuFkAnVnf/rFhUlOkhtRpwcq8SUNY2zRHR/EKb/4NWY1JzR4sa3q2fWIJdrrX0DvLoa5g9bIEd4Df79ba7v+yiUBOS0zT2ll+z4g9izHK3EO5d8hL4jYxcjKs+wcslSYRWrascfscLgMlMGh0CdKeNTDjHpGPncaf3Z+FwwwjWeuiNBxv7bJo13/8B/098KlVDl4GZqsoBCEjPyJfV6hO0y/LkRGkk7oHWKgeWAfKtfLItRp00eZ4fcJNK9kCaSMmEugoZWcI7NGbZXzqFWqbpRI7NcDP9+WIQ+i9U5vqWsqd/zng4kbuAJ6UuKqIzB0upYrLShfQE3SAck8oaLhJqqq56VfDuASNpJKidV+zq27HfSBmbXnkR/5AK337dc3MXKJypoK/QPMLKUAP5XLPbs+NddJQV7EZXd29DLgp+fRIg3edpKdO7ZErWhv7d+3Kws+e1Y+ypmR2WIVSwVyBEUfgv2C8Ts9gnTF4pNcEY/S2aBicz5Ew2+jdyGNQQ==\
+        \ test@example.com\\n\"\r\n              }\r\n            ]\r\n          }\r\
+        \n        },\r\n        \"secrets\": []\r\n      },\r\n      \"storageProfile\"\
+        : {\r\n        \"osDisk\": {\r\n          \"createOption\": \"FromImage\"\
+        ,\r\n          \"caching\": \"ReadWrite\",\r\n          \"managedDisk\": {\r\
+        \n            \"storageAccountType\": \"Standard_LRS\"\r\n          }\r\n\
+        \        },\r\n        \"imageReference\": {\r\n          \"publisher\": \"\
+        credativ\",\r\n          \"offer\": \"Debian\",\r\n          \"sku\": \"8\"\
+        ,\r\n          \"version\": \"latest\"\r\n        }\r\n      },\r\n      \"\
+        networkProfile\": {\"networkInterfaceConfigurations\":[{\"name\":\"vmss1247xNic\"\
+        ,\"properties\":{\"primary\":true,\"ipConfigurations\":[{\"name\":\"vmss1247xIPConfig\"\
+        ,\"properties\":{\"subnet\":{\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_none_options/providers/Microsoft.Network/virtualNetworks/vmss1VNET/subnets/vmss1Subnet\"\
+        }}}]}}]}\r\n    },\r\n    \"provisioningState\": \"Succeeded\",\r\n    \"\
+        overprovision\": true,\r\n    \"uniqueId\": \"26fcde72-e107-4262-8d44-9a168484a948\"\
+        \r\n  },\r\n  \"type\": \"Microsoft.Compute/virtualMachineScaleSets\",\r\n\
+        \  \"location\": \"westus\",\r\n  \"tags\": {},\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_none_options/providers/Microsoft.Compute/virtualMachineScaleSets/vmss1\"\
+        ,\r\n  \"name\": \"vmss1\"\r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['2621']
+      content-type: [application/json; charset=utf-8]
+      date: ['Wed, 05 Apr 2017 17:38:29 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]
+    status: {code: 200, message: OK}
+- request:
+    body: null
     headers:
-      Cache-Control: [no-cache]
+      Accept: [application/json]
+      Accept-Encoding: ['gzip, deflate']
+      Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 02:26:50 GMT']
-      Expires: ['-1']
-      Pragma: [no-cache]
-      Strict-Transport-Security: [max-age=31536000; includeSubDomains]
-      Vary: [Accept-Encoding]
-      content-length: ['22']
+      User-Agent: [python/2.7.11 (Windows-10-10.0.14393) requests/2.9.1 msrest/0.4.6
+          msrest_azure/0.4.7 computemanagementclient/0.33.1rc1 Azure-SDK-For-Python
+          AZURECLI/TEST/2.0.2+dev]
+      accept-language: [en-US]
+      x-ms-client-request-id: [af4f2acf-1a26-11e7-8c8b-a0b3ccf7272a]
+    method: GET
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_none_options/providers/Microsoft.Compute/virtualMachineScaleSets/vmss1?api-version=2016-04-30-preview
+  response:
+    body: {string: !!python/unicode "{\r\n  \"sku\": {\r\n    \"name\": \"Standard_D1_v2\"\
+        ,\r\n    \"tier\": \"Standard\",\r\n    \"capacity\": 2\r\n  },\r\n  \"properties\"\
+        : {\r\n    \"singlePlacementGroup\": true,\r\n    \"upgradePolicy\": {\r\n\
+        \      \"mode\": \"Manual\"\r\n    },\r\n    \"virtualMachineProfile\": {\r\
+        \n      \"osProfile\": {\r\n        \"computerNamePrefix\": \"vmss1247x\"\
+        ,\r\n        \"adminUsername\": \"ubuntu\",\r\n        \"linuxConfiguration\"\
+        : {\r\n          \"disablePasswordAuthentication\": true,\r\n          \"\
+        ssh\": {\r\n            \"publicKeys\": [\r\n              {\r\n         \
+        \       \"path\": \"/home/ubuntu/.ssh/authorized_keys\",\r\n             \
+        \   \"keyData\": \"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCbIg1guRHbI0lV11wWDt1r2cUdcNd27CJsg+SfgC7miZeubtwUhbsPdhMQsfDyhOWHq1+ZL0M+nJZV63d/1dhmhtgyOqejUwrPlzKhydsbrsdUor+JmNJDdW01v7BXHyuymT8G4s09jCasNOwiufbP/qp72ruu0bIA1nySsvlf9pCQAuFkAnVnf/rFhUlOkhtRpwcq8SUNY2zRHR/EKb/4NWY1JzR4sa3q2fWIJdrrX0DvLoa5g9bIEd4Df79ba7v+yiUBOS0zT2ll+z4g9izHK3EO5d8hL4jYxcjKs+wcslSYRWrascfscLgMlMGh0CdKeNTDjHpGPncaf3Z+FwwwjWeuiNBxv7bJo13/8B/098KlVDl4GZqsoBCEjPyJfV6hO0y/LkRGkk7oHWKgeWAfKtfLItRp00eZ4fcJNK9kCaSMmEugoZWcI7NGbZXzqFWqbpRI7NcDP9+WIQ+i9U5vqWsqd/zng4kbuAJ6UuKqIzB0upYrLShfQE3SAck8oaLhJqqq56VfDuASNpJKidV+zq27HfSBmbXnkR/5AK337dc3MXKJypoK/QPMLKUAP5XLPbs+NddJQV7EZXd29DLgp+fRIg3edpKdO7ZErWhv7d+3Kws+e1Y+ypmR2WIVSwVyBEUfgv2C8Ts9gnTF4pNcEY/S2aBicz5Ew2+jdyGNQQ==\
+        \ test@example.com\\n\"\r\n              }\r\n            ]\r\n          }\r\
+        \n        },\r\n        \"secrets\": []\r\n      },\r\n      \"storageProfile\"\
+        : {\r\n        \"osDisk\": {\r\n          \"createOption\": \"FromImage\"\
+        ,\r\n          \"caching\": \"ReadWrite\",\r\n          \"managedDisk\": {\r\
+        \n            \"storageAccountType\": \"Standard_LRS\"\r\n          }\r\n\
+        \        },\r\n        \"imageReference\": {\r\n          \"publisher\": \"\
+        credativ\",\r\n          \"offer\": \"Debian\",\r\n          \"sku\": \"8\"\
+        ,\r\n          \"version\": \"latest\"\r\n        }\r\n      },\r\n      \"\
+        networkProfile\": {\"networkInterfaceConfigurations\":[{\"name\":\"vmss1247xNic\"\
+        ,\"properties\":{\"primary\":true,\"ipConfigurations\":[{\"name\":\"vmss1247xIPConfig\"\
+        ,\"properties\":{\"subnet\":{\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_none_options/providers/Microsoft.Network/virtualNetworks/vmss1VNET/subnets/vmss1Subnet\"\
+        }}}]}}]}\r\n    },\r\n    \"provisioningState\": \"Succeeded\",\r\n    \"\
+        overprovision\": true,\r\n    \"uniqueId\": \"26fcde72-e107-4262-8d44-9a168484a948\"\
+        \r\n  },\r\n  \"type\": \"Microsoft.Compute/virtualMachineScaleSets\",\r\n\
+        \  \"location\": \"westus\",\r\n  \"tags\": {},\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_none_options/providers/Microsoft.Compute/virtualMachineScaleSets/vmss1\"\
+        ,\r\n  \"name\": \"vmss1\"\r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['2621']
+      content-type: [application/json; charset=utf-8]
+      date: ['Wed, 05 Apr 2017 17:38: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]
+    status: {code: 200, message: OK}
+- request:
+    body: !!python/unicode '{"sku": {"tier": "Standard", "capacity": 2, "name": "Standard_D1_v2"},
+      "location": "westus", "properties": {"singlePlacementGroup": true, "overprovision":
+      true, "virtualMachineProfile": {"storageProfile": {"imageReference": {"sku":
+      "8", "publisher": "credativ", "version": "latest", "offer": "Debian"}, "osDisk":
+      {"caching": "ReadWrite", "managedDisk": {"storageAccountType": "Standard_LRS"},
+      "createOption": "fromImage"}}, "osProfile": {"secrets": [], "adminUsername":
+      "ubuntu", "computerNamePrefix": "vmss1247x", "linuxConfiguration": {"ssh": {"publicKeys":
+      [{"path": "/home/ubuntu/.ssh/authorized_keys", "keyData": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCbIg1guRHbI0lV11wWDt1r2cUdcNd27CJsg+SfgC7miZeubtwUhbsPdhMQsfDyhOWHq1+ZL0M+nJZV63d/1dhmhtgyOqejUwrPlzKhydsbrsdUor+JmNJDdW01v7BXHyuymT8G4s09jCasNOwiufbP/qp72ruu0bIA1nySsvlf9pCQAuFkAnVnf/rFhUlOkhtRpwcq8SUNY2zRHR/EKb/4NWY1JzR4sa3q2fWIJdrrX0DvLoa5g9bIEd4Df79ba7v+yiUBOS0zT2ll+z4g9izHK3EO5d8hL4jYxcjKs+wcslSYRWrascfscLgMlMGh0CdKeNTDjHpGPncaf3Z+FwwwjWeuiNBxv7bJo13/8B/098KlVDl4GZqsoBCEjPyJfV6hO0y/LkRGkk7oHWKgeWAfKtfLItRp00eZ4fcJNK9kCaSMmEugoZWcI7NGbZXzqFWqbpRI7NcDP9+WIQ+i9U5vqWsqd/zng4kbuAJ6UuKqIzB0upYrLShfQE3SAck8oaLhJqqq56VfDuASNpJKidV+zq27HfSBmbXnkR/5AK337dc3MXKJypoK/QPMLKUAP5XLPbs+NddJQV7EZXd29DLgp+fRIg3edpKdO7ZErWhv7d+3Kws+e1Y+ypmR2WIVSwVyBEUfgv2C8Ts9gnTF4pNcEY/S2aBicz5Ew2+jdyGNQQ==
+      test@example.com\n"}]}, "disablePasswordAuthentication": true}}, "networkProfile":
+      {"networkInterfaceConfigurations": [{"properties": {"primary": true, "ipConfigurations":
+      [{"properties": {"subnet": {"id": "/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/resourceGroups/cli_test_vmss_create_none_options/providers/Microsoft.Network/virtualNetworks/vmss1VNET/subnets/vmss1Subnet"}},
+      "name": "vmss1247xIPConfig"}]}, "name": "vmss1247xNic"}]}}, "upgradePolicy":
+      {"mode": "Manual"}}, "tags": {"test": "success"}}'
+    headers:
+      Accept: [application/json]
+      Accept-Encoding: ['gzip, deflate']
+      Connection: [keep-alive]
+      Content-Length: ['1862']
+      Content-Type: [application/json; charset=utf-8]
+      User-Agent: [python/2.7.11 (Windows-10-10.0.14393) requests/2.9.1 msrest/0.4.6
+          msrest_azure/0.4.7 computemanagementclient/0.33.1rc1 Azure-SDK-For-Python
+          AZURECLI/TEST/2.0.2+dev]
+      accept-language: [en-US]
+      x-ms-client-request-id: [af81374f-1a26-11e7-b7f5-a0b3ccf7272a]
+    method: PUT
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_none_options/providers/Microsoft.Compute/virtualMachineScaleSets/vmss1?api-version=2016-04-30-preview
+  response:
+    body: {string: !!python/unicode "{\r\n  \"sku\": {\r\n    \"name\": \"Standard_D1_v2\"\
+        ,\r\n    \"tier\": \"Standard\",\r\n    \"capacity\": 2\r\n  },\r\n  \"properties\"\
+        : {\r\n    \"singlePlacementGroup\": true,\r\n    \"upgradePolicy\": {\r\n\
+        \      \"mode\": \"Manual\"\r\n    },\r\n    \"virtualMachineProfile\": {\r\
+        \n      \"osProfile\": {\r\n        \"computerNamePrefix\": \"vmss1247x\"\
+        ,\r\n        \"adminUsername\": \"ubuntu\",\r\n        \"linuxConfiguration\"\
+        : {\r\n          \"disablePasswordAuthentication\": true,\r\n          \"\
+        ssh\": {\r\n            \"publicKeys\": [\r\n              {\r\n         \
+        \       \"path\": \"/home/ubuntu/.ssh/authorized_keys\",\r\n             \
+        \   \"keyData\": \"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCbIg1guRHbI0lV11wWDt1r2cUdcNd27CJsg+SfgC7miZeubtwUhbsPdhMQsfDyhOWHq1+ZL0M+nJZV63d/1dhmhtgyOqejUwrPlzKhydsbrsdUor+JmNJDdW01v7BXHyuymT8G4s09jCasNOwiufbP/qp72ruu0bIA1nySsvlf9pCQAuFkAnVnf/rFhUlOkhtRpwcq8SUNY2zRHR/EKb/4NWY1JzR4sa3q2fWIJdrrX0DvLoa5g9bIEd4Df79ba7v+yiUBOS0zT2ll+z4g9izHK3EO5d8hL4jYxcjKs+wcslSYRWrascfscLgMlMGh0CdKeNTDjHpGPncaf3Z+FwwwjWeuiNBxv7bJo13/8B/098KlVDl4GZqsoBCEjPyJfV6hO0y/LkRGkk7oHWKgeWAfKtfLItRp00eZ4fcJNK9kCaSMmEugoZWcI7NGbZXzqFWqbpRI7NcDP9+WIQ+i9U5vqWsqd/zng4kbuAJ6UuKqIzB0upYrLShfQE3SAck8oaLhJqqq56VfDuASNpJKidV+zq27HfSBmbXnkR/5AK337dc3MXKJypoK/QPMLKUAP5XLPbs+NddJQV7EZXd29DLgp+fRIg3edpKdO7ZErWhv7d+3Kws+e1Y+ypmR2WIVSwVyBEUfgv2C8Ts9gnTF4pNcEY/S2aBicz5Ew2+jdyGNQQ==\
+        \ test@example.com\\n\"\r\n              }\r\n            ]\r\n          }\r\
+        \n        },\r\n        \"secrets\": []\r\n      },\r\n      \"storageProfile\"\
+        : {\r\n        \"osDisk\": {\r\n          \"createOption\": \"FromImage\"\
+        ,\r\n          \"caching\": \"ReadWrite\",\r\n          \"managedDisk\": {\r\
+        \n            \"storageAccountType\": \"Standard_LRS\"\r\n          }\r\n\
+        \        },\r\n        \"imageReference\": {\r\n          \"publisher\": \"\
+        credativ\",\r\n          \"offer\": \"Debian\",\r\n          \"sku\": \"8\"\
+        ,\r\n          \"version\": \"latest\"\r\n        }\r\n      },\r\n      \"\
+        networkProfile\": {\"networkInterfaceConfigurations\":[{\"name\":\"vmss1247xNic\"\
+        ,\"properties\":{\"primary\":true,\"ipConfigurations\":[{\"name\":\"vmss1247xIPConfig\"\
+        ,\"properties\":{\"subnet\":{\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_none_options/providers/Microsoft.Network/virtualNetworks/vmss1VNET/subnets/vmss1Subnet\"\
+        }}}]}}]}\r\n    },\r\n    \"provisioningState\": \"Updating\",\r\n    \"overprovision\"\
+        : true,\r\n    \"uniqueId\": \"26fcde72-e107-4262-8d44-9a168484a948\"\r\n\
+        \  },\r\n  \"type\": \"Microsoft.Compute/virtualMachineScaleSets\",\r\n  \"\
+        location\": \"westus\",\r\n  \"tags\": {\r\n    \"test\": \"success\"\r\n\
+        \  },\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_none_options/providers/Microsoft.Compute/virtualMachineScaleSets/vmss1\"\
+        ,\r\n  \"name\": \"vmss1\"\r\n}"}
+    headers:
+      azure-asyncoperation: ['https://management.azure.com/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/providers/Microsoft.Compute/locations/westus/operations/b215c3c1-c984-4c12-84d7-8c01b94d6295?api-version=2016-04-30-preview']
+      cache-control: [no-cache]
+      content-length: ['2647']
+      content-type: [application/json; charset=utf-8]
+      date: ['Wed, 05 Apr 2017 17:38:32 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]
+      x-ms-ratelimit-remaining-subscription-writes: ['1198']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -332,25 +510,58 @@ 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/2.7.11 (Windows-10-10.0.14393) requests/2.9.1 msrest/0.4.6
+          msrest_azure/0.4.7 computemanagementclient/0.33.1rc1 Azure-SDK-For-Python
+          AZURECLI/TEST/2.0.2+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [4c40fd54-e75c-11e6-b444-64510658e3b3]
+      x-ms-client-request-id: [af81374f-1a26-11e7-b7f5-a0b3ccf7272a]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_vmss_create_none_options/providers/Microsoft.Resources/deployments/mock-deployment?api-version=2016-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/b215c3c1-c984-4c12-84d7-8c01b94d6295?api-version=2016-04-30-preview
   response:
-    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_none_options/providers/Microsoft.Resources/deployments/vmss_deploy_N5L40IU9kvBddIGfYy2Gb51rQeR9Fol0","name":"vmss_deploy_N5L40IU9kvBddIGfYy2Gb51rQeR9Fol0","properties":{"parameters":{},"mode":"Incremental","provisioningState":"Succeeded","timestamp":"2017-01-31T02:26:33.932548Z","duration":"PT2M45.1320954S","correlationId":"fa45a063-c769-4a35-9c91-7c86415baa2e","providers":[{"namespace":"Microsoft.Network","resourceTypes":[{"resourceType":"virtualNetworks","locations":["westus"]}]},{"namespace":"Microsoft.Compute","resourceTypes":[{"resourceType":"virtualMachineScaleSets","locations":["westus"]}]}],"dependencies":[{"dependsOn":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_none_options/providers/Microsoft.Network/virtualNetworks/vmss1VNET","resourceType":"Microsoft.Network/virtualNetworks","resourceName":"vmss1VNET"}],"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_none_options/providers/Microsoft.Compute/virtualMachineScaleSets/vmss1","resourceType":"Microsoft.Compute/virtualMachineScaleSets","resourceName":"vmss1"}],"outputs":{"vmss":{"type":"Object","value":{"singlePlacementGroup":true,"upgradePolicy":{"mode":"Manual"},"virtualMachineProfile":{"osProfile":{"computerNamePrefix":"vmss11i6r","adminUsername":"yugangw","linuxConfiguration":{"disablePasswordAuthentication":true,"ssh":{"publicKeys":[{"path":"/home/yugangw/.ssh/authorized_keys","keyData":"ssh-rsa
-        AAAAB3NzaC1yc2EAAAADAQABAAACAQCbIg1guRHbI0lV11wWDt1r2cUdcNd27CJsg+SfgC7miZeubtwUhbsPdhMQsfDyhOWHq1+ZL0M+nJZV63d/1dhmhtgyOqejUwrPlzKhydsbrsdUor+JmNJDdW01v7BXHyuymT8G4s09jCasNOwiufbP/qp72ruu0bIA1nySsvlf9pCQAuFkAnVnf/rFhUlOkhtRpwcq8SUNY2zRHR/EKb/4NWY1JzR4sa3q2fWIJdrrX0DvLoa5g9bIEd4Df79ba7v+yiUBOS0zT2ll+z4g9izHK3EO5d8hL4jYxcjKs+wcslSYRWrascfscLgMlMGh0CdKeNTDjHpGPncaf3Z+FwwwjWeuiNBxv7bJo13/8B/098KlVDl4GZqsoBCEjPyJfV6hO0y/LkRGkk7oHWKgeWAfKtfLItRp00eZ4fcJNK9kCaSMmEugoZWcI7NGbZXzqFWqbpRI7NcDP9+WIQ+i9U5vqWsqd/zng4kbuAJ6UuKqIzB0upYrLShfQE3SAck8oaLhJqqq56VfDuASNpJKidV+zq27HfSBmbXnkR/5AK337dc3MXKJypoK/QPMLKUAP5XLPbs+NddJQV7EZXd29DLgp+fRIg3edpKdO7ZErWhv7d+3Kws+e1Y+ypmR2WIVSwVyBEUfgv2C8Ts9gnTF4pNcEY/S2aBicz5Ew2+jdyGNQQ==
-        test@example.com\n"}]}},"secrets":[]},"storageProfile":{"osDisk":{"createOption":"FromImage","caching":"ReadOnly","managedDisk":{"storageAccountType":"Standard_LRS"}},"imageReference":{"publisher":"credativ","offer":"Debian","sku":"8","version":"latest"}},"networkProfile":{"networkInterfaceConfigurations":[{"name":"vmss11i6rNic","properties":{"primary":true,"ipConfigurations":[{"name":"vmss11i6rIPConfig","properties":{"subnet":{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_none_options/providers/Microsoft.Network/virtualNetworks/vmss1VNET/subnets/vmss1Subnet"}}}]}}]}},"provisioningState":"Succeeded","overprovision":true,"uniqueId":"c7d80043-b836-4fd6-bd44-09396159b26d"}}},"outputResources":[{"id":"Microsoft.Compute/virtualMachineScaleSets/vmss1"},{"id":"Microsoft.Network/virtualNetworks/vmss1VNET"}]}}'}
+    body: {string: !!python/unicode "{\r\n  \"startTime\": \"2017-04-05T17:38:32.9148711+00:00\"\
+        ,\r\n  \"status\": \"InProgress\",\r\n  \"name\": \"b215c3c1-c984-4c12-84d7-8c01b94d6295\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Wed, 05 Apr 2017 17:39:03 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]
+    status: {code: 200, message: OK}
+- request:
+    body: null
     headers:
-      Cache-Control: [no-cache]
+      Accept: [application/json]
+      Accept-Encoding: ['gzip, deflate']
+      Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 02:26:50 GMT']
-      Expires: ['-1']
-      Pragma: [no-cache]
-      Strict-Transport-Security: [max-age=31536000; includeSubDomains]
-      Vary: [Accept-Encoding]
-      content-length: ['3172']
+      User-Agent: [python/2.7.11 (Windows-10-10.0.14393) requests/2.9.1 msrest/0.4.6
+          msrest_azure/0.4.7 computemanagementclient/0.33.1rc1 Azure-SDK-For-Python
+          AZURECLI/TEST/2.0.2+dev]
+      accept-language: [en-US]
+      x-ms-client-request-id: [af81374f-1a26-11e7-b7f5-a0b3ccf7272a]
+    method: GET
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/b215c3c1-c984-4c12-84d7-8c01b94d6295?api-version=2016-04-30-preview
+  response:
+    body: {string: !!python/unicode "{\r\n  \"startTime\": \"2017-04-05T17:38:32.9148711+00:00\"\
+        ,\r\n  \"status\": \"InProgress\",\r\n  \"name\": \"b215c3c1-c984-4c12-84d7-8c01b94d6295\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Wed, 05 Apr 2017 17:39:33 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]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -359,50 +570,83 @@ 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/2.7.11 (Windows-10-10.0.14393) requests/2.9.1 msrest/0.4.6
+          msrest_azure/0.4.7 computemanagementclient/0.33.1rc1 Azure-SDK-For-Python
+          AZURECLI/TEST/2.0.2+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [b99a8a90-e75c-11e6-80eb-64510658e3b3]
+      x-ms-client-request-id: [af81374f-1a26-11e7-b7f5-a0b3ccf7272a]
+    method: GET
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/b215c3c1-c984-4c12-84d7-8c01b94d6295?api-version=2016-04-30-preview
+  response:
+    body: {string: !!python/unicode "{\r\n  \"startTime\": \"2017-04-05T17:38:32.9148711+00:00\"\
+        ,\r\n  \"endTime\": \"2017-04-05T17:39:52.3494835+00:00\",\r\n  \"status\"\
+        : \"Succeeded\",\r\n  \"name\": \"b215c3c1-c984-4c12-84d7-8c01b94d6295\"\r\
+        \n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['184']
+      content-type: [application/json; charset=utf-8]
+      date: ['Wed, 05 Apr 2017 17:40:03 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]
+    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/2.7.11 (Windows-10-10.0.14393) requests/2.9.1 msrest/0.4.6
+          msrest_azure/0.4.7 computemanagementclient/0.33.1rc1 Azure-SDK-For-Python
+          AZURECLI/TEST/2.0.2+dev]
+      accept-language: [en-US]
+      x-ms-client-request-id: [af81374f-1a26-11e7-b7f5-a0b3ccf7272a]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_none_options/providers/Microsoft.Compute/virtualMachineScaleSets/vmss1?api-version=2016-04-30-preview
   response:
-    body: {string: "{\r\n  \"sku\": {\r\n    \"name\": \"Standard_D1_v2\",\r\n   \
-        \ \"tier\": \"Standard\",\r\n    \"capacity\": 2\r\n  },\r\n  \"properties\"\
+    body: {string: !!python/unicode "{\r\n  \"sku\": {\r\n    \"name\": \"Standard_D1_v2\"\
+        ,\r\n    \"tier\": \"Standard\",\r\n    \"capacity\": 2\r\n  },\r\n  \"properties\"\
         : {\r\n    \"singlePlacementGroup\": true,\r\n    \"upgradePolicy\": {\r\n\
         \      \"mode\": \"Manual\"\r\n    },\r\n    \"virtualMachineProfile\": {\r\
-        \n      \"osProfile\": {\r\n        \"computerNamePrefix\": \"vmss11i6r\"\
-        ,\r\n        \"adminUsername\": \"yugangw\",\r\n        \"linuxConfiguration\"\
+        \n      \"osProfile\": {\r\n        \"computerNamePrefix\": \"vmss1247x\"\
+        ,\r\n        \"adminUsername\": \"ubuntu\",\r\n        \"linuxConfiguration\"\
         : {\r\n          \"disablePasswordAuthentication\": true,\r\n          \"\
         ssh\": {\r\n            \"publicKeys\": [\r\n              {\r\n         \
-        \       \"path\": \"/home/yugangw/.ssh/authorized_keys\",\r\n            \
-        \    \"keyData\": \"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCbIg1guRHbI0lV11wWDt1r2cUdcNd27CJsg+SfgC7miZeubtwUhbsPdhMQsfDyhOWHq1+ZL0M+nJZV63d/1dhmhtgyOqejUwrPlzKhydsbrsdUor+JmNJDdW01v7BXHyuymT8G4s09jCasNOwiufbP/qp72ruu0bIA1nySsvlf9pCQAuFkAnVnf/rFhUlOkhtRpwcq8SUNY2zRHR/EKb/4NWY1JzR4sa3q2fWIJdrrX0DvLoa5g9bIEd4Df79ba7v+yiUBOS0zT2ll+z4g9izHK3EO5d8hL4jYxcjKs+wcslSYRWrascfscLgMlMGh0CdKeNTDjHpGPncaf3Z+FwwwjWeuiNBxv7bJo13/8B/098KlVDl4GZqsoBCEjPyJfV6hO0y/LkRGkk7oHWKgeWAfKtfLItRp00eZ4fcJNK9kCaSMmEugoZWcI7NGbZXzqFWqbpRI7NcDP9+WIQ+i9U5vqWsqd/zng4kbuAJ6UuKqIzB0upYrLShfQE3SAck8oaLhJqqq56VfDuASNpJKidV+zq27HfSBmbXnkR/5AK337dc3MXKJypoK/QPMLKUAP5XLPbs+NddJQV7EZXd29DLgp+fRIg3edpKdO7ZErWhv7d+3Kws+e1Y+ypmR2WIVSwVyBEUfgv2C8Ts9gnTF4pNcEY/S2aBicz5Ew2+jdyGNQQ==\
+        \       \"path\": \"/home/ubuntu/.ssh/authorized_keys\",\r\n             \
+        \   \"keyData\": \"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCbIg1guRHbI0lV11wWDt1r2cUdcNd27CJsg+SfgC7miZeubtwUhbsPdhMQsfDyhOWHq1+ZL0M+nJZV63d/1dhmhtgyOqejUwrPlzKhydsbrsdUor+JmNJDdW01v7BXHyuymT8G4s09jCasNOwiufbP/qp72ruu0bIA1nySsvlf9pCQAuFkAnVnf/rFhUlOkhtRpwcq8SUNY2zRHR/EKb/4NWY1JzR4sa3q2fWIJdrrX0DvLoa5g9bIEd4Df79ba7v+yiUBOS0zT2ll+z4g9izHK3EO5d8hL4jYxcjKs+wcslSYRWrascfscLgMlMGh0CdKeNTDjHpGPncaf3Z+FwwwjWeuiNBxv7bJo13/8B/098KlVDl4GZqsoBCEjPyJfV6hO0y/LkRGkk7oHWKgeWAfKtfLItRp00eZ4fcJNK9kCaSMmEugoZWcI7NGbZXzqFWqbpRI7NcDP9+WIQ+i9U5vqWsqd/zng4kbuAJ6UuKqIzB0upYrLShfQE3SAck8oaLhJqqq56VfDuASNpJKidV+zq27HfSBmbXnkR/5AK337dc3MXKJypoK/QPMLKUAP5XLPbs+NddJQV7EZXd29DLgp+fRIg3edpKdO7ZErWhv7d+3Kws+e1Y+ypmR2WIVSwVyBEUfgv2C8Ts9gnTF4pNcEY/S2aBicz5Ew2+jdyGNQQ==\
         \ test@example.com\\n\"\r\n              }\r\n            ]\r\n          }\r\
         \n        },\r\n        \"secrets\": []\r\n      },\r\n      \"storageProfile\"\
         : {\r\n        \"osDisk\": {\r\n          \"createOption\": \"FromImage\"\
-        ,\r\n          \"caching\": \"ReadOnly\",\r\n          \"managedDisk\": {\r\
+        ,\r\n          \"caching\": \"ReadWrite\",\r\n          \"managedDisk\": {\r\
         \n            \"storageAccountType\": \"Standard_LRS\"\r\n          }\r\n\
         \        },\r\n        \"imageReference\": {\r\n          \"publisher\": \"\
         credativ\",\r\n          \"offer\": \"Debian\",\r\n          \"sku\": \"8\"\
         ,\r\n          \"version\": \"latest\"\r\n        }\r\n      },\r\n      \"\
-        networkProfile\": {\"networkInterfaceConfigurations\":[{\"name\":\"vmss11i6rNic\"\
-        ,\"properties\":{\"primary\":true,\"ipConfigurations\":[{\"name\":\"vmss11i6rIPConfig\"\
+        networkProfile\": {\"networkInterfaceConfigurations\":[{\"name\":\"vmss1247xNic\"\
+        ,\"properties\":{\"primary\":true,\"ipConfigurations\":[{\"name\":\"vmss1247xIPConfig\"\
         ,\"properties\":{\"subnet\":{\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_none_options/providers/Microsoft.Network/virtualNetworks/vmss1VNET/subnets/vmss1Subnet\"\
         }}}]}}]}\r\n    },\r\n    \"provisioningState\": \"Succeeded\",\r\n    \"\
-        overprovision\": true,\r\n    \"uniqueId\": \"c7d80043-b836-4fd6-bd44-09396159b26d\"\
+        overprovision\": true,\r\n    \"uniqueId\": \"26fcde72-e107-4262-8d44-9a168484a948\"\
         \r\n  },\r\n  \"type\": \"Microsoft.Compute/virtualMachineScaleSets\",\r\n\
-        \  \"location\": \"westus\",\r\n  \"tags\": {},\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_none_options/providers/Microsoft.Compute/virtualMachineScaleSets/vmss1\"\
+        \  \"location\": \"westus\",\r\n  \"tags\": {\r\n    \"test\": \"success\"\
+        \r\n  },\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_none_options/providers/Microsoft.Compute/virtualMachineScaleSets/vmss1\"\
         ,\r\n  \"name\": \"vmss1\"\r\n}"}
     headers:
-      Cache-Control: [no-cache]
-      Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 02:26:51 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: ['2622']
+      cache-control: [no-cache]
+      content-length: ['2648']
+      content-type: [application/json; charset=utf-8]
+      date: ['Wed, 05 Apr 2017 17:40:03 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]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -411,23 +655,24 @@ 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/2.7.11 (Windows-10-10.0.14393) requests/2.9.1 msrest/0.4.6
+          msrest_azure/0.4.7 networkmanagementclient/0.30.1 Azure-SDK-For-Python AZURECLI/TEST/2.0.2+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [b9ee28a6-e75c-11e6-a86c-64510658e3b3]
+      x-ms-client-request-id: [e74556cf-1a26-11e7-b110-a0b3ccf7272a]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_none_options/providers/Microsoft.Network/publicIPAddresses/vmss1PublicIP?api-version=2016-09-01
   response:
-    body: {string: '{"error":{"code":"ResourceNotFound","message":"The Resource ''Microsoft.Network/publicIPAddresses/vmss1PublicIP''
-        under resource group ''cli_test_vmss_create_none_options'' was not found."}}'}
+    body: {string: !!python/unicode '{"error":{"code":"ResourceNotFound","message":"The
+        Resource ''Microsoft.Network/publicIPAddresses/vmss1PublicIP'' under resource
+        group ''cli_test_vmss_create_none_options'' was not found."}}'}
     headers:
-      Cache-Control: [no-cache]
-      Content-Length: ['192']
-      Content-Type: [application/json; charset=utf-8]
-      Date: ['Tue, 31 Jan 2017 02:26:51 GMT']
-      Expires: ['-1']
-      Pragma: [no-cache]
-      Strict-Transport-Security: [max-age=31536000; includeSubDomains]
+      cache-control: [no-cache]
+      content-length: ['192']
+      content-type: [application/json; charset=utf-8]
+      date: ['Wed, 05 Apr 2017 17:40:04 GMT']
+      expires: ['-1']
+      pragma: [no-cache]
+      strict-transport-security: [max-age=31536000; includeSubDomains]
       x-ms-failure-cause: [gateway]
     status: {code: 404, message: Not Found}
 version: 1
diff --git a/src/command_modules/azure-cli-vm/tests/test_vm_commands.py b/src/command_modules/azure-cli-vm/tests/test_vm_commands.py
index e262101db..ac8dd0720 100644
--- a/src/command_modules/azure-cli-vm/tests/test_vm_commands.py
+++ b/src/command_modules/azure-cli-vm/tests/test_vm_commands.py
@@ -512,7 +512,7 @@ class VMNoWaitScenarioTest(ResourceGroupVCRTestBase):
 class VMAvailSetScenarioTest(ResourceGroupVCRTestBase):
 
     def __init__(self, test_method):
-        super(VMAvailSetScenarioTest, self).__init__(__file__, test_method, resource_group='cliTestRg_Availset')
+        super(VMAvailSetScenarioTest, self).__init__(__file__, test_method, resource_group='cli_test_avail_set')
         self.location = 'westus'
         self.name = 'availset-test'
 
@@ -527,6 +527,8 @@ class VMAvailSetScenarioTest(ResourceGroupVCRTestBase):
                 JMESPathCheck('platformUpdateDomainCount', 2),
                 JMESPathCheck('sku.managed', True)
         ])
+        self.cmd('vm availability-set update -g {} -n {} --set tags.test=success'.format(self.resource_group, self.name),
+                 checks=JMESPathCheck('tags.test', 'success'))
         self.cmd('vm availability-set list -g {}'.format(self.resource_group), checks=[
             JMESPathCheck('length(@)', 1),
             JMESPathCheck('[0].name', self.name),
@@ -1488,12 +1490,13 @@ class VMSSCreateNoneOptionsTest(ResourceGroupVCRTestBase):  # pylint: disable=to
         self.cmd('vmss create -n {0} -g {1} --image Debian --load-balancer {3} --admin-username ubuntu'
                  ' --ssh-key-value \'{2}\' --public-ip-address {3} --tags {3}'
                  .format(vmss_name, self.resource_group, TEST_SSH_KEY_PUB, '""' if platform.system() == 'Windows' else "''"))
-
         self.cmd('vmss show -n {} -g {}'.format(vmss_name, self.resource_group), [
             JMESPathCheck('availabilitySet', None),
             JMESPathCheck('tags', {}),
             JMESPathCheck('virtualMachineProfile.networkProfile.networkInterfaceConfigurations.ipConfigurations.loadBalancerBackendAddressPools', None)
         ])
+        self.cmd('vmss update -g {} -n {} --set tags.test=success'.format(self.resource_group, vmss_name),
+                 checks=JMESPathCheck('tags.test', 'success'))
         self.cmd('network public-ip show -n {}PublicIP -g {}'.format(vmss_name, self.resource_group), checks=NoneCheck(), allowed_exceptions='was not found')