[KeyVault] Enable creation of KeyVault using service principal. (#2447)

* Enable creation of KeyVault using service principal.

azure-cli.pyproj

@@ -15,6 +15,8 @@
     <InterpreterId>{54f4b6dc-0859-46dc-99bb-b275c9d0aca3}</InterpreterId>
     <InterpreterVersion>3.5</InterpreterVersion>
     <EnableNativeCodeDebugging>False</EnableNativeCodeDebugging>
+    <CommandLineArguments>
+    </CommandLineArguments>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)' == 'Debug'" />
   <PropertyGroup Condition="'$(Configuration)' == 'Release'" />
@@ -43,24 +45,6 @@
     <Compile Include="azure-cli-core\azure\cli\core\parser.py" />
     <Compile Include="azure-cli-core\azure\cli\core\prompting.py" />
     <Compile Include="azure-cli-core\azure\cli\core\telemetry_upload.py" />
-    <Compile Include="azure-cli-core\azure\cli\core\tests\test_add_resourcegroup_transform.py" />
-    <Compile Include="azure-cli-core\azure\cli\core\tests\test_application.py" />
-    <Compile Include="azure-cli-core\azure\cli\core\tests\test_cloud.py" />
-    <Compile Include="azure-cli-core\azure\cli\core\tests\test_command_registration.py" />
-    <Compile Include="azure-cli-core\azure\cli\core\tests\test_config.py" />
-    <Compile Include="azure-cli-core\azure\cli\core\tests\test_connection_verify.py" />
-    <Compile Include="azure-cli-core\azure\cli\core\tests\test_extensions_query.py" />
-    <Compile Include="azure-cli-core\azure\cli\core\tests\test_generic_update.py" />
-    <Compile Include="azure-cli-core\azure\cli\core\tests\test_help.py" />
-    <Compile Include="azure-cli-core\azure\cli\core\tests\test_logging.py" />
-    <Compile Include="azure-cli-core\azure\cli\core\tests\test_output.py" />
-    <Compile Include="azure-cli-core\azure\cli\core\tests\test_parser.py" />
-    <Compile Include="azure-cli-core\azure\cli\core\tests\test_profile.py" />
-    <Compile Include="azure-cli-core\azure\cli\core\tests\test_resource_id.py" />
-    <Compile Include="azure-cli-core\azure\cli\core\tests\test_util.py" />
-    <Compile Include="azure-cli-core\azure\cli\core\tests\test_validators.py" />
-    <Compile Include="azure-cli-core\azure\cli\core\tests\test_vcr_security.py" />
-    <Compile Include="azure-cli-core\azure\cli\core\tests\__init__.py" />
     <Compile Include="azure-cli-core\azure\cli\core\test_utils\vcr_test_base.py" />
     <Compile Include="azure-cli-core\azure\cli\core\test_utils\__init__.py" />
     <Compile Include="azure-cli-core\azure\cli\core\_config.py" />
@@ -94,16 +78,24 @@
     <Compile Include="azure-cli-core\tests\test_util.py" />
     <Compile Include="azure-cli-core\tests\test_vcr_security.py" />
     <Compile Include="azure-cli-core\tests\__init__.py" />
+    <Compile Include="azure-cli-testsdk\azure\cli\testsdk\base.py" />
+    <Compile Include="azure-cli-testsdk\azure\cli\testsdk\checkers.py" />
+    <Compile Include="azure-cli-testsdk\azure\cli\testsdk\const.py" />
+    <Compile Include="azure-cli-testsdk\azure\cli\testsdk\exceptions.py" />
+    <Compile Include="azure-cli-testsdk\azure\cli\testsdk\patches.py" />
+    <Compile Include="azure-cli-testsdk\azure\cli\testsdk\preparers.py" />
+    <Compile Include="azure-cli-testsdk\azure\cli\testsdk\recording_processors.py" />
+    <Compile Include="azure-cli-testsdk\azure\cli\testsdk\utilities.py" />
+    <Compile Include="azure-cli-testsdk\azure\cli\testsdk\__init__.py" />
+    <Compile Include="azure-cli-testsdk\setup.py" />
     <Compile Include="azure-cli\azure\cli\main.py" />
     <Compile Include="azure-cli\azure\cli\__init__.py" />
     <Compile Include="azure-cli\azure\cli\__main__.py" />
     <Compile Include="azure-cli\setup.py" />
-    <Compile Include="azure-cli\tests\__init__.py" />
     <Compile Include="command_modules\azure-cli-acr\azure\cli\command_modules\acr\commands.py" />
     <Compile Include="command_modules\azure-cli-acr\azure\cli\command_modules\acr\credential.py" />
     <Compile Include="command_modules\azure-cli-acr\azure\cli\command_modules\acr\custom.py" />
     <Compile Include="command_modules\azure-cli-acr\azure\cli\command_modules\acr\repository.py" />
-    <Compile Include="command_modules\azure-cli-acr\azure\cli\command_modules\acr\tests\test_acr_commands.py" />
     <Compile Include="command_modules\azure-cli-acr\azure\cli\command_modules\acr\_constants.py" />
     <Compile Include="command_modules\azure-cli-acr\azure\cli\command_modules\acr\_factory.py" />
     <Compile Include="command_modules\azure-cli-acr\azure\cli\command_modules\acr\_format.py" />
@@ -113,35 +105,58 @@
     <Compile Include="command_modules\azure-cli-acr\azure\cli\command_modules\acr\_validators.py" />
     <Compile Include="command_modules\azure-cli-acr\azure\cli\command_modules\acr\__init__.py" />
     <Compile Include="command_modules\azure-cli-acr\setup.py" />
+    <Compile Include="command_modules\azure-cli-acr\tests\test_acr_commands.py" />
     <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\acs_client.py" />
     <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\custom.py" />
     <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\commands.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\lib\acs_creation_client.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\lib\credentials.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\lib\exceptions.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\lib\models\acs_creation_client_enums.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\lib\models\basic_dependency.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\lib\models\dependency.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\lib\models\deployment_acs.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\lib\models\deployment_extended.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\lib\models\deployment_properties_extended.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\lib\models\parameters_link.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\lib\models\provider.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\lib\models\provider_resource_type.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\lib\models\template_link.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\lib\models\__init__.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\lib\operations\acs_operations.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\lib\operations\__init__.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\lib\version.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\lib\__init__.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\__init__.py" />
     <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\proxy.py" />
-    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\tests\test_acs_client.py" />
     <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\win_proxy.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\_actions.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\_client_factory.py" />
     <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\_help.py" />
     <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\_params.py" />
     <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\__init__.py" />
     <Compile Include="command_modules\azure-cli-acs\setup.py" />
+    <Compile Include="command_modules\azure-cli-acs\tests\test_acs_client.py" />
+    <Compile Include="command_modules\azure-cli-acs\tests\test_custom.py" />
+    <Compile Include="command_modules\azure-cli-acs\tests\test_service_principals.py" />
+    <Compile Include="command_modules\azure-cli-acs\tests\__init__.py" />
     <Compile Include="command_modules\azure-cli-appservice\azure\cli\command_modules\appservice\commands.py" />
     <Compile Include="command_modules\azure-cli-appservice\azure\cli\command_modules\appservice\custom.py" />
     <Compile Include="command_modules\azure-cli-appservice\azure\cli\command_modules\appservice\_client_factory.py" />
     <Compile Include="command_modules\azure-cli-appservice\azure\cli\command_modules\appservice\_help.py" />
     <Compile Include="command_modules\azure-cli-appservice\azure\cli\command_modules\appservice\_params.py" />
     <Compile Include="command_modules\azure-cli-appservice\azure\cli\command_modules\appservice\__init__.py" />
-    <Compile Include="command_modules\azure-cli-appservice\azure\cli\command_modules\__init__.py" />
-    <Compile Include="command_modules\azure-cli-appservice\azure\cli\__init__.py" />
-    <Compile Include="command_modules\azure-cli-appservice\azure\__init__.py" />
     <Compile Include="command_modules\azure-cli-appservice\setup.py" />
     <Compile Include="command_modules\azure-cli-appservice\tests\test_webapp_commands.py" />
     <Compile Include="command_modules\azure-cli-appservice\tests\test_webapp_commands_thru_mock.py" />
-    <Compile Include="command_modules\azure-cli-appservice\tests\__init__.py" />
-    <Compile Include="command_modules\azure-cli-batch\azure\cli\command_modules\batch\tests\test_batch_commands.py" />
-    <Compile Include="command_modules\azure-cli-batch\azure\cli\command_modules\batch\tests\test_batch_data_plane_commands.py" />
-    <Compile Include="command_modules\azure-cli-batch\azure\cli\command_modules\batch\tests\test_batch_data_plane_command_base.py" />
-    <Compile Include="command_modules\azure-cli-batch\azure\cli\command_modules\batch\tests\test_batch_job_commands.py" />
-    <Compile Include="command_modules\azure-cli-batch\azure\cli\command_modules\batch\tests\test_batch_pool_commands.py" />
     <Compile Include="command_modules\azure-cli-batch\azure\cli\command_modules\batch\_command_type.py" />
+    <Compile Include="command_modules\azure-cli-batch\tests\test_batch_commands.py" />
+    <Compile Include="command_modules\azure-cli-batch\tests\test_batch_data_plane_commands.py" />
+    <Compile Include="command_modules\azure-cli-batch\tests\test_batch_data_plane_command_base.py" />
+    <Compile Include="command_modules\azure-cli-batch\tests\test_batch_job_commands.py" />
+    <Compile Include="command_modules\azure-cli-batch\tests\test_batch_mgmt_commands.py" />
+    <Compile Include="command_modules\azure-cli-batch\tests\test_batch_pool_commands.py" />
+    <Compile Include="command_modules\azure-cli-batch\tests\__init__.py" />
     <Compile Include="command_modules\azure-cli-cloud\azure\cli\command_modules\cloud\commands.py" />
     <Compile Include="command_modules\azure-cli-cloud\azure\cli\command_modules\cloud\custom.py" />
     <Compile Include="command_modules\azure-cli-cloud\azure\cli\command_modules\cloud\_help.py" />
@@ -164,36 +179,35 @@
     <Compile Include="command_modules\azure-cli-container\azure\cli\command_modules\container\_params.py" />
     <Compile Include="command_modules\azure-cli-container\azure\cli\command_modules\container\__init__.py" />
     <Compile Include="command_modules\azure-cli-container\setup.py" />
+    <Compile Include="command_modules\azure-cli-datalake\azure\cli\command_modules\datalake\analytics\commands.py" />
     <Compile Include="command_modules\azure-cli-datalake\azure\cli\command_modules\datalake\analytics\custom.py" />
+    <Compile Include="command_modules\azure-cli-datalake\azure\cli\command_modules\datalake\analytics\_client_factory.py" />
+    <Compile Include="command_modules\azure-cli-datalake\azure\cli\command_modules\datalake\analytics\_help.py" />
+    <Compile Include="command_modules\azure-cli-datalake\azure\cli\command_modules\datalake\analytics\_params.py" />
     <Compile Include="command_modules\azure-cli-datalake\azure\cli\command_modules\datalake\analytics\_validators.py" />
+    <Compile Include="command_modules\azure-cli-datalake\azure\cli\command_modules\datalake\analytics\__init__.py" />
+    <Compile Include="command_modules\azure-cli-datalake\azure\cli\command_modules\datalake\store\commands.py" />
     <Compile Include="command_modules\azure-cli-datalake\azure\cli\command_modules\datalake\store\custom.py" />
+    <Compile Include="command_modules\azure-cli-datalake\azure\cli\command_modules\datalake\store\_client_factory.py" />
+    <Compile Include="command_modules\azure-cli-datalake\azure\cli\command_modules\datalake\store\_help.py" />
+    <Compile Include="command_modules\azure-cli-datalake\azure\cli\command_modules\datalake\store\_params.py" />
     <Compile Include="command_modules\azure-cli-datalake\azure\cli\command_modules\datalake\store\_validators.py" />
+    <Compile Include="command_modules\azure-cli-datalake\azure\cli\command_modules\datalake\store\__init__.py" />
+    <Compile Include="command_modules\azure-cli-datalake\azure\cli\command_modules\datalake\__init__.py" />
+    <Compile Include="command_modules\azure-cli-datalake\setup.py" />
     <Compile Include="command_modules\azure-cli-datalake\tests\test_datalake_analytics_commands.py" />
     <Compile Include="command_modules\azure-cli-datalake\tests\test_datalake_store_commands.py" />
     <Compile Include="command_modules\azure-cli-datalake\tests\__init__.py" />
     <Compile Include="command_modules\azure-cli-documentdb\azure\cli\command_modules\documentdb\commands.py" />
     <Compile Include="command_modules\azure-cli-documentdb\azure\cli\command_modules\documentdb\custom.py" />
-    <Compile Include="command_modules\azure-cli-documentdb\azure\cli\command_modules\documentdb\tests\test_documentdb_params.py" />
-    <Compile Include="command_modules\azure-cli-documentdb\azure\cli\command_modules\documentdb\tests\__init__.py" />
     <Compile Include="command_modules\azure-cli-documentdb\azure\cli\command_modules\documentdb\_client_factory.py" />
     <Compile Include="command_modules\azure-cli-documentdb\azure\cli\command_modules\documentdb\_help.py" />
     <Compile Include="command_modules\azure-cli-documentdb\azure\cli\command_modules\documentdb\_params.py" />
     <Compile Include="command_modules\azure-cli-documentdb\azure\cli\command_modules\documentdb\__init__.py" />
     <Compile Include="command_modules\azure-cli-documentdb\setup.py" />
     <Compile Include="command_modules\azure-cli-documentdb\setup.py" />
-    <Compile Include="command_modules\azure-cli-datalake\azure\cli\command_modules\datalake\analytics\commands.py" />
+    <Compile Include="command_modules\azure-cli-documentdb\tests\test_documentdb_params.py" />
-    <Compile Include="command_modules\azure-cli-datalake\azure\cli\command_modules\datalake\analytics\_client_factory.py" />
+    <Compile Include="command_modules\azure-cli-documentdb\tests\__init__.py" />
-    <Compile Include="command_modules\azure-cli-datalake\azure\cli\command_modules\datalake\analytics\_help.py" />
-    <Compile Include="command_modules\azure-cli-datalake\azure\cli\command_modules\datalake\analytics\_params.py" />
-    <Compile Include="command_modules\azure-cli-datalake\azure\cli\command_modules\datalake\analytics\__init__.py" />
-    <Compile Include="command_modules\azure-cli-datalake\azure\cli\command_modules\datalake\store\commands.py" />
-    <Compile Include="command_modules\azure-cli-datalake\azure\cli\command_modules\datalake\store\_client_factory.py" />
-    <Compile Include="command_modules\azure-cli-datalake\azure\cli\command_modules\datalake\store\_help.py" />
-    <Compile Include="command_modules\azure-cli-datalake\azure\cli\command_modules\datalake\store\_params.py" />
-    <Compile Include="command_modules\azure-cli-datalake\azure\cli\command_modules\datalake\store\__init__.py" />
-    <Compile Include="command_modules\azure-cli-datalake\azure\cli\command_modules\__init__.py" />
-    <Compile Include="command_modules\azure-cli-datalake\azure\cli\__init__.py" />
-    <Compile Include="command_modules\azure-cli-datalake\azure\__init__.py" />
     <Compile Include="command_modules\azure-cli-feedback\azure\cli\command_modules\feedback\commands.py" />
     <Compile Include="command_modules\azure-cli-feedback\azure\cli\command_modules\feedback\custom.py" />
     <Compile Include="command_modules\azure-cli-feedback\azure\cli\command_modules\feedback\_help.py">
@@ -201,6 +215,15 @@
     </Compile>
     <Compile Include="command_modules\azure-cli-feedback\azure\cli\command_modules\feedback\__init__.py" />
     <Compile Include="command_modules\azure-cli-feedback\setup.py" />
+    <Compile Include="command_modules\azure-cli-find\azure\cli\command_modules\find\commands.py" />
+    <Compile Include="command_modules\azure-cli-find\azure\cli\command_modules\find\custom.py" />
+    <Compile Include="command_modules\azure-cli-find\tests\test_find.py" />
+    <Compile Include="command_modules\azure-cli-find\azure\cli\command_modules\find\_gather_commands.py" />
+    <Compile Include="command_modules\azure-cli-find\azure\cli\command_modules\find\_help.py" />
+    <Compile Include="command_modules\azure-cli-find\azure\cli\command_modules\find\_params.py" />
+    <Compile Include="command_modules\azure-cli-find\azure\cli\command_modules\find\__init__.py" />
+    <Compile Include="command_modules\azure-cli-find\azure\__init__.py" />
+    <Compile Include="command_modules\azure-cli-find\setup.py" />
     <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\custom.py" />
     <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\commands.py" />
     <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub_device\lib\credentials.py" />
@@ -216,19 +239,20 @@
     <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub_device\lib\operations\__init__.py" />
     <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub_device\lib\version.py" />
     <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub_device\lib\__init__.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub_device\__init__.py" />
     <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\sas_token_auth.py" />
-    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\tests\test_iot_commands.py" />
-    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\tests\test_sas_token_auth.py" />
-    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\tests\__init__.py" />
     <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\_factory.py" />
     <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\_help.py" />
     <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\_params.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\_utils.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\_validators.py" />
     <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\__init__.py" />
     <Compile Include="command_modules\azure-cli-iot\setup.py" />
+    <Compile Include="command_modules\azure-cli-iot\tests\test_iot_commands.py" />
+    <Compile Include="command_modules\azure-cli-iot\tests\test_sas_token_auth.py" />
+    <Compile Include="command_modules\azure-cli-iot\tests\__init__.py" />
     <Compile Include="command_modules\azure-cli-keyvault\azure\cli\command_modules\keyvault\custom.py" />
     <Compile Include="command_modules\azure-cli-keyvault\azure\cli\command_modules\keyvault\commands.py" />
-    <Compile Include="command_modules\azure-cli-keyvault\azure\cli\command_modules\keyvault\tests\test_keyvault_commands.py" />
-    <Compile Include="command_modules\azure-cli-keyvault\azure\cli\command_modules\keyvault\tests\__init__.py" />
     <Compile Include="command_modules\azure-cli-keyvault\azure\cli\command_modules\keyvault\_client_factory.py" />
     <Compile Include="command_modules\azure-cli-keyvault\azure\cli\command_modules\keyvault\_command_type.py" />
     <Compile Include="command_modules\azure-cli-keyvault\azure\cli\command_modules\keyvault\_help.py" />
@@ -238,14 +262,14 @@
     <Compile Include="command_modules\azure-cli-keyvault\setup.py" />
     <Compile Include="command_modules\azure-cli-batch\azure\cli\command_modules\batch\custom.py" />
     <Compile Include="command_modules\azure-cli-batch\azure\cli\command_modules\batch\commands.py" />
-    <Compile Include="command_modules\azure-cli-batch\azure\cli\command_modules\batch\tests\test_batch_mgmt_commands.py" />
-    <Compile Include="command_modules\azure-cli-batch\azure\cli\command_modules\batch\tests\__init__.py" />
     <Compile Include="command_modules\azure-cli-batch\azure\cli\command_modules\batch\_client_factory.py" />
     <Compile Include="command_modules\azure-cli-batch\azure\cli\command_modules\batch\_help.py" />
     <Compile Include="command_modules\azure-cli-batch\azure\cli\command_modules\batch\_params.py" />
     <Compile Include="command_modules\azure-cli-batch\azure\cli\command_modules\batch\_validators.py" />
     <Compile Include="command_modules\azure-cli-batch\azure\cli\command_modules\batch\__init__.py" />
     <Compile Include="command_modules\azure-cli-batch\setup.py" />
+    <Compile Include="command_modules\azure-cli-keyvault\tests\test_keyvault_commands.py" />
+    <Compile Include="command_modules\azure-cli-keyvault\tests\__init__.py" />
     <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\app_gateway_creation_client.py" />
     <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\credentials.py" />
     <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\exceptions.py" />
@@ -264,14 +288,6 @@
     <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\operations\__init__.py" />
     <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\version.py" />
     <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\__init__.py" />
-    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\tests\test_network_unit_tests.py">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\tests\test_dns_zone_import.py">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\tests\test_network_commands.py" />
-    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\tests\__init__.py" />
     <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\zone_file\configs.py" />
     <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\zone_file\exceptions.py" />
     <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\zone_file\make_zone_file.py" />
@@ -286,15 +302,15 @@
     <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\_template_builder.py" />
     <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\_util.py" />
     <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\_validators.py" />
+    <Compile Include="command_modules\azure-cli-network\tests\test_dns_zone_import.py" />
+    <Compile Include="command_modules\azure-cli-network\tests\test_network_commands.py" />
+    <Compile Include="command_modules\azure-cli-network\tests\test_network_unit_tests.py" />
+    <Compile Include="command_modules\azure-cli-network\tests\__init__.py" />
     <Compile Include="command_modules\azure-cli-profile\azure\cli\command_modules\profile\_help.py">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="command_modules\azure-cli-datalake\azure\cli\command_modules\datalake\__init__.py" />
-    <Compile Include="command_modules\azure-cli-datalake\setup.py" />
     <Compile Include="command_modules\azure-cli-redis\azure\cli\command_modules\redis\custom.py" />
     <Compile Include="command_modules\azure-cli-redis\azure\cli\command_modules\redis\commands.py" />
-    <Compile Include="command_modules\azure-cli-redis\azure\cli\command_modules\redis\tests\test_redis_params.py" />
-    <Compile Include="command_modules\azure-cli-redis\azure\cli\command_modules\redis\tests\__init__.py" />
     <Compile Include="command_modules\azure-cli-redis\azure\cli\command_modules\redis\_client_factory.py" />
     <Compile Include="command_modules\azure-cli-redis\azure\cli\command_modules\redis\_help.py">
       <SubType>Code</SubType>
@@ -302,37 +318,37 @@
     <Compile Include="command_modules\azure-cli-redis\azure\cli\command_modules\redis\_params.py" />
     <Compile Include="command_modules\azure-cli-redis\azure\cli\command_modules\redis\__init__.py" />
     <Compile Include="command_modules\azure-cli-redis\setup.py" />
-    <Compile Include="command_modules\azure-cli-resource\azure\cli\command_modules\resource\tests\__init__.py" />
+    <Compile Include="command_modules\azure-cli-redis\tests\test_redis_params.py" />
+    <Compile Include="command_modules\azure-cli-redis\tests\__init__.py" />
     <Compile Include="command_modules\azure-cli-resource\azure\cli\command_modules\resource\_client_factory.py" />
     <Compile Include="command_modules\azure-cli-resource\azure\cli\command_modules\resource\_help.py">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="command_modules\azure-cli-resource\tests\test_api_check.py" />
+    <Compile Include="command_modules\azure-cli-resource\tests\test_resource.py" />
+    <Compile Include="command_modules\azure-cli-resource\tests\test_resource_list_odata_filter.py" />
+    <Compile Include="command_modules\azure-cli-resource\tests\test_resource_validators.py" />
+    <Compile Include="command_modules\azure-cli-resource\tests\__init__.py" />
     <Compile Include="command_modules\azure-cli-role\azure\cli\command_modules\role\custom.py" />
     <Compile Include="command_modules\azure-cli-role\azure\cli\command_modules\role\_client_factory.py" />
     <Compile Include="command_modules\azure-cli-role\azure\cli\command_modules\role\_help.py">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="command_modules\azure-cli-role\azure\cli\command_modules\role\tests\test_graph.py" />
+    <Compile Include="command_modules\azure-cli-role\tests\test_graph.py" />
+    <Compile Include="command_modules\azure-cli-role\tests\test_role.py" />
     <Compile Include="command_modules\azure-cli-sql\azure\cli\command_modules\sql\commands.py" />
     <Compile Include="command_modules\azure-cli-sql\azure\cli\command_modules\sql\custom.py" />
     <Compile Include="command_modules\azure-cli-sql\azure\cli\command_modules\sql\help.py" />
     <Compile Include="command_modules\azure-cli-sql\azure\cli\command_modules\sql\params.py" />
-    <Compile Include="command_modules\azure-cli-sql\tests\test_sql_commands.py" />
-    <Compile Include="command_modules\azure-cli-sql\tests\__init__.py" />
     <Compile Include="command_modules\azure-cli-sql\azure\cli\command_modules\sql\validators.py" />
     <Compile Include="command_modules\azure-cli-sql\azure\cli\command_modules\sql\_util.py" />
     <Compile Include="command_modules\azure-cli-sql\azure\cli\command_modules\sql\__init__.py" />
     <Compile Include="command_modules\azure-cli-sql\setup.py" />
+    <Compile Include="command_modules\azure-cli-sql\tests\test_sql_commands.py" />
+    <Compile Include="command_modules\azure-cli-sql\tests\__init__.py" />
     <Compile Include="command_modules\azure-cli-storage\azure\cli\command_modules\storage\blob.py" />
     <Compile Include="command_modules\azure-cli-storage\azure\cli\command_modules\storage\file.py" />
     <Compile Include="command_modules\azure-cli-storage\azure\cli\command_modules\storage\storage_url_helpers.py" />
-    <Compile Include="command_modules\azure-cli-storage\azure\cli\command_modules\storage\tests\integration_test_base.py" />
-    <Compile Include="command_modules\azure-cli-storage\azure\cli\command_modules\storage\tests\integration_test_blob_download.py" />
-    <Compile Include="command_modules\azure-cli-storage\azure\cli\command_modules\storage\tests\integration_test_blob_upload.py" />
-    <Compile Include="command_modules\azure-cli-storage\azure\cli\command_modules\storage\tests\integration_test_file_copy.py" />
-    <Compile Include="command_modules\azure-cli-storage\azure\cli\command_modules\storage\tests\integration_test_file_download.py" />
-    <Compile Include="command_modules\azure-cli-storage\azure\cli\command_modules\storage\tests\integration_test_file_upload.py" />
-    <Compile Include="command_modules\azure-cli-storage\azure\cli\command_modules\storage\tests\unittest_storage_url_helpers.py" />
     <Compile Include="command_modules\azure-cli-storage\azure\cli\command_modules\storage\util.py" />
     <Compile Include="command_modules\azure-cli-storage\azure\cli\command_modules\storage\_command_type.py" />
     <Compile Include="command_modules\azure-cli-storage\azure\cli\command_modules\storage\_factory.py" />
@@ -342,6 +358,16 @@
     <Compile Include="command_modules\azure-cli-storage\azure\cli\command_modules\storage\_help.py">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="command_modules\azure-cli-storage\tests\integration_test_base.py" />
+    <Compile Include="command_modules\azure-cli-storage\tests\integration_test_blob_download.py" />
+    <Compile Include="command_modules\azure-cli-storage\tests\integration_test_blob_upload.py" />
+    <Compile Include="command_modules\azure-cli-storage\tests\integration_test_file_copy.py" />
+    <Compile Include="command_modules\azure-cli-storage\tests\integration_test_file_download.py" />
+    <Compile Include="command_modules\azure-cli-storage\tests\integration_test_file_upload.py" />
+    <Compile Include="command_modules\azure-cli-storage\tests\test_storage.py" />
+    <Compile Include="command_modules\azure-cli-storage\tests\test_validators.py" />
+    <Compile Include="command_modules\azure-cli-storage\tests\unittest_storage_url_helpers.py" />
+    <Compile Include="command_modules\azure-cli-storage\tests\__init__.py" />
     <Compile Include="command_modules\azure-cli-taskhelp\azure\cli\command_modules\taskhelp\_help.py">
       <SubType>Code</SubType>
     </Compile>
@@ -382,17 +408,14 @@
     </Compile>
     <Compile Include="command_modules\azure-cli-resource\azure\cli\command_modules\resource\custom.py" />
     <Compile Include="command_modules\azure-cli-resource\azure\cli\command_modules\resource\commands.py" />
-    <Compile Include="command_modules\azure-cli-resource\azure\cli\command_modules\resource\tests\test_validators.py" />
     <Compile Include="command_modules\azure-cli-resource\azure\cli\command_modules\resource\_params.py" />
     <Compile Include="command_modules\azure-cli-resource\azure\cli\command_modules\resource\_validators.py">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="command_modules\azure-cli-role\azure\cli\command_modules\role\commands.py" />
-    <Compile Include="command_modules\azure-cli-role\azure\cli\command_modules\role\tests\test_role.py" />
     <Compile Include="command_modules\azure-cli-role\azure\cli\command_modules\role\_params.py" />
     <Compile Include="command_modules\azure-cli-role\azure\cli\command_modules\role\__init__.py" />
     <Compile Include="command_modules\azure-cli-role\setup.py" />
-    <Compile Include="command_modules\azure-cli-storage\azure\cli\command_modules\storage\tests\test_validators.py" />
     <Compile Include="command_modules\azure-cli-storage\azure\cli\command_modules\storage\custom.py">
       <SubType>Code</SubType>
     </Compile>
@@ -407,39 +430,21 @@
     <Compile Include="command_modules\azure-cli-taskhelp\azure\cli\command_modules\taskhelp\commands.py">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\tests\test_custom_vm_commands.py" />
-    <Compile Include="command_modules\azure-cli-resource\azure\cli\command_modules\resource\tests\test_resource_list_odata_filter.py" />
-    <Compile Include="command_modules\azure-cli-resource\azure\cli\command_modules\resource\tests\test_api_check.py">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="command_modules\azure-cli-component\azure\cli\command_modules\component\__init__.py" />
     <Compile Include="command_modules\azure-cli-component\setup.py" />
     <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\__init__.py" />
     <Compile Include="command_modules\azure-cli-network\setup.py" />
     <Compile Include="command_modules\azure-cli-profile\azure\cli\command_modules\profile\__init__.py" />
     <Compile Include="command_modules\azure-cli-profile\setup.py" />
-    <Compile Include="command_modules\azure-cli-resource\azure\cli\command_modules\resource\tests\test_resource.py">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="command_modules\azure-cli-resource\azure\cli\command_modules\resource\__init__.py" />
     <Compile Include="command_modules\azure-cli-resource\setup.py" />
-    <Compile Include="command_modules\azure-cli-storage\azure\cli\command_modules\storage\tests\test_storage.py">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="command_modules\azure-cli-storage\azure\cli\command_modules\storage\__init__.py" />
     <Compile Include="command_modules\azure-cli-storage\setup.py" />
     <Compile Include="command_modules\azure-cli-taskhelp\azure\cli\command_modules\taskhelp\__init__.py" />
     <Compile Include="command_modules\azure-cli-taskhelp\setup.py" />
-    <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\tests\test_vm_actions.py" />
-    <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\tests\test_vm_commands.py" />
-    <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\tests\test_vm_defaults.py">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\commands.py" />
     <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\custom.py" />
-    <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\tests\test_vm_commands.py" />
+    <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\disk_encryption.py" />
-    <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\tests\test_vm_image.py" />
-    <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\tests\test_vm_parameters.py" />
     <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\_actions.py">
       <SubType>Code</SubType>
     </Compile>
@@ -458,6 +463,13 @@
     </Compile>
     <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\__init__.py" />
     <Compile Include="command_modules\azure-cli-vm\setup.py" />
+    <Compile Include="command_modules\azure-cli-vm\tests\test_custom_vm_commands.py" />
+    <Compile Include="command_modules\azure-cli-vm\tests\test_vm_actions.py" />
+    <Compile Include="command_modules\azure-cli-vm\tests\test_vm_commands.py" />
+    <Compile Include="command_modules\azure-cli-vm\tests\test_vm_defaults.py" />
+    <Compile Include="command_modules\azure-cli-vm\tests\test_vm_image.py" />
+    <Compile Include="command_modules\azure-cli-vm\tests\test_vm_parameters.py" />
+    <Compile Include="command_modules\azure-cli-vm\tests\__init__.py" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="azure-cli-core\" />
@@ -466,40 +478,44 @@
     <Folder Include="azure-cli-core\azure\cli\core\" />
     <Folder Include="azure-cli-core\azure\cli\core\commands\" />
     <Folder Include="azure-cli-core\azure\cli\core\extensions\" />
-    <Folder Include="azure-cli-core\azure\cli\core\tests\" />
     <Folder Include="azure-cli-core\azure\cli\core\test_utils\" />
-    <Folder Include="azure-cli-core\azure\cli\core\utils\" />
     <Folder Include="azure-cli-core\tests\" />
     <Folder Include="azure-cli-core\tests\__pycache__\" />
+    <Folder Include="azure-cli-testsdk\" />
+    <Folder Include="azure-cli-testsdk\azure\" />
+    <Folder Include="azure-cli-testsdk\azure\cli\" />
+    <Folder Include="azure-cli-testsdk\azure\cli\testsdk\" />
     <Folder Include="azure-cli\" />
     <Folder Include="azure-cli\azure\" />
     <Folder Include="azure-cli\azure\cli\" />
     <Folder Include="azure-cli\azure\cli\command_modules\" />
     <Folder Include="azure-cli\azure\cli\tests\" />
-    <Folder Include="azure-cli\tests\" />
-    <Folder Include="azure-cli\tests\__pycache__\" />
     <Folder Include="command_modules\" />
     <Folder Include="command_modules\azure-cli-acr\" />
     <Folder Include="command_modules\azure-cli-acr\azure\" />
     <Folder Include="command_modules\azure-cli-acr\azure\cli\" />
     <Folder Include="command_modules\azure-cli-acr\azure\cli\command_modules\" />
     <Folder Include="command_modules\azure-cli-acr\azure\cli\command_modules\acr\" />
-    <Folder Include="command_modules\azure-cli-acr\azure\cli\command_modules\acr\tests\" />
+    <Folder Include="command_modules\azure-cli-acr\tests\" />
-    <Folder Include="command_modules\azure-cli-acr\azure\cli\command_modules\acr\tests\recordings\" />
     <Folder Include="command_modules\azure-cli-acs\" />
     <Folder Include="command_modules\azure-cli-acs\azure\" />
     <Folder Include="command_modules\azure-cli-acs\azure\cli\" />
     <Folder Include="command_modules\azure-cli-acs\azure\cli\command_modules\" />
     <Folder Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\" />
-    <Folder Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\tests\" />
+    <Folder Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\" />
+    <Folder Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\lib\" />
+    <Folder Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\lib\models\" />
+    <Folder Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\lib\operations\" />
+    <Folder Include="command_modules\azure-cli-acs\tests\" />
     <Folder Include="command_modules\azure-cli-appservice\" />
     <Folder Include="command_modules\azure-cli-appservice\azure\" />
     <Folder Include="command_modules\azure-cli-appservice\azure\cli\" />
     <Folder Include="command_modules\azure-cli-appservice\azure\cli\command_modules\" />
     <Folder Include="command_modules\azure-cli-appservice\azure\cli\command_modules\appservice\" />
     <Folder Include="command_modules\azure-cli-appservice\tests\" />
-    <Folder Include="command_modules\azure-cli-appservice\tests\recordings\" />
     <Folder Include="command_modules\azure-cli-appservice\tests\sample_web\" />
+    <Folder Include="command_modules\azure-cli-batch\tests\" />
+    <Folder Include="command_modules\azure-cli-batch\tests\data\" />
     <Folder Include="command_modules\azure-cli-cloud\" />
     <Folder Include="command_modules\azure-cli-cloud\azure\" />
     <Folder Include="command_modules\azure-cli-cloud\azure\cli\" />
@@ -520,21 +536,31 @@
     <Folder Include="command_modules\azure-cli-container\azure\cli\" />
     <Folder Include="command_modules\azure-cli-container\azure\cli\command_modules\" />
     <Folder Include="command_modules\azure-cli-container\azure\cli\command_modules\container\" />
+    <Folder Include="command_modules\azure-cli-datalake\" />
+    <Folder Include="command_modules\azure-cli-datalake\azure\" />
+    <Folder Include="command_modules\azure-cli-datalake\azure\cli\" />
+    <Folder Include="command_modules\azure-cli-datalake\azure\cli\command_modules\" />
+    <Folder Include="command_modules\azure-cli-datalake\azure\cli\command_modules\datalake\" />
+    <Folder Include="command_modules\azure-cli-datalake\azure\cli\command_modules\datalake\analytics\" />
+    <Folder Include="command_modules\azure-cli-datalake\azure\cli\command_modules\datalake\store\" />
     <Folder Include="command_modules\azure-cli-datalake\tests\" />
-    <Folder Include="command_modules\azure-cli-datalake\tests\recordings\" />
     <Folder Include="command_modules\azure-cli-documentdb\" />
     <Folder Include="command_modules\azure-cli-documentdb\azure\" />
     <Folder Include="command_modules\azure-cli-documentdb\azure\cli\" />
     <Folder Include="command_modules\azure-cli-documentdb\azure\cli\command_modules\" />
     <Folder Include="command_modules\azure-cli-documentdb\azure\cli\command_modules\documentdb\" />
-    <Folder Include="command_modules\azure-cli-documentdb\azure\cli\command_modules\documentdb\tests\" />
+    <Folder Include="command_modules\azure-cli-documentdb\tests\" />
-    <Folder Include="command_modules\azure-cli-datalake\azure\cli\command_modules\datalake\analytics\" />
-    <Folder Include="command_modules\azure-cli-datalake\azure\cli\command_modules\datalake\store\" />
     <Folder Include="command_modules\azure-cli-feedback\" />
     <Folder Include="command_modules\azure-cli-feedback\azure\" />
     <Folder Include="command_modules\azure-cli-feedback\azure\cli\" />
     <Folder Include="command_modules\azure-cli-feedback\azure\cli\command_modules\" />
     <Folder Include="command_modules\azure-cli-feedback\azure\cli\command_modules\feedback\" />
+    <Folder Include="command_modules\azure-cli-find\" />
+    <Folder Include="command_modules\azure-cli-find\azure\" />
+    <Folder Include="command_modules\azure-cli-find\azure\cli\" />
+    <Folder Include="command_modules\azure-cli-find\azure\cli\command_modules\" />
+    <Folder Include="command_modules\azure-cli-find\azure\cli\command_modules\find\" />
+    <Folder Include="command_modules\azure-cli-find\tests\" />
     <Folder Include="command_modules\azure-cli-iot\" />
     <Folder Include="command_modules\azure-cli-iot\azure\" />
     <Folder Include="command_modules\azure-cli-iot\azure\cli\" />
@@ -544,42 +570,38 @@
     <Folder Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub_device\lib\" />
     <Folder Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub_device\lib\models\" />
     <Folder Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub_device\lib\operations\" />
-    <Folder Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\tests\" />
+    <Folder Include="command_modules\azure-cli-iot\tests\" />
     <Folder Include="command_modules\azure-cli-keyvault\" />
     <Folder Include="command_modules\azure-cli-keyvault\azure\" />
     <Folder Include="command_modules\azure-cli-keyvault\azure\cli\" />
     <Folder Include="command_modules\azure-cli-keyvault\azure\cli\command_modules\" />
     <Folder Include="command_modules\azure-cli-keyvault\azure\cli\command_modules\keyvault\" />
-    <Folder Include="command_modules\azure-cli-keyvault\azure\cli\command_modules\keyvault\tests\" />
     <Folder Include="command_modules\azure-cli-batch\" />
     <Folder Include="command_modules\azure-cli-batch\azure\" />
     <Folder Include="command_modules\azure-cli-batch\azure\cli\" />
     <Folder Include="command_modules\azure-cli-batch\azure\cli\command_modules\" />
     <Folder Include="command_modules\azure-cli-batch\azure\cli\command_modules\batch\" />
-    <Folder Include="command_modules\azure-cli-batch\azure\cli\command_modules\batch\tests\" />
+    <Folder Include="command_modules\azure-cli-keyvault\tests\" />
     <Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\" />
     <Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\" />
     <Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\models\" />
     <Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\operations\" />
-    <Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\network\tests\zone_files\" />
     <Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\network\zone_file\" />
-    <Folder Include="command_modules\azure-cli-datalake\" />
+    <Folder Include="command_modules\azure-cli-network\tests\" />
-    <Folder Include="command_modules\azure-cli-datalake\azure\" />
+    <Folder Include="command_modules\azure-cli-network\tests\zone_files\" />
-    <Folder Include="command_modules\azure-cli-datalake\azure\cli\" />
-    <Folder Include="command_modules\azure-cli-datalake\azure\cli\command_modules\" />
-    <Folder Include="command_modules\azure-cli-datalake\azure\cli\command_modules\datalake\" />
     <Folder Include="command_modules\azure-cli-redis\" />
     <Folder Include="command_modules\azure-cli-redis\azure\" />
     <Folder Include="command_modules\azure-cli-redis\azure\cli\" />
     <Folder Include="command_modules\azure-cli-redis\azure\cli\command_modules\" />
     <Folder Include="command_modules\azure-cli-redis\azure\cli\command_modules\redis\" />
-    <Folder Include="command_modules\azure-cli-redis\azure\cli\command_modules\redis\tests\" />
+    <Folder Include="command_modules\azure-cli-redis\tests\" />
+    <Folder Include="command_modules\azure-cli-resource\tests\" />
+    <Folder Include="command_modules\azure-cli-role\tests\" />
     <Folder Include="command_modules\azure-cli-sql\" />
     <Folder Include="command_modules\azure-cli-sql\azure\" />
     <Folder Include="command_modules\azure-cli-sql\azure\cli\" />
     <Folder Include="command_modules\azure-cli-sql\azure\cli\command_modules\" />
     <Folder Include="command_modules\azure-cli-sql\azure\cli\command_modules\sql\" />
-    <Folder Include="command_modules\azure-cli-sql\azure\cli\command_modules\sql\tests\" />
     <Folder Include="command_modules\azure-cli-network\" />
     <Folder Include="command_modules\azure-cli-network\azure\" />
     <Folder Include="command_modules\azure-cli-network\azure\cli\" />
@@ -589,7 +611,6 @@
     <Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\lib\" />
     <Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\lib\models\" />
     <Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\lib\operations\" />
-    <Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\network\tests\" />
     <Folder Include="command_modules\azure-cli-profile\" />
     <Folder Include="command_modules\azure-cli-profile\azure\" />
     <Folder Include="command_modules\azure-cli-profile\azure\cli\" />
@@ -600,20 +621,19 @@
     <Folder Include="command_modules\azure-cli-resource\azure\cli\" />
     <Folder Include="command_modules\azure-cli-resource\azure\cli\command_modules\" />
     <Folder Include="command_modules\azure-cli-resource\azure\cli\command_modules\resource\" />
-    <Folder Include="command_modules\azure-cli-resource\azure\cli\command_modules\resource\tests\" />
     <Folder Include="command_modules\azure-cli-role\" />
     <Folder Include="command_modules\azure-cli-role\azure\" />
     <Folder Include="command_modules\azure-cli-role\azure\cli\" />
     <Folder Include="command_modules\azure-cli-role\azure\cli\command_modules\" />
     <Folder Include="command_modules\azure-cli-role\azure\cli\command_modules\role\" />
-    <Folder Include="command_modules\azure-cli-role\azure\cli\command_modules\role\tests\" />
     <Folder Include="command_modules\azure-cli-sql\tests\" />
     <Folder Include="command_modules\azure-cli-storage\" />
     <Folder Include="command_modules\azure-cli-storage\azure\" />
     <Folder Include="command_modules\azure-cli-storage\azure\cli\" />
     <Folder Include="command_modules\azure-cli-storage\azure\cli\command_modules\" />
     <Folder Include="command_modules\azure-cli-storage\azure\cli\command_modules\storage\" />
-    <Folder Include="command_modules\azure-cli-storage\azure\cli\command_modules\storage\tests\" />
+    <Folder Include="command_modules\azure-cli-storage\tests\" />
+    <Folder Include="command_modules\azure-cli-storage\tests\scripts\" />
     <Folder Include="command_modules\azure-cli-taskhelp\" />
     <Folder Include="command_modules\azure-cli-taskhelp\azure\" />
     <Folder Include="command_modules\azure-cli-taskhelp\azure\cli\" />
@@ -624,59 +644,45 @@
     <Folder Include="command_modules\azure-cli-vm\azure\cli\" />
     <Folder Include="command_modules\azure-cli-vm\azure\cli\command_modules\" />
     <Folder Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\" />
-    <Folder Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\tests\" />
+    <Folder Include="command_modules\azure-cli-vm\tests\" />
+    <Folder Include="command_modules\azure-cli-vm\tests\keyvault\" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="azure-cli-core\setup.cfg" />
-    <Content Include="azure-cli-core\tests\__pycache__\test_add_resourcegroup_transform.cpython-35.pyc" />
-    <Content Include="azure-cli-core\tests\__pycache__\test_application.cpython-35.pyc" />
-    <Content Include="azure-cli-core\tests\__pycache__\test_cloud.cpython-35.pyc" />
-    <Content Include="azure-cli-core\tests\__pycache__\test_command_registration.cpython-35.pyc" />
-    <Content Include="azure-cli-core\tests\__pycache__\test_config.cpython-35.pyc" />
-    <Content Include="azure-cli-core\tests\__pycache__\test_connection_verify.cpython-35.pyc" />
-    <Content Include="azure-cli-core\tests\__pycache__\test_extensions_query.cpython-35.pyc" />
-    <Content Include="azure-cli-core\tests\__pycache__\test_generic_update.cpython-35.pyc" />
-    <Content Include="azure-cli-core\tests\__pycache__\test_help.cpython-35.pyc" />
-    <Content Include="azure-cli-core\tests\__pycache__\test_logging.cpython-35.pyc" />
-    <Content Include="azure-cli-core\tests\__pycache__\test_output.cpython-35.pyc" />
-    <Content Include="azure-cli-core\tests\__pycache__\test_parser.cpython-35.pyc" />
-    <Content Include="azure-cli-core\tests\__pycache__\test_profile.cpython-35.pyc" />
-    <Content Include="azure-cli-core\tests\__pycache__\test_resource_id.cpython-35.pyc" />
-    <Content Include="azure-cli-core\tests\__pycache__\test_storage_validators.cpython-35.pyc" />
-    <Content Include="azure-cli-core\tests\__pycache__\test_telemetry.cpython-35.pyc" />
-    <Content Include="azure-cli-core\tests\__pycache__\test_util.cpython-35.pyc" />
-    <Content Include="azure-cli-core\tests\__pycache__\test_vcr_security.cpython-35.pyc" />
-    <Content Include="azure-cli-core\tests\__pycache__\__init__.cpython-35.pyc" />
     <Content Include="azure-cli\az.completion.sh" />
     <Content Include="azure-cli\setup.cfg" />
-    <Content Include="azure-cli\tests\__pycache__\__init__.cpython-35.pyc" />
     <Content Include="command_modules\azure-cli-acr\azure\cli\command_modules\acr\template.json" />
-    <Content Include="command_modules\azure-cli-acr\azure\cli\command_modules\acr\tests\recordings\test_acr.yaml" />
+    <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-appservice\README.rst" />
     <Content Include="command_modules\azure-cli-appservice\setup.cfg" />
-    <Content Include="command_modules\azure-cli-appservice\tests\recordings\test_appservice_error_polish.yaml" />
-    <Content Include="command_modules\azure-cli-appservice\tests\recordings\test_linux_webapp.yaml" />
-    <Content Include="command_modules\azure-cli-appservice\tests\recordings\test_webapp_backup_config.yaml" />
-    <Content Include="command_modules\azure-cli-appservice\tests\recordings\test_webapp_backup_restore.yaml" />
-    <Content Include="command_modules\azure-cli-appservice\tests\recordings\test_webapp_config.yaml" />
-    <Content Include="command_modules\azure-cli-appservice\tests\recordings\test_webapp_e2e.yaml" />
-    <Content Include="command_modules\azure-cli-appservice\tests\recordings\test_webapp_git.yaml" />
-    <Content Include="command_modules\azure-cli-appservice\tests\recordings\test_webapp_scale.yaml" />
-    <Content Include="command_modules\azure-cli-appservice\tests\recordings\test_webapp_slot.yaml" />
-    <Content Include="command_modules\azure-cli-appservice\tests\recordings\test_webapp_ssl.yaml" />
     <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-appservice\tests\server.pfx" />
+    <Content Include="command_modules\azure-cli-batch\tests\data\batch-pool-create-invalid.json" />
-    <Content Include="command_modules\azure-cli-datalake\HISTORY.rst" />
+    <Content Include="command_modules\azure-cli-batch\tests\data\batch-pool-create.json" />
-    <Content Include="command_modules\azure-cli-datalake\MANIFEST.in" />
+    <Content Include="command_modules\azure-cli-batch\tests\data\batch-pool-update.json" />
-    <Content Include="command_modules\azure-cli-datalake\README.rst" />
+    <Content Include="command_modules\azure-cli-batch\tests\data\batchCreateJob.json" />
-    <Content Include="command_modules\azure-cli-datalake\tests\recordings\test_datalake_analytics_account_mgmt.yaml" />
+    <Content Include="command_modules\azure-cli-batch\tests\data\batchCreateJobForTaskTests.json" />
-    <Content Include="command_modules\azure-cli-datalake\tests\recordings\test_datalake_analytics_catalog_mgmt.yaml" />
+    <Content Include="command_modules\azure-cli-batch\tests\data\batchCreateJobScheduleForJobTests.json" />
-    <Content Include="command_modules\azure-cli-datalake\tests\recordings\test_datalake_analytics_job_mgmt.yaml" />
+    <Content Include="command_modules\azure-cli-batch\tests\data\batchCreateMultiTasks.json" />
-    <Content Include="command_modules\azure-cli-datalake\tests\recordings\test_datalake_store_account_mgmt.yaml" />
+    <Content Include="command_modules\azure-cli-batch\tests\data\batchCreatePool.json" />
-    <Content Include="command_modules\azure-cli-datalake\tests\recordings\test_datalake_store_file_mgmt.yaml" />
+    <Content Include="command_modules\azure-cli-batch\tests\data\batchCreateTask.json" />
+    <Content Include="command_modules\azure-cli-batch\tests\data\batchCreateTestPool.json" />
+    <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-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-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-network\azure\cli\command_modules\network\mgmt_app_gateway\azuredeploy.json" />
     <Content Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\azuredeploy_tests.md">
       <SubType>Code</SubType>
@@ -686,25 +692,30 @@
     <Content Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\azuredeploy_test.md" />
     <Content Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\swagger_create_lb.json" />
     <Content Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\azuredeploy.json" />
-    <Content Include="command_modules\azure-cli-network\azure\cli\command_modules\network\tests\TestCert.pfx" />
+    <Content Include="command_modules\azure-cli-network\tests\zone_files\fail1.txt" />
-    <Content Include="command_modules\azure-cli-network\azure\cli\command_modules\network\tests\zone_files\fail5.txt" />
+    <Content Include="command_modules\azure-cli-network\tests\zone_files\fail2.txt" />
-    <Content Include="command_modules\azure-cli-network\azure\cli\command_modules\network\tests\zone_files\fail4.txt" />
+    <Content Include="command_modules\azure-cli-network\tests\zone_files\fail3.txt" />
-    <Content Include="command_modules\azure-cli-network\azure\cli\command_modules\network\tests\zone_files\fail3.txt" />
+    <Content Include="command_modules\azure-cli-network\tests\zone_files\fail4.txt" />
-    <Content Include="command_modules\azure-cli-network\azure\cli\command_modules\network\tests\zone_files\fail2.txt" />
+    <Content Include="command_modules\azure-cli-network\tests\zone_files\fail5.txt" />
-    <Content Include="command_modules\azure-cli-network\azure\cli\command_modules\network\tests\zone_files\zone1.txt" />
+    <Content Include="command_modules\azure-cli-network\tests\zone_files\zone1.txt" />
-    <Content Include="command_modules\azure-cli-network\azure\cli\command_modules\network\tests\zone_files\zone2.txt" />
+    <Content Include="command_modules\azure-cli-network\tests\zone_files\zone2.txt" />
-    <Content Include="command_modules\azure-cli-network\azure\cli\command_modules\network\tests\zone_files\zone3.txt" />
+    <Content Include="command_modules\azure-cli-network\tests\zone_files\zone3.txt" />
-    <Content Include="command_modules\azure-cli-network\azure\cli\command_modules\network\tests\zone_files\zone4.txt" />
+    <Content Include="command_modules\azure-cli-network\tests\zone_files\zone4.txt" />
-    <Content Include="command_modules\azure-cli-network\azure\cli\command_modules\network\tests\zone_files\zone5.txt" />
+    <Content Include="command_modules\azure-cli-network\tests\zone_files\zone5.txt" />
-    <Content Include="command_modules\azure-cli-network\azure\cli\command_modules\network\tests\zone_files\fail1.txt">
+    <Content Include="command_modules\azure-cli-resource\tests\sample_policy_rule.json" />
-      <SubType>Code</SubType>
+    <Content Include="command_modules\azure-cli-resource\tests\simple_deploy.json" />
-    </Content>
+    <Content Include="command_modules\azure-cli-resource\tests\simple_deploy_parameters.json" />
-    <Content Include="command_modules\azure-cli-resource\azure\cli\command_modules\resource\tests\sample_policy_rule.json" />
+    <Content Include="command_modules\azure-cli-storage\tests\Readme.md" />
-    <Content Include="command_modules\azure-cli-resource\azure\cli\command_modules\resource\tests\simple_deploy.json" />
+    <Content Include="command_modules\azure-cli-storage\tests\scripts\purge_test_sample.sh" />
-    <Content Include="command_modules\azure-cli-resource\azure\cli\command_modules\resource\tests\simple_deploy_parameters.json" />
+    <Content Include="command_modules\azure-cli-storage\tests\scripts\run_integration.sh" />
-    <Content Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\tests\aliases.json" />
+    <Content Include="command_modules\azure-cli-storage\tests\scripts\set_test_env.sh" />
-    <Content Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\tests\vmss_create_test_plan.md" />
+    <Content Include="command_modules\azure-cli-storage\tests\testfile.rst" />
-    <Content Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\tests\vm_create_test_plan.md" />
+    <Content Include="command_modules\azure-cli-storage\tests\testpage.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" />
+    <Content Include="command_modules\azure-cli-vm\tests\vmss_create_test_plan.md" />
+    <Content Include="command_modules\azure-cli-vm\tests\vm_create_test_plan.md" />
   </ItemGroup>
   <ItemGroup>
     <Interpreter Include="..\env\">

azure-cli2017.pyproj

@@ -57,6 +57,25 @@
     <Compile Include="azure-cli-core\azure\cli\core\_util.py" />
     <Compile Include="azure-cli-core\azure\cli\core\__init__.py" />
     <Compile Include="azure-cli-core\setup.py" />
+    <Compile Include="azure-cli-core\tests\test_add_resourcegroup_transform.py" />
+    <Compile Include="azure-cli-core\tests\test_application.py" />
+    <Compile Include="azure-cli-core\tests\test_cloud.py" />
+    <Compile Include="azure-cli-core\tests\test_command_registration.py" />
+    <Compile Include="azure-cli-core\tests\test_config.py" />
+    <Compile Include="azure-cli-core\tests\test_connection_verify.py" />
+    <Compile Include="azure-cli-core\tests\test_extensions_query.py" />
+    <Compile Include="azure-cli-core\tests\test_generic_update.py" />
+    <Compile Include="azure-cli-core\tests\test_help.py" />
+    <Compile Include="azure-cli-core\tests\test_logging.py" />
+    <Compile Include="azure-cli-core\tests\test_output.py" />
+    <Compile Include="azure-cli-core\tests\test_parser.py" />
+    <Compile Include="azure-cli-core\tests\test_profile.py" />
+    <Compile Include="azure-cli-core\tests\test_resource_id.py" />
+    <Compile Include="azure-cli-core\tests\test_storage_validators.py" />
+    <Compile Include="azure-cli-core\tests\test_telemetry.py" />
+    <Compile Include="azure-cli-core\tests\test_util.py" />
+    <Compile Include="azure-cli-core\tests\test_vcr_security.py" />
+    <Compile Include="azure-cli-core\tests\__init__.py" />
     <Compile Include="azure-cli-testsdk\azure\cli\testsdk\base.py" />
     <Compile Include="azure-cli-testsdk\azure\cli\testsdk\checkers.py" />
     <Compile Include="azure-cli-testsdk\azure\cli\testsdk\const.py" />
@@ -430,6 +449,7 @@
     <Folder Include="azure-cli-core\azure\cli\core\extensions\" />
     <Folder Include="azure-cli-core\azure\cli\core\test_utils\" />
     <Folder Include="azure-cli-core\azure\cli\core\utils\" />
+    <Folder Include="azure-cli-core\tests\" />
     <Folder Include="azure-cli-testsdk\" />
     <Folder Include="azure-cli-testsdk\azure\" />
     <Folder Include="azure-cli-testsdk\azure\cli\" />
@@ -438,7 +458,6 @@
     <Folder Include="azure-cli\azure\" />
     <Folder Include="azure-cli\azure\cli\" />
     <Folder Include="azure-cli\azure\cli\command_modules\" />
-    <Folder Include="azure-cli\azure\cli\tests\" />
     <Folder Include="command_modules\" />
     <Folder Include="command_modules\azure-cli-acr\" />
     <Folder Include="command_modules\azure-cli-acr\azure\" />

src/azure-cli-core/azure/cli/core/test_utils/vcr_test_base.py

@@ -202,6 +202,11 @@ def _scrub_deployment_name(uri):
     return re.sub('/deployments/([^/?]+)', '/deployments/mock-deployment', uri)
 
 
+def _scrub_service_principal_name(uri):
+    return re.sub('userPrincipalName%20eq%20%27(.+)%27',
+                  'userPrincipalName%20eq%20%27example%40example.com%27', uri)
+
+
 def _search_result_by_jmespath(json_data, query):
     if not json_data:
         json_data = '{}'
@@ -310,6 +315,7 @@ class VCRTestBase(unittest.TestCase):  # pylint: disable=too-many-instance-attri
                              '/graph.windows.net/{}/'.format(MOCKED_TENANT_ID), request.uri)
         request.uri = re.sub('/sig=([^/]+)&', '/sig=0000&', request.uri)
         request.uri = _scrub_deployment_name(request.uri)
+        request.uri = _scrub_service_principal_name(request.uri)
 
         # replace random storage account name with dummy name
         request.uri = re.sub(r'(vcrstorage[\d]+)', MOCKED_STORAGE_ACCOUNT, request.uri)

src/azure-cli/tests/__init__.py

@@ -1,4 +0,0 @@
-# --------------------------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for license information.
-# --------------------------------------------------------------------------------------------

src/command_modules/azure-cli-batch/tests/recordings/test_batch_account_mgmt.yaml

@@ -82,6 +82,41 @@ interactions:
       Vary: [Accept-Encoding]
       content-length: ['757']
     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.5
+          msrest_azure/0.4.7 graphrbacmanagementclient/0.30.0rc6 Azure-SDK-For-Python]
+      accept-language: [en-US]
+      x-ms-client-request-id: [8d2fb5e2-051c-11e7-a0c0-a0b3ccf7272a]
+    method: GET
+    uri: https://graph.windows.net/00000000-0000-0000-0000-000000000000/users?$filter=userPrincipalName%20eq%20%27example%40example.com%27&api-version=1.6
+  response:
+    body: {string: '{"odata.metadata":"https://graph.windows.net/54826b22-38d6-4fb2-bad9-b7b93a3e9c5a/$metadata#directoryObjects/Microsoft.DirectoryServices.User","value":[{"odata.type":"Microsoft.DirectoryServices.User","objectType":"User","objectId":"5963f50c-7c43-405c-af7e-53294de76abd","deletionTimestamp":null,"accountEnabled":true,"signInNames":[],"assignedLicenses":[],"assignedPlans":[],"city":null,"companyName":null,"country":null,"creationType":null,"department":null,"dirSyncEnabled":null,"displayName":"Admin2","facsimileTelephoneNumber":null,"givenName":"Admin2","immutableId":null,"isCompromised":null,"jobTitle":null,"lastDirSyncTime":null,"mail":null,"mailNickname":"admin2","mobile":null,"onPremisesSecurityIdentifier":null,"otherMails":["destanko@microsoft.com"],"passwordPolicies":"None","passwordProfile":null,"physicalDeliveryOfficeName":null,"postalCode":null,"preferredLanguage":null,"provisionedPlans":[],"provisioningErrors":[],"proxyAddresses":[],"refreshTokensValidFromDateTime":"2017-01-03T20:58:19Z","showInAddressList":null,"sipProxyAddress":null,"state":null,"streetAddress":null,"surname":"Admin2","telephoneNumber":null,"usageLocation":null,"userPrincipalName":"admin2@AzureSDKTeam.onmicrosoft.com","userType":"Member"}]}'}
+    headers:
+      Access-Control-Allow-Origin: ['*']
+      Cache-Control: [no-cache]
+      Content-Length: ['1236']
+      Content-Type: [application/json;odata=minimalmetadata;streaming=true;charset=utf-8]
+      DataServiceVersion: [3.0;]
+      Date: ['Thu, 09 Mar 2017 23:03:03 GMT']
+      Duration: ['762923']
+      Expires: ['-1']
+      Pragma: [no-cache]
+      Server: [Microsoft-IIS/8.5]
+      Strict-Transport-Security: [max-age=31536000; includeSubDomains]
+      X-AspNet-Version: [4.0.30319]
+      X-Content-Type-Options: [nosniff]
+      X-Powered-By: [ASP.NET, ASP.NET]
+      ocp-aad-diagnostics-server-name: [DR19pqY8f0NwIf7uWlwUtWuxMpUjmBOYROdsxaOBGDc=]
+      ocp-aad-session-key: [9bFJtv5SvNAoN3-ubP1PLYL0w1Xq8so8RgtYTZsyqCzazZBQb6yRKowIKXnzZ1e58KFf64kafXL7ppZOg9CtuHeripVKPItwfLZJD9Nq5BReTlpr9I6hvDMGBktNm9sk.fvs3uBvcYLbZUJ_Vi5XIuZ6pSDiuFnTeSbnesxRhmeE]
+      request-id: [993c3fb2-9c8c-4a6a-8d34-e63427f49731]
+      x-ms-dirapi-data-contract-version: ['1.6']
+    status: {code: 200, message: OK}
 - request:
     body: null
     headers:

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

@@ -244,9 +244,7 @@ def create_keyvault(client, resource_group_name, vault_name, location, #pylint:d
                                         KeyPermissions.restore],
                                   secrets=[SecretPermissions.all],
                                   certificates=[CertificatePermissions.all])
-        object_id = _get_current_user_object_id(graph_client)
+        object_id = _get_object_id(graph_client, subscription=subscription)
-        if not object_id:
-            object_id = _get_object_id(graph_client, subscription=subscription)
         if not object_id:
             raise CLIError('Cannot create vault.\n'
                            'Unable to query active directory for information '\

src/command_modules/azure-cli-keyvault/tests/recordings/test_keyvault_mgmt.yaml

@@ -6,58 +6,59 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 graphrbacmanagementclient/0.30.0rc6 Azure-SDK-For-Python]
       accept-language: [en-US]
-      x-ms-client-request-id: [9e6fa902-f95d-11e6-a18a-acde48001122]
+      x-ms-client-request-id: [8d2fb5e2-051c-11e7-a0c0-a0b3ccf7272a]
     method: GET
-    uri: https://graph.windows.net/00000000-0000-0000-0000-000000000000/me?api-version=1.6
+    uri: https://graph.windows.net/00000000-0000-0000-0000-000000000000/users?$filter=userPrincipalName%20eq%20%27example%40example.com%27&api-version=1.6
   response:
-    body: {string: '{"odata.metadata":"https://graph.windows.net/9148c3a5-1e1b-4e0a-87c2-302229534991/$metadata#directoryObjects/@Element","odata.type":"Microsoft.DirectoryServices.User","objectType":"User","objectId":"882b503c-c281-4fe9-a85c-d9e0cd66d376","deletionTimestamp":null,"accountEnabled":true,"signInNames":[],"assignedLicenses":[],"assignedPlans":[],"city":null,"companyName":null,"country":null,"creationType":null,"department":null,"dirSyncEnabled":null,"displayName":"David
+    body: {string: '{"odata.metadata":"https://graph.windows.net/54826b22-38d6-4fb2-bad9-b7b93a3e9c5a/$metadata#directoryObjects/Microsoft.DirectoryServices.User","value":[{"odata.type":"Microsoft.DirectoryServices.User","objectType":"User","objectId":"5963f50c-7c43-405c-af7e-53294de76abd","deletionTimestamp":null,"accountEnabled":true,"signInNames":[],"assignedLicenses":[],"assignedPlans":[],"city":null,"companyName":null,"country":null,"creationType":null,"department":null,"dirSyncEnabled":null,"displayName":"Admin2","facsimileTelephoneNumber":null,"givenName":"Admin2","immutableId":null,"isCompromised":null,"jobTitle":null,"lastDirSyncTime":null,"mail":null,"mailNickname":"admin2","mobile":null,"onPremisesSecurityIdentifier":null,"otherMails":["destanko@microsoft.com"],"passwordPolicies":"None","passwordProfile":null,"physicalDeliveryOfficeName":null,"postalCode":null,"preferredLanguage":null,"provisionedPlans":[],"provisioningErrors":[],"proxyAddresses":[],"refreshTokensValidFromDateTime":"2017-01-03T20:58:19Z","showInAddressList":null,"sipProxyAddress":null,"state":null,"streetAddress":null,"surname":"Admin2","telephoneNumber":null,"usageLocation":null,"userPrincipalName":"admin2@AzureSDKTeam.onmicrosoft.com","userType":"Member"}]}'}
-        Justice","facsimileTelephoneNumber":null,"givenName":"David","immutableId":null,"isCompromised":null,"jobTitle":null,"lastDirSyncTime":null,"mail":null,"mailNickname":"david_devigned.com#EXT#","mobile":null,"onPremisesSecurityIdentifier":null,"otherMails":["david@devigned.com"],"passwordPolicies":null,"passwordProfile":null,"physicalDeliveryOfficeName":null,"postalCode":null,"preferredLanguage":null,"provisionedPlans":[],"provisioningErrors":[],"proxyAddresses":[],"refreshTokensValidFromDateTime":"2014-05-21T18:21:24Z","showInAddressList":null,"sipProxyAddress":null,"state":null,"streetAddress":null,"surname":"Justice","telephoneNumber":null,"thumbnailPhoto@odata.mediaEditLink":"directoryObjects/882b503c-c281-4fe9-a85c-d9e0cd66d376/Microsoft.DirectoryServices.User/thumbnailPhoto","usageLocation":null,"userPrincipalName":"david_devigned.com#EXT#@daviddevigned.onmicrosoft.com","userType":"Member"}'}
     headers:
       Access-Control-Allow-Origin: ['*']
       Cache-Control: [no-cache]
-      Content-Length: ['1377']
+      Content-Length: ['1236']
       Content-Type: [application/json;odata=minimalmetadata;streaming=true;charset=utf-8]
       DataServiceVersion: [3.0;]
-      Date: ['Thu, 23 Feb 2017 00:18:37 GMT']
+      Date: ['Thu, 09 Mar 2017 23:03:03 GMT']
-      Duration: ['878209']
+      Duration: ['762923']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-IIS/8.5]
+      Strict-Transport-Security: [max-age=31536000; includeSubDomains]
       X-AspNet-Version: [4.0.30319]
+      X-Content-Type-Options: [nosniff]
       X-Powered-By: [ASP.NET, ASP.NET]
-      ocp-aad-diagnostics-server-name: [6icUGGpPrSmxpPfGPb278Jglsmi9Q1PrPdqNC+Gtpmw=]
+      ocp-aad-diagnostics-server-name: [DR19pqY8f0NwIf7uWlwUtWuxMpUjmBOYROdsxaOBGDc=]
-      ocp-aad-session-key: [01Vx1o5uY25xBf_7tdBcswgm-57xImBuGW6JY-IWzuUOd56Ex-Uzn66gdAWu2pmWMUVw5s7YIdsMLuidqrgCwgG9GL_N89GrC9WB14vt2zNK28lT6VVK0gMwjscU_1mG.YMgPnt6TYGYvUDTnrSIhfMlHjPLrOwZJixOjVP_tCOE]
+      ocp-aad-session-key: [9bFJtv5SvNAoN3-ubP1PLYL0w1Xq8so8RgtYTZsyqCzazZBQb6yRKowIKXnzZ1e58KFf64kafXL7ppZOg9CtuHeripVKPItwfLZJD9Nq5BReTlpr9I6hvDMGBktNm9sk.fvs3uBvcYLbZUJ_Vi5XIuZ6pSDiuFnTeSbnesxRhmeE]
-      request-id: [d79a27a0-ab7a-4fed-9c1e-9a0a68348080]
+      request-id: [993c3fb2-9c8c-4a6a-8d34-e63427f49731]
       x-ms-dirapi-data-contract-version: ['1.6']
     status: {code: 200, message: OK}
 - request:
-    body: '{"properties": {"tenantId": "9148c3a5-1e1b-4e0a-87c2-302229534991", "sku":
+    body: '{"location": "westus", "properties": {"sku": {"name": "standard", "family":
-      {"family": "A", "name": "standard"}, "accessPolicies": [{"permissions": {"certificates":
+      "A"}, "tenantId": "54826b22-38d6-4fb2-bad9-b7b93a3e9c5a", "accessPolicies":
-      ["all"], "keys": ["get", "create", "delete", "list", "update", "import", "backup",
+      [{"tenantId": "54826b22-38d6-4fb2-bad9-b7b93a3e9c5a", "objectId": "5963f50c-7c43-405c-af7e-53294de76abd",
-      "restore"], "secrets": ["all"]}, "tenantId": "9148c3a5-1e1b-4e0a-87c2-302229534991",
+      "permissions": {"keys": ["get", "create", "delete", "list", "update", "import",
-      "objectId": "882b503c-c281-4fe9-a85c-d9e0cd66d376"}]}, "location": "westus"}'
+      "backup", "restore"], "secrets": ["all"], "certificates": ["all"]}}]}}'
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Length: ['408']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 keyvaultmanagementclient/0.30.0 Azure-SDK-For-Python
-          AZURECLI/TEST/0.1.2rc1+dev]
+          AZURECLI/TEST/2.0.0+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [9e94192e-f95d-11e6-9832-acde48001122]
+      x-ms-client-request-id: [8d543438-051c-11e7-9770-a0b3ccf7272a]
     method: PUT
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-mgmt/providers/Microsoft.KeyVault/vaults/cli-keyvault-12345-0?api-version=2015-06-01
   response:
-    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-mgmt/providers/Microsoft.KeyVault/vaults/cli-keyvault-12345-0","name":"cli-keyvault-12345-0","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{},"properties":{"sku":{"family":"A","name":"standard"},"tenantId":"9148c3a5-1e1b-4e0a-87c2-302229534991","accessPolicies":[{"tenantId":"9148c3a5-1e1b-4e0a-87c2-302229534991","objectId":"882b503c-c281-4fe9-a85c-d9e0cd66d376","permissions":{"certificates":["all"],"keys":["get","create","delete","list","update","import","backup","restore"],"secrets":["all"]}}],"enabledForDeployment":false,"vaultUri":"https://cli-keyvault-12345-0.vault.azure.net"}}'}
+    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-mgmt/providers/Microsoft.KeyVault/vaults/cli-keyvault-12345-0","name":"cli-keyvault-12345-0","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{},"properties":{"sku":{"family":"A","name":"standard"},"tenantId":"54826b22-38d6-4fb2-bad9-b7b93a3e9c5a","accessPolicies":[{"tenantId":"54826b22-38d6-4fb2-bad9-b7b93a3e9c5a","objectId":"5963f50c-7c43-405c-af7e-53294de76abd","permissions":{"keys":["get","create","delete","list","update","import","backup","restore"],"secrets":["all"],"certificates":["all"]}}],"enabledForDeployment":false,"vaultUri":"https://cli-keyvault-12345-0.vault.azure.net"}}'}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Thu, 23 Feb 2017 00:18:37 GMT']
+      Date: ['Thu, 09 Mar 2017 23:03:04 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-IIS/8.5]
@@ -68,8 +69,8 @@ interactions:
       X-Content-Type-Options: [nosniff]
       X-Powered-By: [ASP.NET]
       content-length: ['702']
-      x-ms-keyvault-service-version: [1.0.0.151]
+      x-ms-keyvault-service-version: [1.0.0.153]
-      x-ms-ratelimit-remaining-subscription-writes: ['1197']
+      x-ms-ratelimit-remaining-subscription-writes: ['1196']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -78,24 +79,24 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 keyvaultmanagementclient/0.30.0 Azure-SDK-For-Python
-          AZURECLI/TEST/0.1.2rc1+dev]
+          AZURECLI/TEST/2.0.0+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [9f9fc870-f95d-11e6-a0f2-acde48001122]
+      x-ms-client-request-id: [8e7c5798-051c-11e7-bef5-a0b3ccf7272a]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resources?$filter=resourceType%20eq%20%27Microsoft.KeyVault%2Fvaults%27&api-version=2015-11-01
   response:
-    body: {string: '{"value":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-key_f3u6_/providers/Microsoft.KeyVault/vaults/cli-keyvault-test-key","name":"cli-keyvault-test-key","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{}},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-mgmt/providers/Microsoft.KeyVault/vaults/cli-keyvault-12345-0","name":"cli-keyvault-12345-0","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{}}]}'}
+    body: {string: '{"value":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-cert_3m6c_/providers/Microsoft.KeyVault/vaults/cli-test-keyvault-cert1","name":"cli-test-keyvault-cert1","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{}},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-key_qm3y_/providers/Microsoft.KeyVault/vaults/cli-keyvault-test-key","name":"cli-keyvault-test-key","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{}},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-mgmt/providers/Microsoft.KeyVault/vaults/cli-keyvault-12345-0","name":"cli-keyvault-12345-0","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{}},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/tjp-kv/providers/Microsoft.KeyVault/vaults/python-sdk-test-keyvault","name":"python-sdk-test-keyvault","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{}},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/tjp-kv/providers/Microsoft.KeyVault/vaults/tjpkeyvault3","name":"tjpkeyvault3","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{}}]}'}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Thu, 23 Feb 2017 00:18:38 GMT']
+      Date: ['Thu, 09 Mar 2017 23:03:06 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
       Vary: [Accept-Encoding]
-      content-length: ['526']
+      content-length: ['1251']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -104,19 +105,19 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 keyvaultmanagementclient/0.30.0 Azure-SDK-For-Python
-          AZURECLI/TEST/0.1.2rc1+dev]
+          AZURECLI/TEST/2.0.0+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [9fcdd2f8-f95d-11e6-a118-acde48001122]
+      x-ms-client-request-id: [8e8c37dc-051c-11e7-b9ad-a0b3ccf7272a]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-mgmt/providers/Microsoft.KeyVault/vaults/cli-keyvault-12345-0?api-version=2015-06-01
   response:
-    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-mgmt/providers/Microsoft.KeyVault/vaults/cli-keyvault-12345-0","name":"cli-keyvault-12345-0","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{},"properties":{"sku":{"family":"A","name":"standard"},"tenantId":"9148c3a5-1e1b-4e0a-87c2-302229534991","accessPolicies":[{"tenantId":"9148c3a5-1e1b-4e0a-87c2-302229534991","objectId":"882b503c-c281-4fe9-a85c-d9e0cd66d376","permissions":{"certificates":["all"],"keys":["get","create","delete","list","update","import","backup","restore"],"secrets":["all"]}}],"enabledForDeployment":false,"vaultUri":"https://cli-keyvault-12345-0.vault.azure.net/"}}'}
+    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-mgmt/providers/Microsoft.KeyVault/vaults/cli-keyvault-12345-0","name":"cli-keyvault-12345-0","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{},"properties":{"sku":{"family":"A","name":"standard"},"tenantId":"54826b22-38d6-4fb2-bad9-b7b93a3e9c5a","accessPolicies":[{"tenantId":"54826b22-38d6-4fb2-bad9-b7b93a3e9c5a","objectId":"5963f50c-7c43-405c-af7e-53294de76abd","permissions":{"keys":["get","create","delete","list","update","import","backup","restore"],"secrets":["all"],"certificates":["all"]}}],"enabledForDeployment":false,"vaultUri":"https://cli-keyvault-12345-0.vault.azure.net/"}}'}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Thu, 23 Feb 2017 00:18:39 GMT']
+      Date: ['Thu, 09 Mar 2017 23:03:06 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-IIS/8.5]
@@ -127,7 +128,7 @@ interactions:
       X-Content-Type-Options: [nosniff]
       X-Powered-By: [ASP.NET]
       content-length: ['703']
-      x-ms-keyvault-service-version: [1.0.0.151]
+      x-ms-keyvault-service-version: [1.0.0.153]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -136,19 +137,19 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 keyvaultmanagementclient/0.30.0 Azure-SDK-For-Python
-          AZURECLI/TEST/0.1.2rc1+dev]
+          AZURECLI/TEST/2.0.0+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [a10ab6c2-f95d-11e6-aa88-acde48001122]
+      x-ms-client-request-id: [8f1f5e9c-051c-11e7-ba35-a0b3ccf7272a]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-mgmt/providers/Microsoft.KeyVault/vaults?api-version=2015-06-01
   response:
-    body: {string: '{"value":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-mgmt/providers/Microsoft.KeyVault/vaults/cli-keyvault-12345-0","name":"cli-keyvault-12345-0","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{},"properties":{"sku":{"family":"A","name":"standard"},"tenantId":"9148c3a5-1e1b-4e0a-87c2-302229534991","accessPolicies":[{"tenantId":"9148c3a5-1e1b-4e0a-87c2-302229534991","objectId":"882b503c-c281-4fe9-a85c-d9e0cd66d376","permissions":{"certificates":["all"],"keys":["get","create","delete","list","update","import","backup","restore"],"secrets":["all"]}}],"enabledForDeployment":false,"vaultUri":"https://cli-keyvault-12345-0.vault.azure.net/"}}],"nextLink":"https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-mgmt/providers/Microsoft.KeyVault/vaults?api-version=2015-06-01&$skiptoken=Y2xpLWtleXZhdWx0LTEyMzQ1LTA="}'}
+    body: {string: '{"value":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-mgmt/providers/Microsoft.KeyVault/vaults/cli-keyvault-12345-0","name":"cli-keyvault-12345-0","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{},"properties":{"sku":{"family":"A","name":"standard"},"tenantId":"54826b22-38d6-4fb2-bad9-b7b93a3e9c5a","accessPolicies":[{"tenantId":"54826b22-38d6-4fb2-bad9-b7b93a3e9c5a","objectId":"5963f50c-7c43-405c-af7e-53294de76abd","permissions":{"keys":["get","create","delete","list","update","import","backup","restore"],"secrets":["all"],"certificates":["all"]}}],"enabledForDeployment":false,"vaultUri":"https://cli-keyvault-12345-0.vault.azure.net/"}}],"nextLink":"https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-mgmt/providers/Microsoft.KeyVault/vaults?api-version=2015-06-01&$skiptoken=Y2xpLWtleXZhdWx0LTEyMzQ1LTA="}'}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Thu, 23 Feb 2017 00:18:41 GMT']
+      Date: ['Thu, 09 Mar 2017 23:03:07 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-IIS/8.5]
@@ -159,7 +160,7 @@ interactions:
       X-Content-Type-Options: [nosniff]
       X-Powered-By: [ASP.NET]
       content-length: ['951']
-      x-ms-keyvault-service-version: [1.0.0.151]
+      x-ms-keyvault-service-version: [1.0.0.153]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -168,11 +169,11 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 keyvaultmanagementclient/0.30.0 Azure-SDK-For-Python
-          AZURECLI/TEST/0.1.2rc1+dev]
+          AZURECLI/TEST/2.0.0+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [a17c7af0-f95d-11e6-80d5-acde48001122]
+      x-ms-client-request-id: [8f782cc2-051c-11e7-95f4-a0b3ccf7272a]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-mgmt/providers/Microsoft.KeyVault/vaults?api-version=2015-06-01&$skiptoken=Y2xpLWtleXZhdWx0LTEyMzQ1LTA=
   response:
@@ -180,7 +181,7 @@ interactions:
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Thu, 23 Feb 2017 00:18:41 GMT']
+      Date: ['Thu, 09 Mar 2017 23:03:08 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-IIS/8.5]
@@ -191,7 +192,7 @@ interactions:
       X-Content-Type-Options: [nosniff]
       X-Powered-By: [ASP.NET]
       content-length: ['12']
-      x-ms-keyvault-service-version: [1.0.0.151]
+      x-ms-keyvault-service-version: [1.0.0.153]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -200,19 +201,19 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 keyvaultmanagementclient/0.30.0 Azure-SDK-For-Python
-          AZURECLI/TEST/0.1.2rc1+dev]
+          AZURECLI/TEST/2.0.0+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [a23e0828-f95d-11e6-8592-acde48001122]
+      x-ms-client-request-id: [901c157a-051c-11e7-a93a-a0b3ccf7272a]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-mgmt/providers/Microsoft.KeyVault/vaults/cli-keyvault-12345-0?api-version=2015-06-01
   response:
-    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-mgmt/providers/Microsoft.KeyVault/vaults/cli-keyvault-12345-0","name":"cli-keyvault-12345-0","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{},"properties":{"sku":{"family":"A","name":"standard"},"tenantId":"9148c3a5-1e1b-4e0a-87c2-302229534991","accessPolicies":[{"tenantId":"9148c3a5-1e1b-4e0a-87c2-302229534991","objectId":"882b503c-c281-4fe9-a85c-d9e0cd66d376","permissions":{"certificates":["all"],"keys":["get","create","delete","list","update","import","backup","restore"],"secrets":["all"]}}],"enabledForDeployment":false,"vaultUri":"https://cli-keyvault-12345-0.vault.azure.net/"}}'}
+    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-mgmt/providers/Microsoft.KeyVault/vaults/cli-keyvault-12345-0","name":"cli-keyvault-12345-0","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{},"properties":{"sku":{"family":"A","name":"standard"},"tenantId":"54826b22-38d6-4fb2-bad9-b7b93a3e9c5a","accessPolicies":[{"tenantId":"54826b22-38d6-4fb2-bad9-b7b93a3e9c5a","objectId":"5963f50c-7c43-405c-af7e-53294de76abd","permissions":{"keys":["get","create","delete","list","update","import","backup","restore"],"secrets":["all"],"certificates":["all"]}}],"enabledForDeployment":false,"vaultUri":"https://cli-keyvault-12345-0.vault.azure.net/"}}'}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Thu, 23 Feb 2017 00:18:43 GMT']
+      Date: ['Thu, 09 Mar 2017 23:03:09 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-IIS/8.5]
@@ -223,34 +224,34 @@ interactions:
       X-Content-Type-Options: [nosniff]
       X-Powered-By: [ASP.NET]
       content-length: ['703']
-      x-ms-keyvault-service-version: [1.0.0.151]
+      x-ms-keyvault-service-version: [1.0.0.153]
     status: {code: 200, message: OK}
 - request:
-    body: '{"properties": {"tenantId": "9148c3a5-1e1b-4e0a-87c2-302229534991", "sku":
+    body: '{"location": "westus", "properties": {"sku": {"name": "premium", "family":
-      {"family": "A", "name": "premium"}, "accessPolicies": [{"permissions": {"certificates":
+      "A"}, "enabledForDeployment": false, "accessPolicies": [{"tenantId": "54826b22-38d6-4fb2-bad9-b7b93a3e9c5a",
-      ["all"], "keys": ["get", "create", "delete", "list", "update", "import", "backup",
+      "objectId": "5963f50c-7c43-405c-af7e-53294de76abd", "permissions": {"keys":
-      "restore"], "secrets": ["all"]}, "tenantId": "9148c3a5-1e1b-4e0a-87c2-302229534991",
+      ["get", "create", "delete", "list", "update", "import", "backup", "restore"],
-      "objectId": "882b503c-c281-4fe9-a85c-d9e0cd66d376"}], "vaultUri": "https://cli-keyvault-12345-0.vault.azure.net/",
+      "secrets": ["all"], "certificates": ["all"]}}], "tenantId": "54826b22-38d6-4fb2-bad9-b7b93a3e9c5a",
-      "enabledForDeployment": false}, "location": "westus"}'
+      "vaultUri": "https://cli-keyvault-12345-0.vault.azure.net/"}}'
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Length: ['499']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 keyvaultmanagementclient/0.30.0 Azure-SDK-For-Python
-          AZURECLI/TEST/0.1.2rc1+dev]
+          AZURECLI/TEST/2.0.0+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [a266e7c0-f95d-11e6-9915-acde48001122]
+      x-ms-client-request-id: [9050bda8-051c-11e7-ad61-a0b3ccf7272a]
     method: PUT
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-mgmt/providers/Microsoft.KeyVault/vaults/cli-keyvault-12345-0?api-version=2015-06-01
   response:
-    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-mgmt/providers/Microsoft.KeyVault/vaults/cli-keyvault-12345-0","name":"cli-keyvault-12345-0","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{},"properties":{"sku":{"family":"A","name":"premium"},"tenantId":"9148c3a5-1e1b-4e0a-87c2-302229534991","accessPolicies":[{"tenantId":"9148c3a5-1e1b-4e0a-87c2-302229534991","objectId":"882b503c-c281-4fe9-a85c-d9e0cd66d376","permissions":{"certificates":["all"],"keys":["get","create","delete","list","update","import","backup","restore"],"secrets":["all"]}}],"enabledForDeployment":false,"vaultUri":"https://cli-keyvault-12345-0.vault.azure.net/"}}'}
+    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-mgmt/providers/Microsoft.KeyVault/vaults/cli-keyvault-12345-0","name":"cli-keyvault-12345-0","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{},"properties":{"sku":{"family":"A","name":"premium"},"tenantId":"54826b22-38d6-4fb2-bad9-b7b93a3e9c5a","accessPolicies":[{"tenantId":"54826b22-38d6-4fb2-bad9-b7b93a3e9c5a","objectId":"5963f50c-7c43-405c-af7e-53294de76abd","permissions":{"keys":["get","create","delete","list","update","import","backup","restore"],"secrets":["all"],"certificates":["all"]}}],"enabledForDeployment":false,"vaultUri":"https://cli-keyvault-12345-0.vault.azure.net/"}}'}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Thu, 23 Feb 2017 00:18:43 GMT']
+      Date: ['Thu, 09 Mar 2017 23:03:09 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-IIS/8.5]
@@ -261,8 +262,8 @@ interactions:
       X-Content-Type-Options: [nosniff]
       X-Powered-By: [ASP.NET]
       content-length: ['702']
-      x-ms-keyvault-service-version: [1.0.0.151]
+      x-ms-keyvault-service-version: [1.0.0.153]
-      x-ms-ratelimit-remaining-subscription-writes: ['1199']
+      x-ms-ratelimit-remaining-subscription-writes: ['1194']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -271,19 +272,19 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 keyvaultmanagementclient/0.30.0 Azure-SDK-For-Python
-          AZURECLI/TEST/0.1.2rc1+dev]
+          AZURECLI/TEST/2.0.0+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [a3097f58-f95d-11e6-9003-acde48001122]
+      x-ms-client-request-id: [90e46952-051c-11e7-8daf-a0b3ccf7272a]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-mgmt/providers/Microsoft.KeyVault/vaults/cli-keyvault-12345-0?api-version=2015-06-01
   response:
-    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-mgmt/providers/Microsoft.KeyVault/vaults/cli-keyvault-12345-0","name":"cli-keyvault-12345-0","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{},"properties":{"sku":{"family":"A","name":"premium"},"tenantId":"9148c3a5-1e1b-4e0a-87c2-302229534991","accessPolicies":[{"tenantId":"9148c3a5-1e1b-4e0a-87c2-302229534991","objectId":"882b503c-c281-4fe9-a85c-d9e0cd66d376","permissions":{"certificates":["all"],"keys":["get","create","delete","list","update","import","backup","restore"],"secrets":["all"]}}],"enabledForDeployment":false,"vaultUri":"https://cli-keyvault-12345-0.vault.azure.net/"}}'}
+    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-mgmt/providers/Microsoft.KeyVault/vaults/cli-keyvault-12345-0","name":"cli-keyvault-12345-0","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{},"properties":{"sku":{"family":"A","name":"premium"},"tenantId":"54826b22-38d6-4fb2-bad9-b7b93a3e9c5a","accessPolicies":[{"tenantId":"54826b22-38d6-4fb2-bad9-b7b93a3e9c5a","objectId":"5963f50c-7c43-405c-af7e-53294de76abd","permissions":{"keys":["get","create","delete","list","update","import","backup","restore"],"secrets":["all"],"certificates":["all"]}}],"enabledForDeployment":false,"vaultUri":"https://cli-keyvault-12345-0.vault.azure.net/"}}'}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Thu, 23 Feb 2017 00:18:44 GMT']
+      Date: ['Thu, 09 Mar 2017 23:03:09 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-IIS/8.5]
@@ -294,34 +295,34 @@ interactions:
       X-Content-Type-Options: [nosniff]
       X-Powered-By: [ASP.NET]
       content-length: ['702']
-      x-ms-keyvault-service-version: [1.0.0.151]
+      x-ms-keyvault-service-version: [1.0.0.153]
     status: {code: 200, message: OK}
 - request:
-    body: '{"properties": {"tenantId": "9148c3a5-1e1b-4e0a-87c2-302229534991", "sku":
+    body: '{"location": "westus", "tags": {}, "properties": {"sku": {"name": "premium",
-      {"family": "A", "name": "premium"}, "accessPolicies": [{"permissions": {"certificates":
+      "family": "A"}, "enabledForDeployment": false, "accessPolicies": [{"tenantId":
-      ["get", "list"], "keys": ["get", "create", "delete", "list", "update", "import",
+      "54826b22-38d6-4fb2-bad9-b7b93a3e9c5a", "objectId": "5963f50c-7c43-405c-af7e-53294de76abd",
-      "backup", "restore"], "secrets": ["all"]}, "tenantId": "9148c3a5-1e1b-4e0a-87c2-302229534991",
+      "permissions": {"keys": ["get", "create", "delete", "list", "update", "import",
-      "objectId": "882b503c-c281-4fe9-a85c-d9e0cd66d376"}], "vaultUri": "https://cli-keyvault-12345-0.vault.azure.net/",
+      "backup", "restore"], "secrets": ["all"], "certificates": ["get", "list"]}}],
-      "enabledForDeployment": false}, "location": "westus", "tags": {}}'
+      "tenantId": "54826b22-38d6-4fb2-bad9-b7b93a3e9c5a", "vaultUri": "https://cli-keyvault-12345-0.vault.azure.net/"}}'
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Length: ['519']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 keyvaultmanagementclient/0.30.0 Azure-SDK-For-Python
-          AZURECLI/TEST/0.1.2rc1+dev]
+          AZURECLI/TEST/2.0.0+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [a33789ca-f95d-11e6-a899-acde48001122]
+      x-ms-client-request-id: [9122af36-051c-11e7-861e-a0b3ccf7272a]
     method: PUT
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-mgmt/providers/Microsoft.KeyVault/vaults/cli-keyvault-12345-0?api-version=2015-06-01
   response:
-    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-mgmt/providers/Microsoft.KeyVault/vaults/cli-keyvault-12345-0","name":"cli-keyvault-12345-0","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{},"properties":{"sku":{"family":"A","name":"premium"},"tenantId":"9148c3a5-1e1b-4e0a-87c2-302229534991","accessPolicies":[{"tenantId":"9148c3a5-1e1b-4e0a-87c2-302229534991","objectId":"882b503c-c281-4fe9-a85c-d9e0cd66d376","permissions":{"certificates":["get","list"],"keys":["get","create","delete","list","update","import","backup","restore"],"secrets":["all"]}}],"enabledForDeployment":false,"vaultUri":"https://cli-keyvault-12345-0.vault.azure.net/"}}'}
+    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-mgmt/providers/Microsoft.KeyVault/vaults/cli-keyvault-12345-0","name":"cli-keyvault-12345-0","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{},"properties":{"sku":{"family":"A","name":"premium"},"tenantId":"54826b22-38d6-4fb2-bad9-b7b93a3e9c5a","accessPolicies":[{"tenantId":"54826b22-38d6-4fb2-bad9-b7b93a3e9c5a","objectId":"5963f50c-7c43-405c-af7e-53294de76abd","permissions":{"keys":["get","create","delete","list","update","import","backup","restore"],"secrets":["all"],"certificates":["get","list"]}}],"enabledForDeployment":false,"vaultUri":"https://cli-keyvault-12345-0.vault.azure.net/"}}'}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Thu, 23 Feb 2017 00:18:45 GMT']
+      Date: ['Thu, 09 Mar 2017 23:03:10 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-IIS/8.5]
@@ -332,7 +333,132 @@ interactions:
       X-Content-Type-Options: [nosniff]
       X-Powered-By: [ASP.NET]
       content-length: ['709']
-      x-ms-keyvault-service-version: [1.0.0.151]
+      x-ms-keyvault-service-version: [1.0.0.153]
+      x-ms-ratelimit-remaining-subscription-writes: ['1195']
+    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.5
+          msrest_azure/0.4.7 keyvaultmanagementclient/0.30.0 Azure-SDK-For-Python
+          AZURECLI/TEST/2.0.0+dev]
+      accept-language: [en-US]
+      x-ms-client-request-id: [91bad436-051c-11e7-8250-a0b3ccf7272a]
+    method: GET
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-mgmt/providers/Microsoft.KeyVault/vaults/cli-keyvault-12345-0?api-version=2015-06-01
+  response:
+    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-mgmt/providers/Microsoft.KeyVault/vaults/cli-keyvault-12345-0","name":"cli-keyvault-12345-0","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{},"properties":{"sku":{"family":"A","name":"premium"},"tenantId":"54826b22-38d6-4fb2-bad9-b7b93a3e9c5a","accessPolicies":[{"tenantId":"54826b22-38d6-4fb2-bad9-b7b93a3e9c5a","objectId":"5963f50c-7c43-405c-af7e-53294de76abd","permissions":{"keys":["get","create","delete","list","update","import","backup","restore"],"secrets":["all"],"certificates":["get","list"]}}],"enabledForDeployment":false,"vaultUri":"https://cli-keyvault-12345-0.vault.azure.net/"}}'}
+    headers:
+      Cache-Control: [no-cache]
+      Content-Type: [application/json; charset=utf-8]
+      Date: ['Thu, 09 Mar 2017 23:03:11 GMT']
+      Expires: ['-1']
+      Pragma: [no-cache]
+      Server: [Microsoft-IIS/8.5]
+      Strict-Transport-Security: [max-age=31536000; includeSubDomains]
+      Transfer-Encoding: [chunked]
+      Vary: [Accept-Encoding]
+      X-AspNet-Version: [4.0.30319]
+      X-Content-Type-Options: [nosniff]
+      X-Powered-By: [ASP.NET]
+      content-length: ['709']
+      x-ms-keyvault-service-version: [1.0.0.153]
+    status: {code: 200, message: OK}
+- request:
+    body: '{"location": "westus", "tags": {}, "properties": {"sku": {"name": "premium",
+      "family": "A"}, "enabledForDeployment": false, "accessPolicies": [], "tenantId":
+      "54826b22-38d6-4fb2-bad9-b7b93a3e9c5a", "vaultUri": "https://cli-keyvault-12345-0.vault.azure.net/"}}'
+    headers:
+      Accept: [application/json]
+      Accept-Encoding: ['gzip, deflate']
+      Connection: [keep-alive]
+      Content-Length: ['259']
+      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.5
+          msrest_azure/0.4.7 keyvaultmanagementclient/0.30.0 Azure-SDK-For-Python
+          AZURECLI/TEST/2.0.0+dev]
+      accept-language: [en-US]
+      x-ms-client-request-id: [91e0b96e-051c-11e7-9f0f-a0b3ccf7272a]
+    method: PUT
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-mgmt/providers/Microsoft.KeyVault/vaults/cli-keyvault-12345-0?api-version=2015-06-01
+  response:
+    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-mgmt/providers/Microsoft.KeyVault/vaults/cli-keyvault-12345-0","name":"cli-keyvault-12345-0","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{},"properties":{"sku":{"family":"A","name":"premium"},"tenantId":"54826b22-38d6-4fb2-bad9-b7b93a3e9c5a","accessPolicies":[],"enabledForDeployment":false,"vaultUri":"https://cli-keyvault-12345-0.vault.azure.net/"}}'}
+    headers:
+      Cache-Control: [no-cache]
+      Content-Type: [application/json; charset=utf-8]
+      Date: ['Thu, 09 Mar 2017 23:03:12 GMT']
+      Expires: ['-1']
+      Pragma: [no-cache]
+      Server: [Microsoft-IIS/8.5]
+      Strict-Transport-Security: [max-age=31536000; includeSubDomains]
+      Transfer-Encoding: [chunked]
+      Vary: [Accept-Encoding]
+      X-AspNet-Version: [4.0.30319]
+      X-Content-Type-Options: [nosniff]
+      X-Powered-By: [ASP.NET]
+      content-length: ['467']
+      x-ms-keyvault-service-version: [1.0.0.153]
+      x-ms-ratelimit-remaining-subscription-writes: ['1196']
+    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.5
+          msrest_azure/0.4.7 keyvaultmanagementclient/0.30.0 Azure-SDK-For-Python
+          AZURECLI/TEST/2.0.0+dev]
+      accept-language: [en-US]
+      x-ms-client-request-id: [92653026-051c-11e7-b1d5-a0b3ccf7272a]
+    method: GET
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resources?$filter=resourceType%20eq%20%27Microsoft.KeyVault%2Fvaults%27&api-version=2015-11-01
+  response:
+    body: {string: '{"value":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-cert_3m6c_/providers/Microsoft.KeyVault/vaults/cli-test-keyvault-cert1","name":"cli-test-keyvault-cert1","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{}},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-key_qm3y_/providers/Microsoft.KeyVault/vaults/cli-keyvault-test-key","name":"cli-keyvault-test-key","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{}},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-mgmt/providers/Microsoft.KeyVault/vaults/cli-keyvault-12345-0","name":"cli-keyvault-12345-0","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{}},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/tjp-kv/providers/Microsoft.KeyVault/vaults/python-sdk-test-keyvault","name":"python-sdk-test-keyvault","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{}},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/tjp-kv/providers/Microsoft.KeyVault/vaults/tjpkeyvault3","name":"tjpkeyvault3","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{}}]}'}
+    headers:
+      Cache-Control: [no-cache]
+      Content-Type: [application/json; charset=utf-8]
+      Date: ['Thu, 09 Mar 2017 23:03:12 GMT']
+      Expires: ['-1']
+      Pragma: [no-cache]
+      Strict-Transport-Security: [max-age=31536000; includeSubDomains]
+      Vary: [Accept-Encoding]
+      content-length: ['1251']
+    status: {code: 200, message: OK}
+- request:
+    body: null
+    headers:
+      Accept: [application/json]
+      Accept-Encoding: ['gzip, deflate']
+      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.9.1 msrest/0.4.5
+          msrest_azure/0.4.7 keyvaultmanagementclient/0.30.0 Azure-SDK-For-Python
+          AZURECLI/TEST/2.0.0+dev]
+      accept-language: [en-US]
+      x-ms-client-request-id: [92769cee-051c-11e7-bbdc-a0b3ccf7272a]
+    method: DELETE
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-mgmt/providers/Microsoft.KeyVault/vaults/cli-keyvault-12345-0?api-version=2015-06-01
+  response:
+    body: {string: ''}
+    headers:
+      Cache-Control: [no-cache]
+      Content-Length: ['0']
+      Date: ['Thu, 09 Mar 2017 23:03:13 GMT']
+      Expires: ['-1']
+      Pragma: [no-cache]
+      Server: [Microsoft-IIS/8.5]
+      Strict-Transport-Security: [max-age=31536000; includeSubDomains]
+      X-AspNet-Version: [4.0.30319]
+      X-Content-Type-Options: [nosniff]
+      X-Powered-By: [ASP.NET]
+      x-ms-keyvault-service-version: [1.0.0.153]
       x-ms-ratelimit-remaining-subscription-writes: ['1197']
     status: {code: 200, message: OK}
 - request:
@@ -342,136 +468,11 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 keyvaultmanagementclient/0.30.0 Azure-SDK-For-Python
-          AZURECLI/TEST/0.1.2rc1+dev]
+          AZURECLI/TEST/2.0.0+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [a41943ba-f95d-11e6-8f2c-acde48001122]
+      x-ms-client-request-id: [934a5136-051c-11e7-a82d-a0b3ccf7272a]
-    method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-mgmt/providers/Microsoft.KeyVault/vaults/cli-keyvault-12345-0?api-version=2015-06-01
-  response:
-    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-mgmt/providers/Microsoft.KeyVault/vaults/cli-keyvault-12345-0","name":"cli-keyvault-12345-0","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{},"properties":{"sku":{"family":"A","name":"premium"},"tenantId":"9148c3a5-1e1b-4e0a-87c2-302229534991","accessPolicies":[{"tenantId":"9148c3a5-1e1b-4e0a-87c2-302229534991","objectId":"882b503c-c281-4fe9-a85c-d9e0cd66d376","permissions":{"certificates":["get","list"],"keys":["get","create","delete","list","update","import","backup","restore"],"secrets":["all"]}}],"enabledForDeployment":false,"vaultUri":"https://cli-keyvault-12345-0.vault.azure.net/"}}'}
-    headers:
-      Cache-Control: [no-cache]
-      Content-Type: [application/json; charset=utf-8]
-      Date: ['Thu, 23 Feb 2017 00:18:47 GMT']
-      Expires: ['-1']
-      Pragma: [no-cache]
-      Server: [Microsoft-IIS/8.5]
-      Strict-Transport-Security: [max-age=31536000; includeSubDomains]
-      Transfer-Encoding: [chunked]
-      Vary: [Accept-Encoding]
-      X-AspNet-Version: [4.0.30319]
-      X-Content-Type-Options: [nosniff]
-      X-Powered-By: [ASP.NET]
-      content-length: ['709']
-      x-ms-keyvault-service-version: [1.0.0.151]
-    status: {code: 200, message: OK}
-- request:
-    body: '{"properties": {"tenantId": "9148c3a5-1e1b-4e0a-87c2-302229534991", "sku":
-      {"family": "A", "name": "premium"}, "accessPolicies": [], "vaultUri": "https://cli-keyvault-12345-0.vault.azure.net/",
-      "enabledForDeployment": false}, "location": "westus", "tags": {}}'
-    headers:
-      Accept: [application/json]
-      Accept-Encoding: ['gzip, deflate']
-      Connection: [keep-alive]
-      Content-Length: ['259']
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
-          msrest_azure/0.4.7 keyvaultmanagementclient/0.30.0 Azure-SDK-For-Python
-          AZURECLI/TEST/0.1.2rc1+dev]
-      accept-language: [en-US]
-      x-ms-client-request-id: [a4a1e3fa-f95d-11e6-b866-acde48001122]
-    method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-mgmt/providers/Microsoft.KeyVault/vaults/cli-keyvault-12345-0?api-version=2015-06-01
-  response:
-    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-mgmt/providers/Microsoft.KeyVault/vaults/cli-keyvault-12345-0","name":"cli-keyvault-12345-0","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{},"properties":{"sku":{"family":"A","name":"premium"},"tenantId":"9148c3a5-1e1b-4e0a-87c2-302229534991","accessPolicies":[],"enabledForDeployment":false,"vaultUri":"https://cli-keyvault-12345-0.vault.azure.net/"}}'}
-    headers:
-      Cache-Control: [no-cache]
-      Content-Type: [application/json; charset=utf-8]
-      Date: ['Thu, 23 Feb 2017 00:18:47 GMT']
-      Expires: ['-1']
-      Pragma: [no-cache]
-      Server: [Microsoft-IIS/8.5]
-      Strict-Transport-Security: [max-age=31536000; includeSubDomains]
-      Transfer-Encoding: [chunked]
-      Vary: [Accept-Encoding]
-      X-AspNet-Version: [4.0.30319]
-      X-Content-Type-Options: [nosniff]
-      X-Powered-By: [ASP.NET]
-      content-length: ['467']
-      x-ms-keyvault-service-version: [1.0.0.151]
-      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.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
-          msrest_azure/0.4.7 keyvaultmanagementclient/0.30.0 Azure-SDK-For-Python
-          AZURECLI/TEST/0.1.2rc1+dev]
-      accept-language: [en-US]
-      x-ms-client-request-id: [a59106b0-f95d-11e6-9b19-acde48001122]
-    method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resources?$filter=resourceType%20eq%20%27Microsoft.KeyVault%2Fvaults%27&api-version=2015-11-01
-  response:
-    body: {string: '{"value":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-key_f3u6_/providers/Microsoft.KeyVault/vaults/cli-keyvault-test-key","name":"cli-keyvault-test-key","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{}},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-mgmt/providers/Microsoft.KeyVault/vaults/cli-keyvault-12345-0","name":"cli-keyvault-12345-0","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{}}]}'}
-    headers:
-      Cache-Control: [no-cache]
-      Content-Type: [application/json; charset=utf-8]
-      Date: ['Thu, 23 Feb 2017 00:18:48 GMT']
-      Expires: ['-1']
-      Pragma: [no-cache]
-      Strict-Transport-Security: [max-age=31536000; includeSubDomains]
-      Vary: [Accept-Encoding]
-      content-length: ['526']
-    status: {code: 200, message: OK}
-- request:
-    body: null
-    headers:
-      Accept: [application/json]
-      Accept-Encoding: ['gzip, deflate']
-      Connection: [keep-alive]
-      Content-Length: ['0']
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
-          msrest_azure/0.4.7 keyvaultmanagementclient/0.30.0 Azure-SDK-For-Python
-          AZURECLI/TEST/0.1.2rc1+dev]
-      accept-language: [en-US]
-      x-ms-client-request-id: [a5b6fc30-f95d-11e6-b2a1-acde48001122]
-    method: DELETE
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-mgmt/providers/Microsoft.KeyVault/vaults/cli-keyvault-12345-0?api-version=2015-06-01
-  response:
-    body: {string: ''}
-    headers:
-      Cache-Control: [no-cache]
-      Content-Length: ['0']
-      Date: ['Thu, 23 Feb 2017 00:18:50 GMT']
-      Expires: ['-1']
-      Pragma: [no-cache]
-      Server: [Microsoft-IIS/8.5]
-      Strict-Transport-Security: [max-age=31536000; includeSubDomains]
-      X-AspNet-Version: [4.0.30319]
-      X-Content-Type-Options: [nosniff]
-      X-Powered-By: [ASP.NET]
-      x-ms-keyvault-service-version: [1.0.0.151]
-      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.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
-          msrest_azure/0.4.7 keyvaultmanagementclient/0.30.0 Azure-SDK-For-Python
-          AZURECLI/TEST/0.1.2rc1+dev]
-      accept-language: [en-US]
-      x-ms-client-request-id: [a7339eb0-f95d-11e6-8d67-acde48001122]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-mgmt/providers/Microsoft.KeyVault/vaults?api-version=2015-06-01
   response:
@@ -479,7 +480,7 @@ interactions:
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Thu, 23 Feb 2017 00:18:51 GMT']
+      Date: ['Thu, 09 Mar 2017 23:03:13 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
@@ -487,27 +488,28 @@ interactions:
       content-length: ['12']
     status: {code: 200, message: OK}
 - request:
-    body: '{"properties": {"tenantId": "9148c3a5-1e1b-4e0a-87c2-302229534991", "sku":
+    body: '{"location": "westus", "properties": {"sku": {"name": "standard", "family":
-      {"family": "A", "name": "standard"}, "accessPolicies": []}, "location": "westus"}'
+      "A"}, "tenantId": "54826b22-38d6-4fb2-bad9-b7b93a3e9c5a", "accessPolicies":
+      []}}'
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Length: ['156']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 keyvaultmanagementclient/0.30.0 Azure-SDK-For-Python
-          AZURECLI/TEST/0.1.2rc1+dev]
+          AZURECLI/TEST/2.0.0+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [a7d08482-f95d-11e6-8d4a-acde48001122]
+      x-ms-client-request-id: [93afa942-051c-11e7-8201-a0b3ccf7272a]
     method: PUT
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-mgmt/providers/Microsoft.KeyVault/vaults/cli-keyvault-12345-1?api-version=2015-06-01
   response:
-    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-mgmt/providers/Microsoft.KeyVault/vaults/cli-keyvault-12345-1","name":"cli-keyvault-12345-1","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{},"properties":{"sku":{"family":"A","name":"standard"},"tenantId":"9148c3a5-1e1b-4e0a-87c2-302229534991","accessPolicies":[],"enabledForDeployment":false,"vaultUri":"https://cli-keyvault-12345-1.vault.azure.net"}}'}
+    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-mgmt/providers/Microsoft.KeyVault/vaults/cli-keyvault-12345-1","name":"cli-keyvault-12345-1","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{},"properties":{"sku":{"family":"A","name":"standard"},"tenantId":"54826b22-38d6-4fb2-bad9-b7b93a3e9c5a","accessPolicies":[],"enabledForDeployment":false,"vaultUri":"https://cli-keyvault-12345-1.vault.azure.net"}}'}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Thu, 23 Feb 2017 00:18:54 GMT']
+      Date: ['Thu, 09 Mar 2017 23:03:15 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-IIS/8.5]
@@ -518,7 +520,7 @@ interactions:
       X-Content-Type-Options: [nosniff]
       X-Powered-By: [ASP.NET]
       content-length: ['467']
-      x-ms-keyvault-service-version: [1.0.0.151]
+      x-ms-keyvault-service-version: [1.0.0.153]
       x-ms-ratelimit-remaining-subscription-writes: ['1199']
     status: {code: 200, message: OK}
 - request:
@@ -528,59 +530,61 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 graphrbacmanagementclient/0.30.0rc6 Azure-SDK-For-Python]
       accept-language: [en-US]
-      x-ms-client-request-id: [a9bde480-f95d-11e6-ba7c-acde48001122]
+      x-ms-client-request-id: [949be32c-051c-11e7-8626-a0b3ccf7272a]
     method: GET
-    uri: https://graph.windows.net/00000000-0000-0000-0000-000000000000/me?api-version=1.6
+    uri: https://graph.windows.net/00000000-0000-0000-0000-000000000000/users?$filter=userPrincipalName%20eq%20%27example%40example.com%27&api-version=1.6
   response:
-    body: {string: '{"odata.metadata":"https://graph.windows.net/9148c3a5-1e1b-4e0a-87c2-302229534991/$metadata#directoryObjects/@Element","odata.type":"Microsoft.DirectoryServices.User","objectType":"User","objectId":"882b503c-c281-4fe9-a85c-d9e0cd66d376","deletionTimestamp":null,"accountEnabled":true,"signInNames":[],"assignedLicenses":[],"assignedPlans":[],"city":null,"companyName":null,"country":null,"creationType":null,"department":null,"dirSyncEnabled":null,"displayName":"David
+    body: {string: '{"odata.metadata":"https://graph.windows.net/54826b22-38d6-4fb2-bad9-b7b93a3e9c5a/$metadata#directoryObjects/Microsoft.DirectoryServices.User","value":[{"odata.type":"Microsoft.DirectoryServices.User","objectType":"User","objectId":"5963f50c-7c43-405c-af7e-53294de76abd","deletionTimestamp":null,"accountEnabled":true,"signInNames":[],"assignedLicenses":[],"assignedPlans":[],"city":null,"companyName":null,"country":null,"creationType":null,"department":null,"dirSyncEnabled":null,"displayName":"Admin2","facsimileTelephoneNumber":null,"givenName":"Admin2","immutableId":null,"isCompromised":null,"jobTitle":null,"lastDirSyncTime":null,"mail":null,"mailNickname":"admin2","mobile":null,"onPremisesSecurityIdentifier":null,"otherMails":["destanko@microsoft.com"],"passwordPolicies":"None","passwordProfile":null,"physicalDeliveryOfficeName":null,"postalCode":null,"preferredLanguage":null,"provisionedPlans":[],"provisioningErrors":[],"proxyAddresses":[],"refreshTokensValidFromDateTime":"2017-01-03T20:58:19Z","showInAddressList":null,"sipProxyAddress":null,"state":null,"streetAddress":null,"surname":"Admin2","telephoneNumber":null,"usageLocation":null,"userPrincipalName":"admin2@AzureSDKTeam.onmicrosoft.com","userType":"Member"}]}'}
-        Justice","facsimileTelephoneNumber":null,"givenName":"David","immutableId":null,"isCompromised":null,"jobTitle":null,"lastDirSyncTime":null,"mail":null,"mailNickname":"david_devigned.com#EXT#","mobile":null,"onPremisesSecurityIdentifier":null,"otherMails":["david@devigned.com"],"passwordPolicies":null,"passwordProfile":null,"physicalDeliveryOfficeName":null,"postalCode":null,"preferredLanguage":null,"provisionedPlans":[],"provisioningErrors":[],"proxyAddresses":[],"refreshTokensValidFromDateTime":"2014-05-21T18:21:24Z","showInAddressList":null,"sipProxyAddress":null,"state":null,"streetAddress":null,"surname":"Justice","telephoneNumber":null,"thumbnailPhoto@odata.mediaEditLink":"directoryObjects/882b503c-c281-4fe9-a85c-d9e0cd66d376/Microsoft.DirectoryServices.User/thumbnailPhoto","usageLocation":null,"userPrincipalName":"david_devigned.com#EXT#@daviddevigned.onmicrosoft.com","userType":"Member"}'}
     headers:
       Access-Control-Allow-Origin: ['*']
       Cache-Control: [no-cache]
-      Content-Length: ['1377']
+      Content-Length: ['1236']
       Content-Type: [application/json;odata=minimalmetadata;streaming=true;charset=utf-8]
       DataServiceVersion: [3.0;]
-      Date: ['Thu, 23 Feb 2017 00:18:55 GMT']
+      Date: ['Thu, 09 Mar 2017 23:03:16 GMT']
-      Duration: ['550743']
+      Duration: ['4400273']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-IIS/8.5]
+      Strict-Transport-Security: [max-age=31536000; includeSubDomains]
       X-AspNet-Version: [4.0.30319]
+      X-Content-Type-Options: [nosniff]
       X-Powered-By: [ASP.NET, ASP.NET]
-      ocp-aad-diagnostics-server-name: [lcz6A9FyPn3jZ2b3Po7PhRsDaDaC5MePaYEAO/XnXfw=]
+      ocp-aad-diagnostics-server-name: [9Hup3hradlTbl1hoIuTil/LL0QosWkIK20JWNAo+3Oo=]
-      ocp-aad-session-key: [HzPNuN2J1uDgrQQiJzBsWWk4aS93Dqsy-50PS91C01WlaMg4Fbmhp9eBHb3ybX2jTbMv4PPNp9SCmi7J8qoaHZFVAstZYkgfPTkAzP0jEr5UlqiphJoma4OB6YnUjz1_.1iuWtAoowzuwCBJuv0cxp022EoOZ5zNHpsqa_P1gobY]
+      ocp-aad-session-key: [xBTCvUvQ1mI72WoKAxx9NH_jSVn5IdQj9dwczOu0GSP8aabAYUfGkGTbt2gzWQjHV2eBMNMJmqr9HZfqHtRiDMDYBCWgra-hYm94g4pbCW31YeuPS1uf0zCIeo20aU3k.XoOvh7-tubY1gPUZq0YORq831vAe_wV83B3ZSQv0KII]
-      request-id: [4cadd9b8-08bd-45a9-85d0-795e8e1a91e7]
+      request-id: [134e9a9d-c62c-41dc-b3ad-bad5dd448f81]
       x-ms-dirapi-data-contract-version: ['1.6']
     status: {code: 200, message: OK}
 - request:
-    body: '{"properties": {"enabledForDiskEncryption": true, "enabledForTemplateDeployment":
+    body: '{"location": "westus", "properties": {"sku": {"name": "standard", "family":
-      true, "enabledForDeployment": true, "tenantId": "9148c3a5-1e1b-4e0a-87c2-302229534991",
+      "A"}, "tenantId": "54826b22-38d6-4fb2-bad9-b7b93a3e9c5a", "enabledForDiskEncryption":
-      "sku": {"family": "A", "name": "standard"}, "accessPolicies": [{"permissions":
+      true, "enabledForDeployment": true, "accessPolicies": [{"tenantId": "54826b22-38d6-4fb2-bad9-b7b93a3e9c5a",
-      {"certificates": ["all"], "keys": ["get", "create", "delete", "list", "update",
+      "objectId": "5963f50c-7c43-405c-af7e-53294de76abd", "permissions": {"keys":
-      "import", "backup", "restore"], "secrets": ["all"]}, "tenantId": "9148c3a5-1e1b-4e0a-87c2-302229534991",
+      ["get", "create", "delete", "list", "update", "import", "backup", "restore"],
-      "objectId": "882b503c-c281-4fe9-a85c-d9e0cd66d376"}]}, "location": "westus"}'
+      "secrets": ["all"], "certificates": ["all"]}}], "enabledForTemplateDeployment":
+      true}}'
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Length: ['510']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 keyvaultmanagementclient/0.30.0 Azure-SDK-For-Python
-          AZURECLI/TEST/0.1.2rc1+dev]
+          AZURECLI/TEST/2.0.0+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [a9d8f84a-f95d-11e6-8a69-acde48001122]
+      x-ms-client-request-id: [94f833ec-051c-11e7-99a7-a0b3ccf7272a]
     method: PUT
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-mgmt/providers/Microsoft.KeyVault/vaults/cli-keyvault-12345-2?api-version=2015-06-01
   response:
-    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-mgmt/providers/Microsoft.KeyVault/vaults/cli-keyvault-12345-2","name":"cli-keyvault-12345-2","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{},"properties":{"sku":{"family":"A","name":"standard"},"tenantId":"9148c3a5-1e1b-4e0a-87c2-302229534991","accessPolicies":[{"tenantId":"9148c3a5-1e1b-4e0a-87c2-302229534991","objectId":"882b503c-c281-4fe9-a85c-d9e0cd66d376","permissions":{"certificates":["all"],"keys":["get","create","delete","list","update","import","backup","restore"],"secrets":["all"]}}],"enabledForDeployment":true,"enabledForDiskEncryption":true,"enabledForTemplateDeployment":true,"vaultUri":"https://cli-keyvault-12345-2.vault.azure.net"}}'}
+    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-mgmt/providers/Microsoft.KeyVault/vaults/cli-keyvault-12345-2","name":"cli-keyvault-12345-2","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{},"properties":{"sku":{"family":"A","name":"standard"},"tenantId":"54826b22-38d6-4fb2-bad9-b7b93a3e9c5a","accessPolicies":[{"tenantId":"54826b22-38d6-4fb2-bad9-b7b93a3e9c5a","objectId":"5963f50c-7c43-405c-af7e-53294de76abd","permissions":{"keys":["get","create","delete","list","update","import","backup","restore"],"secrets":["all"],"certificates":["all"]}}],"enabledForDeployment":true,"enabledForDiskEncryption":true,"enabledForTemplateDeployment":true,"vaultUri":"https://cli-keyvault-12345-2.vault.azure.net"}}'}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Thu, 23 Feb 2017 00:18:58 GMT']
+      Date: ['Thu, 09 Mar 2017 23:03:17 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-IIS/8.5]
@@ -591,8 +595,8 @@ interactions:
       X-Content-Type-Options: [nosniff]
       X-Powered-By: [ASP.NET]
       content-length: ['769']
-      x-ms-keyvault-service-version: [1.0.0.151]
+      x-ms-keyvault-service-version: [1.0.0.153]
-      x-ms-ratelimit-remaining-subscription-writes: ['1199']
+      x-ms-ratelimit-remaining-subscription-writes: ['1197']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -601,59 +605,59 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 graphrbacmanagementclient/0.30.0rc6 Azure-SDK-For-Python]
       accept-language: [en-US]
-      x-ms-client-request-id: [ac0fa0a8-f95d-11e6-9fb9-acde48001122]
+      x-ms-client-request-id: [95c327e2-051c-11e7-ae5a-a0b3ccf7272a]
     method: GET
-    uri: https://graph.windows.net/00000000-0000-0000-0000-000000000000/me?api-version=1.6
+    uri: https://graph.windows.net/00000000-0000-0000-0000-000000000000/users?$filter=userPrincipalName%20eq%20%27example%40example.com%27&api-version=1.6
   response:
-    body: {string: '{"odata.metadata":"https://graph.windows.net/9148c3a5-1e1b-4e0a-87c2-302229534991/$metadata#directoryObjects/@Element","odata.type":"Microsoft.DirectoryServices.User","objectType":"User","objectId":"882b503c-c281-4fe9-a85c-d9e0cd66d376","deletionTimestamp":null,"accountEnabled":true,"signInNames":[],"assignedLicenses":[],"assignedPlans":[],"city":null,"companyName":null,"country":null,"creationType":null,"department":null,"dirSyncEnabled":null,"displayName":"David
+    body: {string: '{"odata.metadata":"https://graph.windows.net/54826b22-38d6-4fb2-bad9-b7b93a3e9c5a/$metadata#directoryObjects/Microsoft.DirectoryServices.User","value":[{"odata.type":"Microsoft.DirectoryServices.User","objectType":"User","objectId":"5963f50c-7c43-405c-af7e-53294de76abd","deletionTimestamp":null,"accountEnabled":true,"signInNames":[],"assignedLicenses":[],"assignedPlans":[],"city":null,"companyName":null,"country":null,"creationType":null,"department":null,"dirSyncEnabled":null,"displayName":"Admin2","facsimileTelephoneNumber":null,"givenName":"Admin2","immutableId":null,"isCompromised":null,"jobTitle":null,"lastDirSyncTime":null,"mail":null,"mailNickname":"admin2","mobile":null,"onPremisesSecurityIdentifier":null,"otherMails":["destanko@microsoft.com"],"passwordPolicies":"None","passwordProfile":null,"physicalDeliveryOfficeName":null,"postalCode":null,"preferredLanguage":null,"provisionedPlans":[],"provisioningErrors":[],"proxyAddresses":[],"refreshTokensValidFromDateTime":"2017-01-03T20:58:19Z","showInAddressList":null,"sipProxyAddress":null,"state":null,"streetAddress":null,"surname":"Admin2","telephoneNumber":null,"usageLocation":null,"userPrincipalName":"admin2@AzureSDKTeam.onmicrosoft.com","userType":"Member"}]}'}
-        Justice","facsimileTelephoneNumber":null,"givenName":"David","immutableId":null,"isCompromised":null,"jobTitle":null,"lastDirSyncTime":null,"mail":null,"mailNickname":"david_devigned.com#EXT#","mobile":null,"onPremisesSecurityIdentifier":null,"otherMails":["david@devigned.com"],"passwordPolicies":null,"passwordProfile":null,"physicalDeliveryOfficeName":null,"postalCode":null,"preferredLanguage":null,"provisionedPlans":[],"provisioningErrors":[],"proxyAddresses":[],"refreshTokensValidFromDateTime":"2014-05-21T18:21:24Z","showInAddressList":null,"sipProxyAddress":null,"state":null,"streetAddress":null,"surname":"Justice","telephoneNumber":null,"thumbnailPhoto@odata.mediaEditLink":"directoryObjects/882b503c-c281-4fe9-a85c-d9e0cd66d376/Microsoft.DirectoryServices.User/thumbnailPhoto","usageLocation":null,"userPrincipalName":"david_devigned.com#EXT#@daviddevigned.onmicrosoft.com","userType":"Member"}'}
     headers:
       Access-Control-Allow-Origin: ['*']
       Cache-Control: [no-cache]
-      Content-Length: ['1377']
+      Content-Length: ['1236']
       Content-Type: [application/json;odata=minimalmetadata;streaming=true;charset=utf-8]
       DataServiceVersion: [3.0;]
-      Date: ['Thu, 23 Feb 2017 00:19:00 GMT']
+      Date: ['Thu, 09 Mar 2017 23:03:18 GMT']
-      Duration: ['13280769']
+      Duration: ['742961']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-IIS/8.5]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
       X-AspNet-Version: [4.0.30319]
+      X-Content-Type-Options: [nosniff]
       X-Powered-By: [ASP.NET, ASP.NET]
-      ocp-aad-diagnostics-server-name: [NrbDzJUy9CjYwxxKkWiK6Vnp9LT4b4UpJ7HSwM856vI=]
+      ocp-aad-diagnostics-server-name: [DR19pqY8f0NwIf7uWlwUtWuxMpUjmBOYROdsxaOBGDc=]
-      ocp-aad-session-key: [A5hPpcFpyMdpJZ2bmIw4aNbFVgxPEHKCqUtYHTAyQG54Wl28C-lXt__3z2Cm6ZLHEOagMQyaLhaFdpHqxSWqOeOegkwuBA1LDr1ikvD7SKaOkNoNu1TkPCIjJkEBY_Rp.HjzgBrnqb7qG3NSwOuMIDS6egm81O9paoc6q5f3u9V0]
+      ocp-aad-session-key: [IeYUT2nmxNXEwBwJ3pgrr8P09JybWcOaB5cy7M9elyUuOTuJR_1N843B5rSatqwZ1wTzq_zV3GxSVwHY_kCEBDjHRhn8AixL0K8bPqUDfUVa-oTHLUeTKgbAouV_SHi6.vZ2SEqmTJ-HJwVbcLOJuxUwrW2wS4jT68bVv8fJBl1s]
-      request-id: [d88e9647-3d91-4d96-a5f1-040c8109b20e]
+      request-id: [729d3489-3b37-445c-adcc-58da802a42e8]
       x-ms-dirapi-data-contract-version: ['1.6']
     status: {code: 200, message: OK}
 - request:
-    body: '{"properties": {"tenantId": "9148c3a5-1e1b-4e0a-87c2-302229534991", "sku":
+    body: '{"location": "westus", "properties": {"sku": {"name": "premium", "family":
-      {"family": "A", "name": "premium"}, "accessPolicies": [{"permissions": {"certificates":
+      "A"}, "tenantId": "54826b22-38d6-4fb2-bad9-b7b93a3e9c5a", "accessPolicies":
-      ["all"], "keys": ["get", "create", "delete", "list", "update", "import", "backup",
+      [{"tenantId": "54826b22-38d6-4fb2-bad9-b7b93a3e9c5a", "objectId": "5963f50c-7c43-405c-af7e-53294de76abd",
-      "restore"], "secrets": ["all"]}, "tenantId": "9148c3a5-1e1b-4e0a-87c2-302229534991",
+      "permissions": {"keys": ["get", "create", "delete", "list", "update", "import",
-      "objectId": "882b503c-c281-4fe9-a85c-d9e0cd66d376"}]}, "location": "westus"}'
+      "backup", "restore"], "secrets": ["all"], "certificates": ["all"]}}]}}'
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Length: ['407']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 keyvaultmanagementclient/0.30.0 Azure-SDK-For-Python
-          AZURECLI/TEST/0.1.2rc1+dev]
+          AZURECLI/TEST/2.0.0+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [aced62be-f95d-11e6-b8dc-acde48001122]
+      x-ms-client-request-id: [95e68b9a-051c-11e7-b362-a0b3ccf7272a]
     method: PUT
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-mgmt/providers/Microsoft.KeyVault/vaults/cli-keyvault-12345-3?api-version=2015-06-01
   response:
-    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-mgmt/providers/Microsoft.KeyVault/vaults/cli-keyvault-12345-3","name":"cli-keyvault-12345-3","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{},"properties":{"sku":{"family":"A","name":"premium"},"tenantId":"9148c3a5-1e1b-4e0a-87c2-302229534991","accessPolicies":[{"tenantId":"9148c3a5-1e1b-4e0a-87c2-302229534991","objectId":"882b503c-c281-4fe9-a85c-d9e0cd66d376","permissions":{"certificates":["all"],"keys":["get","create","delete","list","update","import","backup","restore"],"secrets":["all"]}}],"enabledForDeployment":false,"vaultUri":"https://cli-keyvault-12345-3.vault.azure.net"}}'}
+    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-mgmt/providers/Microsoft.KeyVault/vaults/cli-keyvault-12345-3","name":"cli-keyvault-12345-3","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{},"properties":{"sku":{"family":"A","name":"premium"},"tenantId":"54826b22-38d6-4fb2-bad9-b7b93a3e9c5a","accessPolicies":[{"tenantId":"54826b22-38d6-4fb2-bad9-b7b93a3e9c5a","objectId":"5963f50c-7c43-405c-af7e-53294de76abd","permissions":{"keys":["get","create","delete","list","update","import","backup","restore"],"secrets":["all"],"certificates":["all"]}}],"enabledForDeployment":false,"vaultUri":"https://cli-keyvault-12345-3.vault.azure.net"}}'}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Thu, 23 Feb 2017 00:19:01 GMT']
+      Date: ['Thu, 09 Mar 2017 23:03:19 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-IIS/8.5]
@@ -664,7 +668,7 @@ interactions:
       X-Content-Type-Options: [nosniff]
       X-Powered-By: [ASP.NET]
       content-length: ['701']
-      x-ms-keyvault-service-version: [1.0.0.151]
+      x-ms-keyvault-service-version: [1.0.0.153]
-      x-ms-ratelimit-remaining-subscription-writes: ['1199']
+      x-ms-ratelimit-remaining-subscription-writes: ['1197']
     status: {code: 200, message: OK}
 version: 1

src/command_modules/azure-cli-keyvault/tests/recordings/test_keyvault_secret.yaml

@@ -6,59 +6,58 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 graphrbacmanagementclient/0.30.0rc6 Azure-SDK-For-Python]
       accept-language: [en-US]
-      x-ms-client-request-id: [35f1e3f6-f95d-11e6-9959-acde48001122]
+      x-ms-client-request-id: [9837e9d0-051c-11e7-9aaf-a0b3ccf7272a]
     method: GET
-    uri: https://graph.windows.net/00000000-0000-0000-0000-000000000000/me?api-version=1.6
+    uri: https://graph.windows.net/00000000-0000-0000-0000-000000000000/users?$filter=userPrincipalName%20eq%20%27example%40example.com%27&api-version=1.6
   response:
-    body: {string: '{"odata.metadata":"https://graph.windows.net/9148c3a5-1e1b-4e0a-87c2-302229534991/$metadata#directoryObjects/Microsoft.DirectoryServices.User/@Element","odata.type":"Microsoft.DirectoryServices.User","objectType":"User","objectId":"882b503c-c281-4fe9-a85c-d9e0cd66d376","deletionTimestamp":null,"accountEnabled":true,"signInNames":[],"assignedLicenses":[],"assignedPlans":[],"city":null,"companyName":null,"country":null,"creationType":null,"department":null,"dirSyncEnabled":null,"displayName":"David
+    body: {string: '{"odata.metadata":"https://graph.windows.net/54826b22-38d6-4fb2-bad9-b7b93a3e9c5a/$metadata#directoryObjects","value":[{"odata.type":"Microsoft.DirectoryServices.User","objectType":"User","objectId":"5963f50c-7c43-405c-af7e-53294de76abd","deletionTimestamp":null,"accountEnabled":true,"signInNames":[],"assignedLicenses":[],"assignedPlans":[],"city":null,"companyName":null,"country":null,"creationType":null,"department":null,"dirSyncEnabled":null,"displayName":"Admin2","facsimileTelephoneNumber":null,"givenName":"Admin2","immutableId":null,"isCompromised":null,"jobTitle":null,"lastDirSyncTime":null,"mail":null,"mailNickname":"admin2","mobile":null,"onPremisesSecurityIdentifier":null,"otherMails":["destanko@microsoft.com"],"passwordPolicies":"None","passwordProfile":null,"physicalDeliveryOfficeName":null,"postalCode":null,"preferredLanguage":null,"provisionedPlans":[],"provisioningErrors":[],"proxyAddresses":[],"refreshTokensValidFromDateTime":"2017-01-03T20:58:19Z","showInAddressList":null,"sipProxyAddress":null,"state":null,"streetAddress":null,"surname":"Admin2","telephoneNumber":null,"thumbnailPhoto@odata.mediaEditLink":"directoryObjects/5963f50c-7c43-405c-af7e-53294de76abd/Microsoft.DirectoryServices.User/thumbnailPhoto","usageLocation":null,"userPrincipalName":"admin2@AzureSDKTeam.onmicrosoft.com","userType":"Member"}]}'}
-        Justice","facsimileTelephoneNumber":null,"givenName":"David","immutableId":null,"isCompromised":null,"jobTitle":null,"lastDirSyncTime":null,"mail":null,"mailNickname":"david_devigned.com#EXT#","mobile":null,"onPremisesSecurityIdentifier":null,"otherMails":["david@devigned.com"],"passwordPolicies":null,"passwordProfile":null,"physicalDeliveryOfficeName":null,"postalCode":null,"preferredLanguage":null,"provisionedPlans":[],"provisioningErrors":[],"proxyAddresses":[],"refreshTokensValidFromDateTime":"2014-05-21T18:21:24Z","showInAddressList":null,"sipProxyAddress":null,"state":null,"streetAddress":null,"surname":"Justice","telephoneNumber":null,"usageLocation":null,"userPrincipalName":"david_devigned.com#EXT#@daviddevigned.onmicrosoft.com","userType":"Member"}'}
     headers:
       Access-Control-Allow-Origin: ['*']
       Cache-Control: [no-cache]
-      Content-Length: ['1269']
+      Content-Length: ['1344']
       Content-Type: [application/json;odata=minimalmetadata;streaming=true;charset=utf-8]
       DataServiceVersion: [3.0;]
-      Date: ['Thu, 23 Feb 2017 00:15:41 GMT']
+      Date: ['Thu, 09 Mar 2017 23:03:22 GMT']
-      Duration: ['763790']
+      Duration: ['783651']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-IIS/8.5]
+      Strict-Transport-Security: [max-age=31536000; includeSubDomains]
       X-AspNet-Version: [4.0.30319]
-      X-Content-Type-Options: [nosniff]
       X-Powered-By: [ASP.NET, ASP.NET]
-      ocp-aad-diagnostics-server-name: [PaJePVTroOTPJc6jKFg0Tmd8/p4hSkQ9d/J3RIPbrks=]
+      ocp-aad-diagnostics-server-name: [IdgG7lnYmOU4bPZc1rl4En8HkGAFbFac5GSZUaXAPBU=]
-      ocp-aad-session-key: [aGbsK3pywJlG4zm16DXHUNWfl42jk7tEhB8SHvRm7Vl_VG-RQsv5AITep7X5GBqQG2XkUgXO0DGEfnTYF3zUKi_xMi3vHRay6F8GaH--34V5qD5grkKw8hzPZuInu-jE.sWRhA_yvdCWBxsUSGlpgBnM7LPPez_aKf96zPR1WODo]
+      ocp-aad-session-key: [QKUCth5QnUZyLCbh3HR8JarWTC0-mERBEtsUB-8DnXycaGWHI7NPD5PD2yFFTQNx2gv_BuuyjDT03PHJZoONUTPoeOBW2xCgXYlBSOWBmHvKuIo62pCCF7sDnPSk5Igt.xkPueBdZ8oC7r1PGnggUNmui36O9hjARb8jFPA3Zn8g]
-      request-id: [d1d83171-fa1f-460e-8577-10e983fd0c15]
+      request-id: [232dbc86-2ddd-4efc-a3e6-dd204f386092]
       x-ms-dirapi-data-contract-version: ['1.6']
     status: {code: 200, message: OK}
 - request:
-    body: '{"properties": {"tenantId": "9148c3a5-1e1b-4e0a-87c2-302229534991", "accessPolicies":
+    body: '{"location": "westus", "properties": {"sku": {"name": "premium", "family":
-      [{"tenantId": "9148c3a5-1e1b-4e0a-87c2-302229534991", "objectId": "882b503c-c281-4fe9-a85c-d9e0cd66d376",
+      "A"}, "tenantId": "54826b22-38d6-4fb2-bad9-b7b93a3e9c5a", "accessPolicies":
-      "permissions": {"secrets": ["all"], "keys": ["get", "create", "delete", "list",
+      [{"tenantId": "54826b22-38d6-4fb2-bad9-b7b93a3e9c5a", "objectId": "5963f50c-7c43-405c-af7e-53294de76abd",
-      "update", "import", "backup", "restore"], "certificates": ["all"]}}], "sku":
+      "permissions": {"keys": ["get", "create", "delete", "list", "update", "import",
-      {"family": "A", "name": "premium"}}, "location": "westus"}'
+      "backup", "restore"], "secrets": ["all"], "certificates": ["all"]}}]}}'
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Length: ['407']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 keyvaultmanagementclient/0.30.0 Azure-SDK-For-Python
-          AZURECLI/TEST/0.1.2rc1+dev]
+          AZURECLI/TEST/2.0.0+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [36374cca-f95d-11e6-b239-acde48001122]
+      x-ms-client-request-id: [985c5128-051c-11e7-9ab8-a0b3ccf7272a]
     method: PUT
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-secret/providers/Microsoft.KeyVault/vaults/cli-test-keyvault-secret?api-version=2015-06-01
   response:
-    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-secret/providers/Microsoft.KeyVault/vaults/cli-test-keyvault-secret","name":"cli-test-keyvault-secret","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{},"properties":{"sku":{"family":"A","name":"premium"},"tenantId":"9148c3a5-1e1b-4e0a-87c2-302229534991","accessPolicies":[{"tenantId":"9148c3a5-1e1b-4e0a-87c2-302229534991","objectId":"882b503c-c281-4fe9-a85c-d9e0cd66d376","permissions":{"secrets":["all"],"keys":["get","create","delete","list","update","import","backup","restore"],"certificates":["all"]}}],"enabledForDeployment":false,"vaultUri":"https://cli-test-keyvault-secret.vault.azure.net"}}'}
+    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-test-keyvault-secret/providers/Microsoft.KeyVault/vaults/cli-test-keyvault-secret","name":"cli-test-keyvault-secret","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{},"properties":{"sku":{"family":"A","name":"premium"},"tenantId":"54826b22-38d6-4fb2-bad9-b7b93a3e9c5a","accessPolicies":[{"tenantId":"54826b22-38d6-4fb2-bad9-b7b93a3e9c5a","objectId":"5963f50c-7c43-405c-af7e-53294de76abd","permissions":{"keys":["get","create","delete","list","update","import","backup","restore"],"secrets":["all"],"certificates":["all"]}}],"enabledForDeployment":false,"vaultUri":"https://cli-test-keyvault-secret.vault.azure.net"}}'}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Thu, 23 Feb 2017 00:15:43 GMT']
+      Date: ['Thu, 09 Mar 2017 23:03:22 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-IIS/8.5]
@@ -69,8 +68,8 @@ interactions:
       X-Content-Type-Options: [nosniff]
       X-Powered-By: [ASP.NET]
       content-length: ['715']
-      x-ms-keyvault-service-version: [1.0.0.151]
+      x-ms-keyvault-service-version: [1.0.0.153]
-      x-ms-ratelimit-remaining-subscription-writes: ['1199']
+      x-ms-ratelimit-remaining-subscription-writes: ['1197']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -79,10 +78,10 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 keyvaultclient/0.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
-      x-ms-client-request-id: [37dec9d8-f95d-11e6-a1f9-acde48001122]
+      x-ms-client-request-id: [99339412-051c-11e7-82b6-a0b3ccf7272a]
     method: GET
     uri: https://cli-test-keyvault-secret.vault.azure.net/keys?api-version=2016-10-01
   response:
@@ -90,18 +89,18 @@ interactions:
     headers:
       Cache-Control: [no-cache]
       Content-Length: ['0']
-      Date: ['Thu, 23 Feb 2017 00:15:50 GMT']
+      Date: ['Thu, 09 Mar 2017 23:03:27 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-IIS/8.5]
       Strict-Transport-Security: [max-age=31536000;includeSubDomains]
-      WWW-Authenticate: ['Bearer authorization="https://login.windows.net/9148c3a5-1e1b-4e0a-87c2-302229534991",
+      WWW-Authenticate: ['Bearer authorization="https://login.windows.net/54826b22-38d6-4fb2-bad9-b7b93a3e9c5a",
           resource="https://vault.azure.net"']
       X-AspNet-Version: [4.0.30319]
       X-Content-Type-Options: [nosniff]
       X-Powered-By: [ASP.NET]
       x-ms-keyvault-region: [westus]
-      x-ms-keyvault-service-version: [1.0.0.800]
+      x-ms-keyvault-service-version: [1.0.0.802]
     status: {code: 401, message: Unauthorized}
 - request:
     body: null
@@ -110,10 +109,10 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 keyvaultclient/0.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
-      x-ms-client-request-id: [37dec9d8-f95d-11e6-a1f9-acde48001122]
+      x-ms-client-request-id: [99339412-051c-11e7-82b6-a0b3ccf7272a]
     method: GET
     uri: https://cli-test-keyvault-secret.vault.azure.net/keys?api-version=2016-10-01
   response:
@@ -122,7 +121,7 @@ interactions:
       Cache-Control: [no-cache]
       Content-Length: ['30']
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Thu, 23 Feb 2017 00:15:47 GMT']
+      Date: ['Thu, 09 Mar 2017 23:03:27 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-IIS/8.5]
@@ -131,30 +130,30 @@ interactions:
       X-Content-Type-Options: [nosniff]
       X-Powered-By: [ASP.NET]
       x-ms-keyvault-region: [westus]
-      x-ms-keyvault-service-version: [1.0.0.800]
+      x-ms-keyvault-service-version: [1.0.0.802]
     status: {code: 200, message: OK}
 - request:
-    body: '{"attributes": {"enabled": true}, "value": "ABC123", "tags": {"file-encoding":
+    body: '{"tags": {"file-encoding": "utf-8"}, "attributes": {"enabled": true}, "value":
-      "utf-8"}}'
+      "ABC123"}'
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Length: ['88']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 keyvaultclient/0.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
-      x-ms-client-request-id: [3bac77d4-f95d-11e6-ac8b-acde48001122]
+      x-ms-client-request-id: [9be9dc08-051c-11e7-b9f1-a0b3ccf7272a]
     method: PUT
     uri: https://cli-test-keyvault-secret.vault.azure.net/secrets/secret1?api-version=2016-10-01
   response:
-    body: {string: '{"value":"ABC123","id":"https://cli-test-keyvault-secret.vault.azure.net/secrets/secret1/f21863c4dd1e46599718e253a1468f5e","attributes":{"enabled":true,"created":1487808950,"updated":1487808950},"tags":{"file-encoding":"utf-8"}}'}
+    body: {string: '{"value":"ABC123","id":"https://cli-test-keyvault-secret.vault.azure.net/secrets/secret1/afb7946260ad483b91b5a75286b77323","attributes":{"enabled":true,"created":1489100608,"updated":1489100608},"tags":{"file-encoding":"utf-8"}}'}
     headers:
       Cache-Control: [no-cache]
       Content-Length: ['228']
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Thu, 23 Feb 2017 00:15:50 GMT']
+      Date: ['Thu, 09 Mar 2017 23:03:27 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-IIS/8.5]
@@ -163,7 +162,7 @@ interactions:
       X-Content-Type-Options: [nosniff]
       X-Powered-By: [ASP.NET]
       x-ms-keyvault-region: [westus]
-      x-ms-keyvault-service-version: [1.0.0.800]
+      x-ms-keyvault-service-version: [1.0.0.802]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -172,19 +171,19 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 keyvaultclient/0.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
-      x-ms-client-request-id: [3c4123ca-f95d-11e6-bad3-acde48001122]
+      x-ms-client-request-id: [9c6b2894-051c-11e7-a8df-a0b3ccf7272a]
     method: GET
     uri: https://cli-test-keyvault-secret.vault.azure.net/secrets?api-version=2016-10-01
   response:
-    body: {string: '{"value":[{"id":"https://cli-test-keyvault-secret.vault.azure.net/secrets/secret1","attributes":{"enabled":true,"created":1487808950,"updated":1487808950},"tags":{"file-encoding":"utf-8"}}],"nextLink":null}'}
+    body: {string: '{"value":[{"id":"https://cli-test-keyvault-secret.vault.azure.net/secrets/secret1","attributes":{"enabled":true,"created":1489100608,"updated":1489100608},"tags":{"file-encoding":"utf-8"}}],"nextLink":null}'}
     headers:
       Cache-Control: [no-cache]
       Content-Length: ['206']
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Thu, 23 Feb 2017 00:15:53 GMT']
+      Date: ['Thu, 09 Mar 2017 23:03:27 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-IIS/8.5]
@@ -193,30 +192,30 @@ interactions:
       X-Content-Type-Options: [nosniff]
       X-Powered-By: [ASP.NET]
       x-ms-keyvault-region: [westus]
-      x-ms-keyvault-service-version: [1.0.0.800]
+      x-ms-keyvault-service-version: [1.0.0.802]
     status: {code: 200, message: OK}
 - request:
-    body: '{"attributes": {"enabled": true}, "value": "DEF456", "tags": {"file-encoding":
+    body: '{"tags": {"test": "foo", "file-encoding": "utf-8"}, "value": "DEF456",
-      "utf-8", "test": "foo"}, "contentType": "test type"}'
+      "attributes": {"enabled": true}, "contentType": "test type"}'
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Length: ['131']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 keyvaultclient/0.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
-      x-ms-client-request-id: [3ce24cdc-f95d-11e6-a64e-acde48001122]
+      x-ms-client-request-id: [9cd7923a-051c-11e7-b67e-a0b3ccf7272a]
     method: PUT
     uri: https://cli-test-keyvault-secret.vault.azure.net/secrets/secret1?api-version=2016-10-01
   response:
-    body: {string: '{"value":"DEF456","contentType":"test type","id":"https://cli-test-keyvault-secret.vault.azure.net/secrets/secret1/d8695e6c12c84bbca85cd582cc980f45","attributes":{"enabled":true,"created":1487808951,"updated":1487808951},"tags":{"file-encoding":"utf-8","test":"foo"}}'}
+    body: {string: '{"value":"DEF456","contentType":"test type","id":"https://cli-test-keyvault-secret.vault.azure.net/secrets/secret1/3f5101c4e8d64cec9e66123cd2a61a34","attributes":{"enabled":true,"created":1489100610,"updated":1489100610},"tags":{"test":"foo","file-encoding":"utf-8"}}'}
     headers:
       Cache-Control: [no-cache]
       Content-Length: ['267']
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Thu, 23 Feb 2017 00:15:51 GMT']
+      Date: ['Thu, 09 Mar 2017 23:03:30 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-IIS/8.5]
@@ -225,7 +224,7 @@ interactions:
       X-Content-Type-Options: [nosniff]
       X-Powered-By: [ASP.NET]
       x-ms-keyvault-region: [westus]
-      x-ms-keyvault-service-version: [1.0.0.800]
+      x-ms-keyvault-service-version: [1.0.0.802]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -234,19 +233,19 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 keyvaultclient/0.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
-      x-ms-client-request-id: [3d8fa99a-f95d-11e6-91c3-acde48001122]
+      x-ms-client-request-id: [9d55b880-051c-11e7-89b7-a0b3ccf7272a]
     method: GET
     uri: https://cli-test-keyvault-secret.vault.azure.net/secrets/secret1/versions?api-version=2016-10-01
   response:
-    body: {string: '{"value":[{"contentType":"test type","id":"https://cli-test-keyvault-secret.vault.azure.net/secrets/secret1/d8695e6c12c84bbca85cd582cc980f45","attributes":{"enabled":true,"created":1487808951,"updated":1487808951},"tags":{"file-encoding":"utf-8","test":"foo"}},{"id":"https://cli-test-keyvault-secret.vault.azure.net/secrets/secret1/f21863c4dd1e46599718e253a1468f5e","attributes":{"enabled":true,"created":1487808950,"updated":1487808950},"tags":{"file-encoding":"utf-8"}}],"nextLink":null}'}
+    body: {string: '{"value":[{"contentType":"test type","id":"https://cli-test-keyvault-secret.vault.azure.net/secrets/secret1/3f5101c4e8d64cec9e66123cd2a61a34","attributes":{"enabled":true,"created":1489100610,"updated":1489100610},"tags":{"test":"foo","file-encoding":"utf-8"}},{"id":"https://cli-test-keyvault-secret.vault.azure.net/secrets/secret1/afb7946260ad483b91b5a75286b77323","attributes":{"enabled":true,"created":1489100608,"updated":1489100608},"tags":{"file-encoding":"utf-8"}}],"nextLink":null}'}
     headers:
       Cache-Control: [no-cache]
       Content-Length: ['490']
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Thu, 23 Feb 2017 00:15:55 GMT']
+      Date: ['Thu, 09 Mar 2017 23:03:30 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-IIS/8.5]
@@ -255,7 +254,7 @@ interactions:
       X-Content-Type-Options: [nosniff]
       X-Powered-By: [ASP.NET]
       x-ms-keyvault-region: [westus]
-      x-ms-keyvault-service-version: [1.0.0.800]
+      x-ms-keyvault-service-version: [1.0.0.802]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -264,19 +263,19 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 keyvaultclient/0.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
-      x-ms-client-request-id: [3e7a55be-f95d-11e6-9505-acde48001122]
+      x-ms-client-request-id: [9dcd7f6c-051c-11e7-be97-a0b3ccf7272a]
     method: GET
     uri: https://cli-test-keyvault-secret.vault.azure.net/secrets/secret1/?api-version=2016-10-01
   response:
-    body: {string: '{"value":"DEF456","contentType":"test type","id":"https://cli-test-keyvault-secret.vault.azure.net/secrets/secret1/d8695e6c12c84bbca85cd582cc980f45","attributes":{"enabled":true,"created":1487808951,"updated":1487808951},"tags":{"file-encoding":"utf-8","test":"foo"}}'}
+    body: {string: '{"value":"DEF456","contentType":"test type","id":"https://cli-test-keyvault-secret.vault.azure.net/secrets/secret1/3f5101c4e8d64cec9e66123cd2a61a34","attributes":{"enabled":true,"created":1489100610,"updated":1489100610},"tags":{"test":"foo","file-encoding":"utf-8"}}'}
     headers:
       Cache-Control: [no-cache]
       Content-Length: ['267']
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Thu, 23 Feb 2017 00:15:54 GMT']
+      Date: ['Thu, 09 Mar 2017 23:03:33 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-IIS/8.5]
@@ -285,7 +284,7 @@ interactions:
       X-Content-Type-Options: [nosniff]
       X-Powered-By: [ASP.NET]
       x-ms-keyvault-region: [westus]
-      x-ms-keyvault-service-version: [1.0.0.800]
+      x-ms-keyvault-service-version: [1.0.0.802]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -294,19 +293,19 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 keyvaultclient/0.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
-      x-ms-client-request-id: [3f01f080-f95d-11e6-8998-acde48001122]
+      x-ms-client-request-id: [9e45f8de-051c-11e7-a8bc-a0b3ccf7272a]
     method: GET
-    uri: https://cli-test-keyvault-secret.vault.azure.net/secrets/secret1/f21863c4dd1e46599718e253a1468f5e?api-version=2016-10-01
+    uri: https://cli-test-keyvault-secret.vault.azure.net/secrets/secret1/afb7946260ad483b91b5a75286b77323?api-version=2016-10-01
   response:
-    body: {string: '{"value":"ABC123","id":"https://cli-test-keyvault-secret.vault.azure.net/secrets/secret1/f21863c4dd1e46599718e253a1468f5e","attributes":{"enabled":true,"created":1487808950,"updated":1487808950},"tags":{"file-encoding":"utf-8"}}'}
+    body: {string: '{"value":"ABC123","id":"https://cli-test-keyvault-secret.vault.azure.net/secrets/secret1/afb7946260ad483b91b5a75286b77323","attributes":{"enabled":true,"created":1489100608,"updated":1489100608},"tags":{"file-encoding":"utf-8"}}'}
     headers:
       Cache-Control: [no-cache]
       Content-Length: ['228']
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Thu, 23 Feb 2017 00:15:57 GMT']
+      Date: ['Thu, 09 Mar 2017 23:03:31 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-IIS/8.5]
@@ -315,7 +314,7 @@ interactions:
       X-Content-Type-Options: [nosniff]
       X-Powered-By: [ASP.NET]
       x-ms-keyvault-region: [westus]
-      x-ms-keyvault-service-version: [1.0.0.800]
+      x-ms-keyvault-service-version: [1.0.0.802]
     status: {code: 200, message: OK}
 - request:
     body: '{"attributes": {"enabled": false}}'
@@ -325,19 +324,19 @@ interactions:
       Connection: [keep-alive]
       Content-Length: ['34']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 keyvaultclient/0.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
-      x-ms-client-request-id: [3f9db2ae-f95d-11e6-a4f6-acde48001122]
+      x-ms-client-request-id: [9eaffa10-051c-11e7-9398-a0b3ccf7272a]
     method: PATCH
     uri: https://cli-test-keyvault-secret.vault.azure.net/secrets/secret1/?api-version=2016-10-01
   response:
-    body: {string: '{"contentType":"test type","id":"https://cli-test-keyvault-secret.vault.azure.net/secrets/secret1/d8695e6c12c84bbca85cd582cc980f45","attributes":{"enabled":false,"created":1487808951,"updated":1487808957},"tags":{"file-encoding":"utf-8","test":"foo"}}'}
+    body: {string: '{"contentType":"test type","id":"https://cli-test-keyvault-secret.vault.azure.net/secrets/secret1/3f5101c4e8d64cec9e66123cd2a61a34","attributes":{"enabled":false,"created":1489100610,"updated":1489100614},"tags":{"test":"foo","file-encoding":"utf-8"}}'}
     headers:
       Cache-Control: [no-cache]
       Content-Length: ['251']
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Thu, 23 Feb 2017 00:15:56 GMT']
+      Date: ['Thu, 09 Mar 2017 23:03:33 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-IIS/8.5]
@@ -346,7 +345,7 @@ interactions:
       X-Content-Type-Options: [nosniff]
       X-Powered-By: [ASP.NET]
       x-ms-keyvault-region: [westus]
-      x-ms-keyvault-service-version: [1.0.0.800]
+      x-ms-keyvault-service-version: [1.0.0.802]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -356,19 +355,19 @@ interactions:
       Connection: [keep-alive]
       Content-Length: ['0']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 keyvaultclient/0.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
-      x-ms-client-request-id: [4040135a-f95d-11e6-944e-acde48001122]
+      x-ms-client-request-id: [9fcaf2e4-051c-11e7-9db2-a0b3ccf7272a]
     method: DELETE
     uri: https://cli-test-keyvault-secret.vault.azure.net/secrets/secret1?api-version=2016-10-01
   response:
-    body: {string: '{"contentType":"test type","id":"https://cli-test-keyvault-secret.vault.azure.net/secrets/secret1/d8695e6c12c84bbca85cd582cc980f45","attributes":{"enabled":false,"created":1487808951,"updated":1487808957},"tags":{"file-encoding":"utf-8","test":"foo"}}'}
+    body: {string: '{"contentType":"test type","id":"https://cli-test-keyvault-secret.vault.azure.net/secrets/secret1/3f5101c4e8d64cec9e66123cd2a61a34","attributes":{"enabled":false,"created":1489100610,"updated":1489100614},"tags":{"test":"foo","file-encoding":"utf-8"}}'}
     headers:
       Cache-Control: [no-cache]
       Content-Length: ['251']
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Thu, 23 Feb 2017 00:16:00 GMT']
+      Date: ['Thu, 09 Mar 2017 23:03:34 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-IIS/8.5]
@@ -377,7 +376,7 @@ interactions:
       X-Content-Type-Options: [nosniff]
       X-Powered-By: [ASP.NET]
       x-ms-keyvault-region: [westus]
-      x-ms-keyvault-service-version: [1.0.0.800]
+      x-ms-keyvault-service-version: [1.0.0.802]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -386,10 +385,10 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 keyvaultclient/0.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
-      x-ms-client-request-id: [40cb340a-f95d-11e6-8045-acde48001122]
+      x-ms-client-request-id: [a0493366-051c-11e7-aed0-a0b3ccf7272a]
     method: GET
     uri: https://cli-test-keyvault-secret.vault.azure.net/secrets?api-version=2016-10-01
   response:
@@ -398,7 +397,7 @@ interactions:
       Cache-Control: [no-cache]
       Content-Length: ['28']
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Thu, 23 Feb 2017 00:16:03 GMT']
+      Date: ['Thu, 09 Mar 2017 23:03:34 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-IIS/8.5]
@@ -407,30 +406,30 @@ interactions:
       X-Content-Type-Options: [nosniff]
       X-Powered-By: [ASP.NET]
       x-ms-keyvault-region: [westus]
-      x-ms-keyvault-service-version: [1.0.0.800]
+      x-ms-keyvault-service-version: [1.0.0.802]
     status: {code: 200, message: OK}
 - request:
-    body: '{"attributes": {"enabled": true}, "value": "TestSecretTestSecretTestSecretTestSecret\n",
+    body: '{"tags": {"file-encoding": "utf-8"}, "attributes": {"enabled": true}, "value":
-      "tags": {"file-encoding": "utf-8"}}'
+      "TestSecretTestSecretTestSecretTestSecret\n"}'
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Length: ['124']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 keyvaultclient/0.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
-      x-ms-client-request-id: [439d7292-f95d-11e6-b9be-acde48001122]
+      x-ms-client-request-id: [a0b21e22-051c-11e7-9438-a0b3ccf7272a]
     method: PUT
     uri: https://cli-test-keyvault-secret.vault.azure.net/secrets/download-utf-8?api-version=2016-10-01
   response:
-    body: {string: '{"value":"TestSecretTestSecretTestSecretTestSecret\n","id":"https://cli-test-keyvault-secret.vault.azure.net/secrets/download-utf-8/9a6f71edf16748f49fa634237e87261e","attributes":{"enabled":true,"created":1487808967,"updated":1487808967},"tags":{"file-encoding":"utf-8"}}'}
+    body: {string: '{"value":"TestSecretTestSecretTestSecretTestSecret\n","id":"https://cli-test-keyvault-secret.vault.azure.net/secrets/download-utf-8/0adf935c4e874872a546ea46356c6be3","attributes":{"enabled":true,"created":1489100615,"updated":1489100615},"tags":{"file-encoding":"utf-8"}}'}
     headers:
       Cache-Control: [no-cache]
       Content-Length: ['271']
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Thu, 23 Feb 2017 00:16:07 GMT']
+      Date: ['Thu, 09 Mar 2017 23:03:35 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-IIS/8.5]
@@ -439,7 +438,7 @@ interactions:
       X-Content-Type-Options: [nosniff]
       X-Powered-By: [ASP.NET]
       x-ms-keyvault-region: [westus]
-      x-ms-keyvault-service-version: [1.0.0.800]
+      x-ms-keyvault-service-version: [1.0.0.802]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -448,19 +447,19 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 keyvaultclient/0.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
-      x-ms-client-request-id: [44478b4a-f95d-11e6-99b6-acde48001122]
+      x-ms-client-request-id: [a14227b6-051c-11e7-b219-a0b3ccf7272a]
     method: GET
     uri: https://cli-test-keyvault-secret.vault.azure.net/secrets/download-utf-8/?api-version=2016-10-01
   response:
-    body: {string: '{"value":"TestSecretTestSecretTestSecretTestSecret\n","id":"https://cli-test-keyvault-secret.vault.azure.net/secrets/download-utf-8/9a6f71edf16748f49fa634237e87261e","attributes":{"enabled":true,"created":1487808967,"updated":1487808967},"tags":{"file-encoding":"utf-8"}}'}
+    body: {string: '{"value":"TestSecretTestSecretTestSecretTestSecret\n","id":"https://cli-test-keyvault-secret.vault.azure.net/secrets/download-utf-8/0adf935c4e874872a546ea46356c6be3","attributes":{"enabled":true,"created":1489100615,"updated":1489100615},"tags":{"file-encoding":"utf-8"}}'}
     headers:
       Cache-Control: [no-cache]
       Content-Length: ['271']
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Thu, 23 Feb 2017 00:16:05 GMT']
+      Date: ['Thu, 09 Mar 2017 23:03:36 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-IIS/8.5]
@@ -469,30 +468,30 @@ interactions:
       X-Content-Type-Options: [nosniff]
       X-Powered-By: [ASP.NET]
       x-ms-keyvault-region: [westus]
-      x-ms-keyvault-service-version: [1.0.0.800]
+      x-ms-keyvault-service-version: [1.0.0.802]
     status: {code: 200, message: OK}
 - request:
-    body: '{"attributes": {"enabled": true}, "value": "TestSecretTestSecretTestSecretTestSecret\n",
+    body: '{"tags": {"file-encoding": "utf-16le"}, "attributes": {"enabled": true},
-      "tags": {"file-encoding": "utf-16le"}}'
+      "value": "TestSecretTestSecretTestSecretTestSecret\n"}'
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Length: ['127']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 keyvaultclient/0.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
-      x-ms-client-request-id: [44e254b8-f95d-11e6-a3a8-acde48001122]
+      x-ms-client-request-id: [a1b68af8-051c-11e7-91fe-a0b3ccf7272a]
     method: PUT
     uri: https://cli-test-keyvault-secret.vault.azure.net/secrets/download-utf-16le?api-version=2016-10-01
   response:
-    body: {string: '{"value":"TestSecretTestSecretTestSecretTestSecret\n","id":"https://cli-test-keyvault-secret.vault.azure.net/secrets/download-utf-16le/db3a0b11b15d411e81bfcf19ba95e1cf","attributes":{"enabled":true,"created":1487808968,"updated":1487808968},"tags":{"file-encoding":"utf-16le"}}'}
+    body: {string: '{"value":"TestSecretTestSecretTestSecretTestSecret\n","id":"https://cli-test-keyvault-secret.vault.azure.net/secrets/download-utf-16le/d1b8bbc193704b1c96aa378da8f58015","attributes":{"enabled":true,"created":1489100617,"updated":1489100617},"tags":{"file-encoding":"utf-16le"}}'}
     headers:
       Cache-Control: [no-cache]
       Content-Length: ['277']
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Thu, 23 Feb 2017 00:16:08 GMT']
+      Date: ['Thu, 09 Mar 2017 23:03:36 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-IIS/8.5]
@@ -501,7 +500,7 @@ interactions:
       X-Content-Type-Options: [nosniff]
       X-Powered-By: [ASP.NET]
       x-ms-keyvault-region: [westus]
-      x-ms-keyvault-service-version: [1.0.0.800]
+      x-ms-keyvault-service-version: [1.0.0.802]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -510,19 +509,19 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 keyvaultclient/0.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
-      x-ms-client-request-id: [456e170a-f95d-11e6-9c44-acde48001122]
+      x-ms-client-request-id: [a231bdd4-051c-11e7-b7ab-a0b3ccf7272a]
     method: GET
     uri: https://cli-test-keyvault-secret.vault.azure.net/secrets/download-utf-16le/?api-version=2016-10-01
   response:
-    body: {string: '{"value":"TestSecretTestSecretTestSecretTestSecret\n","id":"https://cli-test-keyvault-secret.vault.azure.net/secrets/download-utf-16le/db3a0b11b15d411e81bfcf19ba95e1cf","attributes":{"enabled":true,"created":1487808968,"updated":1487808968},"tags":{"file-encoding":"utf-16le"}}'}
+    body: {string: '{"value":"TestSecretTestSecretTestSecretTestSecret\n","id":"https://cli-test-keyvault-secret.vault.azure.net/secrets/download-utf-16le/d1b8bbc193704b1c96aa378da8f58015","attributes":{"enabled":true,"created":1489100617,"updated":1489100617},"tags":{"file-encoding":"utf-16le"}}'}
     headers:
       Cache-Control: [no-cache]
       Content-Length: ['277']
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Thu, 23 Feb 2017 00:16:08 GMT']
+      Date: ['Thu, 09 Mar 2017 23:03:40 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-IIS/8.5]
@@ -531,30 +530,30 @@ interactions:
       X-Content-Type-Options: [nosniff]
       X-Powered-By: [ASP.NET]
       x-ms-keyvault-region: [westus]
-      x-ms-keyvault-service-version: [1.0.0.800]
+      x-ms-keyvault-service-version: [1.0.0.802]
     status: {code: 200, message: OK}
 - request:
-    body: '{"attributes": {"enabled": true}, "value": "TestSecretTestSecretTestSecretTestSecret\n",
+    body: '{"tags": {"file-encoding": "utf-16be"}, "attributes": {"enabled": true},
-      "tags": {"file-encoding": "utf-16be"}}'
+      "value": "TestSecretTestSecretTestSecretTestSecret\n"}'
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Length: ['127']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 keyvaultclient/0.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
-      x-ms-client-request-id: [460ee5fe-f95d-11e6-9772-acde48001122]
+      x-ms-client-request-id: [a2b3e164-051c-11e7-b29e-a0b3ccf7272a]
     method: PUT
     uri: https://cli-test-keyvault-secret.vault.azure.net/secrets/download-utf-16be?api-version=2016-10-01
   response:
-    body: {string: '{"value":"TestSecretTestSecretTestSecretTestSecret\n","id":"https://cli-test-keyvault-secret.vault.azure.net/secrets/download-utf-16be/33d4bd19fb91485d97fec099e7d1f7ef","attributes":{"enabled":true,"created":1487808967,"updated":1487808967},"tags":{"file-encoding":"utf-16be"}}'}
+    body: {string: '{"value":"TestSecretTestSecretTestSecretTestSecret\n","id":"https://cli-test-keyvault-secret.vault.azure.net/secrets/download-utf-16be/b9da65c1801e4b0c9e11e33c07e0a441","attributes":{"enabled":true,"created":1489100619,"updated":1489100619},"tags":{"file-encoding":"utf-16be"}}'}
     headers:
       Cache-Control: [no-cache]
       Content-Length: ['277']
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Thu, 23 Feb 2017 00:16:06 GMT']
+      Date: ['Thu, 09 Mar 2017 23:03:39 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-IIS/8.5]
@@ -563,7 +562,7 @@ interactions:
       X-Content-Type-Options: [nosniff]
       X-Powered-By: [ASP.NET]
       x-ms-keyvault-region: [westus]
-      x-ms-keyvault-service-version: [1.0.0.800]
+      x-ms-keyvault-service-version: [1.0.0.802]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -572,19 +571,19 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 keyvaultclient/0.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
-      x-ms-client-request-id: [46ac659a-f95d-11e6-b6be-acde48001122]
+      x-ms-client-request-id: [a324a4d0-051c-11e7-a7a7-a0b3ccf7272a]
     method: GET
     uri: https://cli-test-keyvault-secret.vault.azure.net/secrets/download-utf-16be/?api-version=2016-10-01
   response:
-    body: {string: '{"value":"TestSecretTestSecretTestSecretTestSecret\n","id":"https://cli-test-keyvault-secret.vault.azure.net/secrets/download-utf-16be/33d4bd19fb91485d97fec099e7d1f7ef","attributes":{"enabled":true,"created":1487808967,"updated":1487808967},"tags":{"file-encoding":"utf-16be"}}'}
+    body: {string: '{"value":"TestSecretTestSecretTestSecretTestSecret\n","id":"https://cli-test-keyvault-secret.vault.azure.net/secrets/download-utf-16be/b9da65c1801e4b0c9e11e33c07e0a441","attributes":{"enabled":true,"created":1489100619,"updated":1489100619},"tags":{"file-encoding":"utf-16be"}}'}
     headers:
       Cache-Control: [no-cache]
       Content-Length: ['277']
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Thu, 23 Feb 2017 00:16:07 GMT']
+      Date: ['Thu, 09 Mar 2017 23:03:39 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-IIS/8.5]
@@ -593,30 +592,30 @@ interactions:
       X-Content-Type-Options: [nosniff]
       X-Powered-By: [ASP.NET]
       x-ms-keyvault-region: [westus]
-      x-ms-keyvault-service-version: [1.0.0.800]
+      x-ms-keyvault-service-version: [1.0.0.802]
     status: {code: 200, message: OK}
 - request:
-    body: '{"attributes": {"enabled": true}, "value": "TestSecretTestSecretTestSecretTestSecret\n",
+    body: '{"tags": {"file-encoding": "ascii"}, "attributes": {"enabled": true}, "value":
-      "tags": {"file-encoding": "ascii"}}'
+      "TestSecretTestSecretTestSecretTestSecret\n"}'
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Length: ['124']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 keyvaultclient/0.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
-      x-ms-client-request-id: [4741361e-f95d-11e6-8712-acde48001122]
+      x-ms-client-request-id: [a3a8444c-051c-11e7-8fa5-a0b3ccf7272a]
     method: PUT
     uri: https://cli-test-keyvault-secret.vault.azure.net/secrets/download-ascii?api-version=2016-10-01
   response:
-    body: {string: '{"value":"TestSecretTestSecretTestSecretTestSecret\n","id":"https://cli-test-keyvault-secret.vault.azure.net/secrets/download-ascii/128504d3c7be44c59ccc8ad427a96689","attributes":{"enabled":true,"created":1487808969,"updated":1487808969},"tags":{"file-encoding":"ascii"}}'}
+    body: {string: '{"value":"TestSecretTestSecretTestSecretTestSecret\n","id":"https://cli-test-keyvault-secret.vault.azure.net/secrets/download-ascii/cf532ff409024b068a15f9c39d118abd","attributes":{"enabled":true,"created":1489100620,"updated":1489100620},"tags":{"file-encoding":"ascii"}}'}
     headers:
       Cache-Control: [no-cache]
       Content-Length: ['271']
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Thu, 23 Feb 2017 00:16:09 GMT']
+      Date: ['Thu, 09 Mar 2017 23:03:40 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-IIS/8.5]
@@ -625,7 +624,7 @@ interactions:
       X-Content-Type-Options: [nosniff]
       X-Powered-By: [ASP.NET]
       x-ms-keyvault-region: [westus]
-      x-ms-keyvault-service-version: [1.0.0.800]
+      x-ms-keyvault-service-version: [1.0.0.802]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -634,19 +633,19 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 keyvaultclient/0.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
-      x-ms-client-request-id: [47d2a880-f95d-11e6-bf9c-acde48001122]
+      x-ms-client-request-id: [a4217b46-051c-11e7-95b1-a0b3ccf7272a]
     method: GET
     uri: https://cli-test-keyvault-secret.vault.azure.net/secrets/download-ascii/?api-version=2016-10-01
   response:
-    body: {string: '{"value":"TestSecretTestSecretTestSecretTestSecret\n","id":"https://cli-test-keyvault-secret.vault.azure.net/secrets/download-ascii/128504d3c7be44c59ccc8ad427a96689","attributes":{"enabled":true,"created":1487808969,"updated":1487808969},"tags":{"file-encoding":"ascii"}}'}
+    body: {string: '{"value":"TestSecretTestSecretTestSecretTestSecret\n","id":"https://cli-test-keyvault-secret.vault.azure.net/secrets/download-ascii/cf532ff409024b068a15f9c39d118abd","attributes":{"enabled":true,"created":1489100620,"updated":1489100620},"tags":{"file-encoding":"ascii"}}'}
     headers:
       Cache-Control: [no-cache]
       Content-Length: ['271']
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Thu, 23 Feb 2017 00:16:11 GMT']
+      Date: ['Thu, 09 Mar 2017 23:03:41 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-IIS/8.5]
@@ -655,30 +654,30 @@ interactions:
       X-Content-Type-Options: [nosniff]
       X-Powered-By: [ASP.NET]
       x-ms-keyvault-region: [westus]
-      x-ms-keyvault-service-version: [1.0.0.800]
+      x-ms-keyvault-service-version: [1.0.0.802]
     status: {code: 200, message: OK}
 - request:
-    body: '{"attributes": {"enabled": true}, "value": "VGVzdFNlY3JldFRlc3RTZWNyZXRUZXN0U2VjcmV0VGVzdFNlY3JldAo=\n",
+    body: '{"tags": {"file-encoding": "base64"}, "attributes": {"enabled": true},
-      "tags": {"file-encoding": "base64"}}'
+      "value": "VGVzdFNlY3JldFRlc3RTZWNyZXRUZXN0U2VjcmV0VGVzdFNlY3JldA0K\n"}'
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Length: ['141']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 keyvaultclient/0.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
-      x-ms-client-request-id: [4869a62c-f95d-11e6-868a-acde48001122]
+      x-ms-client-request-id: [a5104038-051c-11e7-89e3-a0b3ccf7272a]
     method: PUT
     uri: https://cli-test-keyvault-secret.vault.azure.net/secrets/download-base64?api-version=2016-10-01
   response:
-    body: {string: '{"value":"VGVzdFNlY3JldFRlc3RTZWNyZXRUZXN0U2VjcmV0VGVzdFNlY3JldAo=\n","id":"https://cli-test-keyvault-secret.vault.azure.net/secrets/download-base64/b0fd85eaa13e44a98a6fde8730b2ccc9","attributes":{"enabled":true,"created":1487808971,"updated":1487808971},"tags":{"file-encoding":"base64"}}'}
+    body: {string: '{"value":"VGVzdFNlY3JldFRlc3RTZWNyZXRUZXN0U2VjcmV0VGVzdFNlY3JldA0K\n","id":"https://cli-test-keyvault-secret.vault.azure.net/secrets/download-base64/9503cd9d71194c65b72e21fc7947fb55","attributes":{"enabled":true,"created":1489100624,"updated":1489100624},"tags":{"file-encoding":"base64"}}'}
     headers:
       Cache-Control: [no-cache]
       Content-Length: ['289']
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Thu, 23 Feb 2017 00:16:11 GMT']
+      Date: ['Thu, 09 Mar 2017 23:03:44 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-IIS/8.5]
@@ -687,7 +686,7 @@ interactions:
       X-Content-Type-Options: [nosniff]
       X-Powered-By: [ASP.NET]
       x-ms-keyvault-region: [westus]
-      x-ms-keyvault-service-version: [1.0.0.800]
+      x-ms-keyvault-service-version: [1.0.0.802]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -696,19 +695,19 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 keyvaultclient/0.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
-      x-ms-client-request-id: [4905bd64-f95d-11e6-8670-acde48001122]
+      x-ms-client-request-id: [a58af036-051c-11e7-8070-a0b3ccf7272a]
     method: GET
     uri: https://cli-test-keyvault-secret.vault.azure.net/secrets/download-base64/?api-version=2016-10-01
   response:
-    body: {string: '{"value":"VGVzdFNlY3JldFRlc3RTZWNyZXRUZXN0U2VjcmV0VGVzdFNlY3JldAo=\n","id":"https://cli-test-keyvault-secret.vault.azure.net/secrets/download-base64/b0fd85eaa13e44a98a6fde8730b2ccc9","attributes":{"enabled":true,"created":1487808971,"updated":1487808971},"tags":{"file-encoding":"base64"}}'}
+    body: {string: '{"value":"VGVzdFNlY3JldFRlc3RTZWNyZXRUZXN0U2VjcmV0VGVzdFNlY3JldA0K\n","id":"https://cli-test-keyvault-secret.vault.azure.net/secrets/download-base64/9503cd9d71194c65b72e21fc7947fb55","attributes":{"enabled":true,"created":1489100624,"updated":1489100624},"tags":{"file-encoding":"base64"}}'}
     headers:
       Cache-Control: [no-cache]
       Content-Length: ['289']
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Thu, 23 Feb 2017 00:16:13 GMT']
+      Date: ['Thu, 09 Mar 2017 23:03:43 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-IIS/8.5]
@@ -717,30 +716,30 @@ interactions:
       X-Content-Type-Options: [nosniff]
       X-Powered-By: [ASP.NET]
       x-ms-keyvault-region: [westus]
-      x-ms-keyvault-service-version: [1.0.0.800]
+      x-ms-keyvault-service-version: [1.0.0.802]
     status: {code: 200, message: OK}
 - request:
-    body: '{"attributes": {"enabled": true}, "value": "546573745365637265745465737453656372657454657374536563726574546573745365637265740a",
+    body: '{"tags": {"file-encoding": "hex"}, "attributes": {"enabled": true}, "value":
-      "tags": {"file-encoding": "hex"}}'
+      "546573745365637265745465737453656372657454657374536563726574546573745365637265740d0a"}'
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Length: ['162']
+      Content-Length: ['164']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 keyvaultclient/0.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
-      x-ms-client-request-id: [498c0694-f95d-11e6-9881-acde48001122]
+      x-ms-client-request-id: [a5f55d66-051c-11e7-9c7c-a0b3ccf7272a]
     method: PUT
     uri: https://cli-test-keyvault-secret.vault.azure.net/secrets/download-hex?api-version=2016-10-01
   response:
-    body: {string: '{"value":"546573745365637265745465737453656372657454657374536563726574546573745365637265740a","id":"https://cli-test-keyvault-secret.vault.azure.net/secrets/download-hex/d6448273a2ff47278bc94427466f113f","attributes":{"enabled":true,"created":1487808975,"updated":1487808975},"tags":{"file-encoding":"hex"}}'}
+    body: {string: '{"value":"546573745365637265745465737453656372657454657374536563726574546573745365637265740d0a","id":"https://cli-test-keyvault-secret.vault.azure.net/secrets/download-hex/5bb6a0ad91604401acbee956a71e1f47","attributes":{"enabled":true,"created":1489100624,"updated":1489100624},"tags":{"file-encoding":"hex"}}'}
     headers:
       Cache-Control: [no-cache]
-      Content-Length: ['307']
+      Content-Length: ['309']
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Thu, 23 Feb 2017 00:16:15 GMT']
+      Date: ['Thu, 09 Mar 2017 23:03:44 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-IIS/8.5]
@@ -749,7 +748,7 @@ interactions:
       X-Content-Type-Options: [nosniff]
       X-Powered-By: [ASP.NET]
       x-ms-keyvault-region: [westus]
-      x-ms-keyvault-service-version: [1.0.0.800]
+      x-ms-keyvault-service-version: [1.0.0.802]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -758,19 +757,19 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 keyvaultclient/0.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
-      x-ms-client-request-id: [4a2ae89a-f95d-11e6-9cd3-acde48001122]
+      x-ms-client-request-id: [a6a0524a-051c-11e7-8f04-a0b3ccf7272a]
     method: GET
     uri: https://cli-test-keyvault-secret.vault.azure.net/secrets/download-hex/?api-version=2016-10-01
   response:
-    body: {string: '{"value":"546573745365637265745465737453656372657454657374536563726574546573745365637265740a","id":"https://cli-test-keyvault-secret.vault.azure.net/secrets/download-hex/d6448273a2ff47278bc94427466f113f","attributes":{"enabled":true,"created":1487808975,"updated":1487808975},"tags":{"file-encoding":"hex"}}'}
+    body: {string: '{"value":"546573745365637265745465737453656372657454657374536563726574546573745365637265740d0a","id":"https://cli-test-keyvault-secret.vault.azure.net/secrets/download-hex/5bb6a0ad91604401acbee956a71e1f47","attributes":{"enabled":true,"created":1489100624,"updated":1489100624},"tags":{"file-encoding":"hex"}}'}
     headers:
       Cache-Control: [no-cache]
-      Content-Length: ['307']
+      Content-Length: ['309']
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Thu, 23 Feb 2017 00:16:16 GMT']
+      Date: ['Thu, 09 Mar 2017 23:03:45 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-IIS/8.5]
@@ -779,6 +778,6 @@ interactions:
       X-Content-Type-Options: [nosniff]
       X-Powered-By: [ASP.NET]
       x-ms-keyvault-region: [westus]
-      x-ms-keyvault-service-version: [1.0.0.800]
+      x-ms-keyvault-service-version: [1.0.0.802]
     status: {code: 200, message: OK}
 version: 1

src/command_modules/azure-cli-keyvault/tests/test_keyvault_commands.py

@@ -270,7 +270,7 @@ class KeyVaultSecretScenarioTest(ResourceGroupVCRTestBase):
 class KeyVaultCertificateScenarioTest(ResourceGroupVCRTestBase):
 
     def __init__(self, test_method):
-        super(KeyVaultCertificateScenarioTest, self).__init__(__file__, test_method, resource_group='cli-test-keyvault-cert', debug=True)
+        super(KeyVaultCertificateScenarioTest, self).__init__(__file__, test_method, resource_group='cli-test-keyvault-cert')
         self.keyvault_name = 'cli-test-keyvault-cert1'
         self.location = 'westus'
 

src/command_modules/azure-cli-sql/azure/cli/command_modules/sql/tests/recordings/test_sql_db_mgmt.yaml

@@ -1,30 +0,0 @@
-interactions:
-- request:
-    body: '{"location": "westus", "properties": {"administratorLogin": "admin123",
-      "administratorLoginPassword": "SecretPassword123"}}'
-    headers:
-      Accept: [application/json]
-      Accept-Encoding: ['gzip, deflate']
-      CommandName: [sql server create]
-      Connection: [keep-alive]
-      Content-Length: ['123']
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
-          msrest_azure/0.4.7 sqlmanagementclient/0.3.1 Azure-SDK-For-Python AZURECLI/2.0.0+dev]
-      accept-language: [en-US]
-    method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/None/providers/Microsoft.Sql/servers/cli-test-server000001?api-version=2014-04-01
-  response:
-    body: {string: '{"error":{"code":"ResourceGroupNotFound","message":"Resource group
-        ''None'' could not be found."}}'}
-    headers:
-      cache-control: [no-cache]
-      content-length: ['96']
-      content-type: [application/json; charset=utf-8]
-      date: ['Thu, 09 Mar 2017 22:13:37 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

src/command_modules/azure-cli-sql/azure/cli/command_modules/sql/tests/recordings/test_sql_db_replica_mgmt.yaml

@@ -1,144 +0,0 @@
-interactions:
-- request:
-    body: '{"location": "westus", "tags": {"use": "az-test"}}'
-    headers:
-      Accept: [application/json]
-      Accept-Encoding: ['gzip, deflate']
-      CommandName: [group create]
-      Connection: [keep-alive]
-      Content-Length: ['50']
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
-          msrest_azure/0.4.7 resourcemanagementclient/0.30.2 Azure-SDK-For-Python
-          AZURECLI/2.0.0+dev]
-      accept-language: [en-US]
-    method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2016-09-01
-  response:
-    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"use":"az-test"},"properties":{"provisioningState":"Succeeded"}}'}
-    headers:
-      cache-control: [no-cache]
-      content-length: ['326']
-      content-type: [application/json; charset=utf-8]
-      date: ['Thu, 09 Mar 2017 22:13:41 GMT']
-      expires: ['-1']
-      pragma: [no-cache]
-      strict-transport-security: [max-age=31536000; includeSubDomains]
-      x-ms-ratelimit-remaining-subscription-writes: ['1194']
-    status: {code: 201, message: Created}
-- request:
-    body: '{"location": "westus", "tags": {"use": "az-test"}}'
-    headers:
-      Accept: [application/json]
-      Accept-Encoding: ['gzip, deflate']
-      CommandName: [group create]
-      Connection: [keep-alive]
-      Content-Length: ['50']
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
-          msrest_azure/0.4.7 resourcemanagementclient/0.30.2 Azure-SDK-For-Python
-          AZURECLI/2.0.0+dev]
-      accept-language: [en-US]
-    method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000002?api-version=2016-09-01
-  response:
-    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000002","name":"clitest.rg000002","location":"westus","tags":{"use":"az-test"},"properties":{"provisioningState":"Succeeded"}}'}
-    headers:
-      cache-control: [no-cache]
-      content-length: ['326']
-      content-type: [application/json; charset=utf-8]
-      date: ['Thu, 09 Mar 2017 22:13:43 GMT']
-      expires: ['-1']
-      pragma: [no-cache]
-      strict-transport-security: [max-age=31536000; includeSubDomains]
-      x-ms-ratelimit-remaining-subscription-writes: ['1196']
-    status: {code: 201, message: Created}
-- request:
-    body: '{"location": "westus", "properties": {"administratorLogin": "admin123",
-      "administratorLoginPassword": "SecretPassword123"}}'
-    headers:
-      Accept: [application/json]
-      Accept-Encoding: ['gzip, deflate']
-      CommandName: [sql server create]
-      Connection: [keep-alive]
-      Content-Length: ['123']
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
-          msrest_azure/0.4.7 sqlmanagementclient/0.3.1 Azure-SDK-For-Python AZURECLI/2.0.0+dev]
-      accept-language: [en-US]
-    method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Sql/servers/cliautomation61?api-version=2014-04-01
-  response:
-    body: {string: '{"code":"40647","message":"Subscription \u00272e7fe4bd-90c7-454e-8bb6-dc44649f27b2\u0027
-        does not have the server \u0027cliautomation61\u0027.","target":null,"details":[{"code":"40647","message":"Subscription
-        \u00272e7fe4bd-90c7-454e-8bb6-dc44649f27b2\u0027 does not have the server
-        \u0027cliautomation61\u0027.","target":null,"severity":"16"}],"innererror":[]}'}
-    headers:
-      cache-control: ['no-store, no-cache']
-      content-length: ['361']
-      content-type: [application/json]
-      dataserviceversion: [3.0;]
-      date: ['Thu, 09 Mar 2017 22:13:46 GMT']
-      preference-applied: [return-content]
-      server: [Microsoft-HTTPAPI/2.0]
-      strict-transport-security: [max-age=31536000; includeSubDomains]
-      x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-subscription-writes: ['1194']
-    status: {code: 404, message: Not Found}
-- request:
-    body: null
-    headers:
-      Accept: [application/json]
-      Accept-Encoding: ['gzip, deflate']
-      CommandName: [group delete]
-      Connection: [keep-alive]
-      Content-Length: ['0']
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
-          msrest_azure/0.4.7 resourcemanagementclient/0.30.2 Azure-SDK-For-Python
-          AZURECLI/2.0.0+dev]
-      accept-language: [en-US]
-    method: DELETE
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000002?api-version=2016-09-01
-  response:
-    body: {string: ''}
-    headers:
-      cache-control: [no-cache]
-      content-length: ['0']
-      date: ['Thu, 09 Mar 2017 22:13:47 GMT']
-      expires: ['-1']
-      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1DTElURVNUOjJFUkcyMTYwQjNGMUZDQzdBNjREOTU1ODY2QTVFRjVCQTdDNTIwQ3xBRjk2RDQ1NDQ1NDM1QkNCLVdFU1RVUyIsImpvYkxvY2F0aW9uIjoid2VzdHVzIn0?api-version=2016-09-01']
-      pragma: [no-cache]
-      retry-after: ['15']
-      strict-transport-security: [max-age=31536000; includeSubDomains]
-      x-ms-ratelimit-remaining-subscription-writes: ['1195']
-    status: {code: 202, message: Accepted}
-- request:
-    body: null
-    headers:
-      Accept: [application/json]
-      Accept-Encoding: ['gzip, deflate']
-      CommandName: [group delete]
-      Connection: [keep-alive]
-      Content-Length: ['0']
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
-          msrest_azure/0.4.7 resourcemanagementclient/0.30.2 Azure-SDK-For-Python
-          AZURECLI/2.0.0+dev]
-      accept-language: [en-US]
-    method: DELETE
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2016-09-01
-  response:
-    body: {string: ''}
-    headers:
-      cache-control: [no-cache]
-      content-length: ['0']
-      date: ['Thu, 09 Mar 2017 22:13:49 GMT']
-      expires: ['-1']
-      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1DTElURVNUOjJFUkdENjg0RjA2MkEyMTRGRjg0Rjg3MTAzNzEyRjcyM0U1MjcyN3w1OTgzQTZFM0MyQ0QyMDAxLVdFU1RVUyIsImpvYkxvY2F0aW9uIjoid2VzdHVzIn0?api-version=2016-09-01']
-      pragma: [no-cache]
-      retry-after: ['15']
-      strict-transport-security: [max-age=31536000; includeSubDomains]
-      x-ms-ratelimit-remaining-subscription-writes: ['1192']
-    status: {code: 202, message: Accepted}
-version: 1

src/command_modules/azure-cli-sql/azure/cli/command_modules/sql/tests/recordings/test_sql_db_restore.yaml

@@ -1,87 +0,0 @@
-interactions:
-- request:
-    body: '{"location": "westus", "tags": {"use": "az-test"}}'
-    headers:
-      Accept: [application/json]
-      Accept-Encoding: ['gzip, deflate']
-      CommandName: [group create]
-      Connection: [keep-alive]
-      Content-Length: ['50']
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
-          msrest_azure/0.4.7 resourcemanagementclient/0.30.2 Azure-SDK-For-Python
-          AZURECLI/2.0.0+dev]
-      accept-language: [en-US]
-    method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2016-09-01
-  response:
-    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"use":"az-test"},"properties":{"provisioningState":"Succeeded"}}'}
-    headers:
-      cache-control: [no-cache]
-      content-length: ['326']
-      content-type: [application/json; charset=utf-8]
-      date: ['Thu, 09 Mar 2017 22:13:51 GMT']
-      expires: ['-1']
-      pragma: [no-cache]
-      strict-transport-security: [max-age=31536000; includeSubDomains]
-      x-ms-ratelimit-remaining-subscription-writes: ['1193']
-    status: {code: 201, message: Created}
-- request:
-    body: '{"location": "westus", "properties": {"administratorLogin": "admin123",
-      "administratorLoginPassword": "SecretPassword123"}}'
-    headers:
-      Accept: [application/json]
-      Accept-Encoding: ['gzip, deflate']
-      CommandName: [sql server create]
-      Connection: [keep-alive]
-      Content-Length: ['123']
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
-          msrest_azure/0.4.7 sqlmanagementclient/0.3.1 Azure-SDK-For-Python AZURECLI/2.0.0+dev]
-      accept-language: [en-US]
-    method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Sql/servers/cli-test-server000002?api-version=2014-04-01
-  response:
-    body: {string: '{"error":{"code":"InvalidResourceName","message":"The resource
-        name ''cli-test-server000002'' for type ''servers'' is not valid. The resource
-        name can contain only letters, numbers, and hyphens. The first and last character
-        in the field must be a letter or a number."}}'}
-    headers:
-      cache-control: [no-cache]
-      content-length: ['308']
-      content-type: [application/json; charset=utf-8]
-      date: ['Thu, 09 Mar 2017 22:13:52 GMT']
-      expires: ['-1']
-      pragma: [no-cache]
-      strict-transport-security: [max-age=31536000; includeSubDomains]
-      x-ms-failure-cause: [gateway]
-    status: {code: 400, message: Bad Request}
-- request:
-    body: null
-    headers:
-      Accept: [application/json]
-      Accept-Encoding: ['gzip, deflate']
-      CommandName: [group delete]
-      Connection: [keep-alive]
-      Content-Length: ['0']
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
-          msrest_azure/0.4.7 resourcemanagementclient/0.30.2 Azure-SDK-For-Python
-          AZURECLI/2.0.0+dev]
-      accept-language: [en-US]
-    method: DELETE
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2016-09-01
-  response:
-    body: {string: ''}
-    headers:
-      cache-control: [no-cache]
-      content-length: ['0']
-      date: ['Thu, 09 Mar 2017 22:13:54 GMT']
-      expires: ['-1']
-      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1DTElURVNUOjJFUkc0MzdBRjNBMTNCQkY5RDJCN0FBMzBFQjU5ODVEQzc2QkQ3M3wyMDJGMjlBQzI3QkVBQTE4LVdFU1RVUyIsImpvYkxvY2F0aW9uIjoid2VzdHVzIn0?api-version=2016-09-01']
-      pragma: [no-cache]
-      retry-after: ['15']
-      strict-transport-security: [max-age=31536000; includeSubDomains]
-      x-ms-ratelimit-remaining-subscription-writes: ['1194']
-    status: {code: 202, message: Accepted}
-version: 1

src/command_modules/azure-cli-sql/azure/cli/command_modules/sql/tests/recordings/test_sql_dw_mgmt.yaml

@@ -1,87 +0,0 @@
-interactions:
-- request:
-    body: '{"location": "westus", "tags": {"use": "az-test"}}'
-    headers:
-      Accept: [application/json]
-      Accept-Encoding: ['gzip, deflate']
-      CommandName: [group create]
-      Connection: [keep-alive]
-      Content-Length: ['50']
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
-          msrest_azure/0.4.7 resourcemanagementclient/0.30.2 Azure-SDK-For-Python
-          AZURECLI/2.0.0+dev]
-      accept-language: [en-US]
-    method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2016-09-01
-  response:
-    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"use":"az-test"},"properties":{"provisioningState":"Succeeded"}}'}
-    headers:
-      cache-control: [no-cache]
-      content-length: ['326']
-      content-type: [application/json; charset=utf-8]
-      date: ['Thu, 09 Mar 2017 22:13:56 GMT']
-      expires: ['-1']
-      pragma: [no-cache]
-      strict-transport-security: [max-age=31536000; includeSubDomains]
-      x-ms-ratelimit-remaining-subscription-writes: ['1195']
-    status: {code: 201, message: Created}
-- request:
-    body: '{"location": "westus", "properties": {"administratorLogin": "admin123",
-      "administratorLoginPassword": "SecretPassword123"}}'
-    headers:
-      Accept: [application/json]
-      Accept-Encoding: ['gzip, deflate']
-      CommandName: [sql server create]
-      Connection: [keep-alive]
-      Content-Length: ['123']
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
-          msrest_azure/0.4.7 sqlmanagementclient/0.3.1 Azure-SDK-For-Python AZURECLI/2.0.0+dev]
-      accept-language: [en-US]
-    method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Sql/servers/cli-test-server000002?api-version=2014-04-01
-  response:
-    body: {string: '{"error":{"code":"InvalidResourceName","message":"The resource
-        name ''cli-test-server000002'' for type ''servers'' is not valid. The resource
-        name can contain only letters, numbers, and hyphens. The first and last character
-        in the field must be a letter or a number."}}'}
-    headers:
-      cache-control: [no-cache]
-      content-length: ['308']
-      content-type: [application/json; charset=utf-8]
-      date: ['Thu, 09 Mar 2017 22:13:58 GMT']
-      expires: ['-1']
-      pragma: [no-cache]
-      strict-transport-security: [max-age=31536000; includeSubDomains]
-      x-ms-failure-cause: [gateway]
-    status: {code: 400, message: Bad Request}
-- request:
-    body: null
-    headers:
-      Accept: [application/json]
-      Accept-Encoding: ['gzip, deflate']
-      CommandName: [group delete]
-      Connection: [keep-alive]
-      Content-Length: ['0']
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
-          msrest_azure/0.4.7 resourcemanagementclient/0.30.2 Azure-SDK-For-Python
-          AZURECLI/2.0.0+dev]
-      accept-language: [en-US]
-    method: DELETE
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2016-09-01
-  response:
-    body: {string: ''}
-    headers:
-      cache-control: [no-cache]
-      content-length: ['0']
-      date: ['Thu, 09 Mar 2017 22:13:59 GMT']
-      expires: ['-1']
-      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1DTElURVNUOjJFUkcwRjNGNkY1RjM1OUQ5NzRBRTkyRDMxMUU5NEU0OUZDQTY2Q3w2ODI1MDA3MDVERkFBQTQwLVdFU1RVUyIsImpvYkxvY2F0aW9uIjoid2VzdHVzIn0?api-version=2016-09-01']
-      pragma: [no-cache]
-      retry-after: ['15']
-      strict-transport-security: [max-age=31536000; includeSubDomains]
-      x-ms-ratelimit-remaining-subscription-writes: ['1193']
-    status: {code: 202, message: Accepted}
-version: 1

src/command_modules/azure-cli-sql/azure/cli/command_modules/sql/tests/recordings/test_sql_elastic_pools_mgmt.yaml

@@ -1,87 +0,0 @@
-interactions:
-- request:
-    body: '{"location": "westus", "tags": {"use": "az-test"}}'
-    headers:
-      Accept: [application/json]
-      Accept-Encoding: ['gzip, deflate']
-      CommandName: [group create]
-      Connection: [keep-alive]
-      Content-Length: ['50']
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
-          msrest_azure/0.4.7 resourcemanagementclient/0.30.2 Azure-SDK-For-Python
-          AZURECLI/2.0.0+dev]
-      accept-language: [en-US]
-    method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2016-09-01
-  response:
-    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"use":"az-test"},"properties":{"provisioningState":"Succeeded"}}'}
-    headers:
-      cache-control: [no-cache]
-      content-length: ['326']
-      content-type: [application/json; charset=utf-8]
-      date: ['Thu, 09 Mar 2017 22:13:32 GMT']
-      expires: ['-1']
-      pragma: [no-cache]
-      strict-transport-security: [max-age=31536000; includeSubDomains]
-      x-ms-ratelimit-remaining-subscription-writes: ['1193']
-    status: {code: 201, message: Created}
-- request:
-    body: '{"location": "westus", "properties": {"administratorLogin": "admin123",
-      "administratorLoginPassword": "SecretPassword123"}}'
-    headers:
-      Accept: [application/json]
-      Accept-Encoding: ['gzip, deflate']
-      CommandName: [sql server create]
-      Connection: [keep-alive]
-      Content-Length: ['123']
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
-          msrest_azure/0.4.7 sqlmanagementclient/0.3.1 Azure-SDK-For-Python AZURECLI/2.0.0+dev]
-      accept-language: [en-US]
-    method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Sql/servers/cli-test-server000002?api-version=2014-04-01
-  response:
-    body: {string: '{"error":{"code":"InvalidResourceName","message":"The resource
-        name ''cli-test-server000002'' for type ''servers'' is not valid. The resource
-        name can contain only letters, numbers, and hyphens. The first and last character
-        in the field must be a letter or a number."}}'}
-    headers:
-      cache-control: [no-cache]
-      content-length: ['308']
-      content-type: [application/json; charset=utf-8]
-      date: ['Thu, 09 Mar 2017 22:13:34 GMT']
-      expires: ['-1']
-      pragma: [no-cache]
-      strict-transport-security: [max-age=31536000; includeSubDomains]
-      x-ms-failure-cause: [gateway]
-    status: {code: 400, message: Bad Request}
-- request:
-    body: null
-    headers:
-      Accept: [application/json]
-      Accept-Encoding: ['gzip, deflate']
-      CommandName: [group delete]
-      Connection: [keep-alive]
-      Content-Length: ['0']
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
-          msrest_azure/0.4.7 resourcemanagementclient/0.30.2 Azure-SDK-For-Python
-          AZURECLI/2.0.0+dev]
-      accept-language: [en-US]
-    method: DELETE
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2016-09-01
-  response:
-    body: {string: ''}
-    headers:
-      cache-control: [no-cache]
-      content-length: ['0']
-      date: ['Thu, 09 Mar 2017 22:13:36 GMT']
-      expires: ['-1']
-      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1DTElURVNUOjJFUkc3NUQyOTY0NENDQjhGRjg1MDI3QkEyRTA3QTlFQjFDQUFGOHwyN0ZDRTc4QkI2RDk5ODQ3LVdFU1RVUyIsImpvYkxvY2F0aW9uIjoid2VzdHVzIn0?api-version=2016-09-01']
-      pragma: [no-cache]
-      retry-after: ['15']
-      strict-transport-security: [max-age=31536000; includeSubDomains]
-      x-ms-ratelimit-remaining-subscription-writes: ['1194']
-    status: {code: 202, message: Accepted}
-version: 1

src/command_modules/azure-cli-sql/azure/cli/command_modules/sql/tests/recordings/test_sql_firewall_mgmt.yaml

@@ -1,87 +0,0 @@
-interactions:
-- request:
-    body: '{"location": "westus", "tags": {"use": "az-test"}}'
-    headers:
-      Accept: [application/json]
-      Accept-Encoding: ['gzip, deflate']
-      CommandName: [group create]
-      Connection: [keep-alive]
-      Content-Length: ['50']
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
-          msrest_azure/0.4.7 resourcemanagementclient/0.30.2 Azure-SDK-For-Python
-          AZURECLI/2.0.0+dev]
-      accept-language: [en-US]
-    method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2016-09-01
-  response:
-    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"use":"az-test"},"properties":{"provisioningState":"Succeeded"}}'}
-    headers:
-      cache-control: [no-cache]
-      content-length: ['326']
-      content-type: [application/json; charset=utf-8]
-      date: ['Thu, 09 Mar 2017 22:14:01 GMT']
-      expires: ['-1']
-      pragma: [no-cache]
-      strict-transport-security: [max-age=31536000; includeSubDomains]
-      x-ms-ratelimit-remaining-subscription-writes: ['1190']
-    status: {code: 201, message: Created}
-- request:
-    body: '{"location": "westus", "properties": {"administratorLogin": "admin123",
-      "administratorLoginPassword": "SecretPassword123"}}'
-    headers:
-      Accept: [application/json]
-      Accept-Encoding: ['gzip, deflate']
-      CommandName: [sql server create]
-      Connection: [keep-alive]
-      Content-Length: ['123']
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
-          msrest_azure/0.4.7 sqlmanagementclient/0.3.1 Azure-SDK-For-Python AZURECLI/2.0.0+dev]
-      accept-language: [en-US]
-    method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Sql/servers/cli-test-server000002?api-version=2014-04-01
-  response:
-    body: {string: '{"error":{"code":"InvalidResourceName","message":"The resource
-        name ''cli-test-server000002'' for type ''servers'' is not valid. The resource
-        name can contain only letters, numbers, and hyphens. The first and last character
-        in the field must be a letter or a number."}}'}
-    headers:
-      cache-control: [no-cache]
-      content-length: ['308']
-      content-type: [application/json; charset=utf-8]
-      date: ['Thu, 09 Mar 2017 22:14:03 GMT']
-      expires: ['-1']
-      pragma: [no-cache]
-      strict-transport-security: [max-age=31536000; includeSubDomains]
-      x-ms-failure-cause: [gateway]
-    status: {code: 400, message: Bad Request}
-- request:
-    body: null
-    headers:
-      Accept: [application/json]
-      Accept-Encoding: ['gzip, deflate']
-      CommandName: [group delete]
-      Connection: [keep-alive]
-      Content-Length: ['0']
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
-          msrest_azure/0.4.7 resourcemanagementclient/0.30.2 Azure-SDK-For-Python
-          AZURECLI/2.0.0+dev]
-      accept-language: [en-US]
-    method: DELETE
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2016-09-01
-  response:
-    body: {string: ''}
-    headers:
-      cache-control: [no-cache]
-      content-length: ['0']
-      date: ['Thu, 09 Mar 2017 22:14:05 GMT']
-      expires: ['-1']
-      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1DTElURVNUOjJFUkczQURFNzk2Qjk3NzM3MzE0QjREQUNFOTJDNkZFMjVDREVGNHwwNUNBNTJDOTNBMjg3NDI5LVdFU1RVUyIsImpvYkxvY2F0aW9uIjoid2VzdHVzIn0?api-version=2016-09-01']
-      pragma: [no-cache]
-      retry-after: ['15']
-      strict-transport-security: [max-age=31536000; includeSubDomains]
-      x-ms-ratelimit-remaining-subscription-writes: ['1193']
-    status: {code: 202, message: Accepted}
-version: 1

src/command_modules/azure-cli-sql/azure/cli/command_modules/sql/tests/recordings/test_sql_server_mgmt.yaml

@@ -1,89 +0,0 @@
-interactions:
-- request:
-    body: '{"location": "westus", "tags": {"use": "az-test"}}'
-    headers:
-      Accept: [application/json]
-      Accept-Encoding: ['gzip, deflate']
-      CommandName: [group create]
-      Connection: [keep-alive]
-      Content-Length: ['50']
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
-          msrest_azure/0.4.7 resourcemanagementclient/0.30.2 Azure-SDK-For-Python
-          AZURECLI/2.0.0+dev]
-      accept-language: [en-US]
-    method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2016-09-01
-  response:
-    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"use":"az-test"},"properties":{"provisioningState":"Succeeded"}}'}
-    headers:
-      cache-control: [no-cache]
-      content-length: ['326']
-      content-type: [application/json; charset=utf-8]
-      date: ['Thu, 09 Mar 2017 22:14:07 GMT']
-      expires: ['-1']
-      pragma: [no-cache]
-      strict-transport-security: [max-age=31536000; includeSubDomains]
-      x-ms-ratelimit-remaining-subscription-writes: ['1195']
-    status: {code: 201, message: Created}
-- request:
-    body: '{"location": "westus", "properties": {"administratorLogin": "admin123",
-      "administratorLoginPassword": "SecretPassword123"}}'
-    headers:
-      Accept: [application/json]
-      Accept-Encoding: ['gzip, deflate']
-      CommandName: [sql server create]
-      Connection: [keep-alive]
-      Content-Length: ['123']
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
-          msrest_azure/0.4.7 sqlmanagementclient/0.3.1 Azure-SDK-For-Python AZURECLI/2.0.0+dev]
-      accept-language: [en-US]
-    method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Sql/servers/cliautomation01?api-version=2014-04-01
-  response:
-    body: {string: '{"code":"40647","message":"Subscription \u00272e7fe4bd-90c7-454e-8bb6-dc44649f27b2\u0027
-        does not have the server \u0027cliautomation01\u0027.","target":null,"details":[{"code":"40647","message":"Subscription
-        \u00272e7fe4bd-90c7-454e-8bb6-dc44649f27b2\u0027 does not have the server
-        \u0027cliautomation01\u0027.","target":null,"severity":"16"}],"innererror":[]}'}
-    headers:
-      cache-control: ['no-store, no-cache']
-      content-length: ['361']
-      content-type: [application/json]
-      dataserviceversion: [3.0;]
-      date: ['Thu, 09 Mar 2017 22:14:09 GMT']
-      preference-applied: [return-content]
-      server: [Microsoft-HTTPAPI/2.0]
-      strict-transport-security: [max-age=31536000; includeSubDomains]
-      x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-subscription-writes: ['1193']
-    status: {code: 404, message: Not Found}
-- request:
-    body: null
-    headers:
-      Accept: [application/json]
-      Accept-Encoding: ['gzip, deflate']
-      CommandName: [group delete]
-      Connection: [keep-alive]
-      Content-Length: ['0']
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
-          msrest_azure/0.4.7 resourcemanagementclient/0.30.2 Azure-SDK-For-Python
-          AZURECLI/2.0.0+dev]
-      accept-language: [en-US]
-    method: DELETE
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2016-09-01
-  response:
-    body: {string: ''}
-    headers:
-      cache-control: [no-cache]
-      content-length: ['0']
-      date: ['Thu, 09 Mar 2017 22:14:10 GMT']
-      expires: ['-1']
-      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1DTElURVNUOjJFUkc1NTM0QjJGNjcyRUVBOTFFMkZERTJGQzZFQTM5NjVEQUZFRXxDODMwMjdDRTlFQjhBODY4LVdFU1RVUyIsImpvYkxvY2F0aW9uIjoid2VzdHVzIn0?api-version=2016-09-01']
-      pragma: [no-cache]
-      retry-after: ['15']
-      strict-transport-security: [max-age=31536000; includeSubDomains]
-      x-ms-ratelimit-remaining-subscription-writes: ['1194']
-    status: {code: 202, message: Accepted}
-version: 1

src/command_modules/azure-cli-vm/tests/recordings/test_vmss_create_linux_secrets.yaml

@@ -6,60 +6,59 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 graphrbacmanagementclient/0.30.0rc6 Azure-SDK-For-Python]
       accept-language: [en-US]
-      x-ms-client-request-id: [d3bc8d08-f945-11e6-a08f-24f49a5003ca]
+      x-ms-client-request-id: [88d5a92c-050a-11e7-95b4-a0b3ccf7272a]
     method: GET
-    uri: https://graph.windows.net/00000000-0000-0000-0000-000000000000/me?api-version=1.6
+    uri: https://graph.windows.net/00000000-0000-0000-0000-000000000000/users?api-version=1.6&$filter=userPrincipalName%20eq%20%27example%40example.com%27
   response:
-    body: {string: '{"odata.metadata":"https://graph.windows.net/9148c3a5-1e1b-4e0a-87c2-302229534991/$metadata#directoryObjects/@Element","odata.type":"Microsoft.DirectoryServices.User","objectType":"User","objectId":"882b503c-c281-4fe9-a85c-d9e0cd66d376","deletionTimestamp":null,"accountEnabled":true,"signInNames":[],"assignedLicenses":[],"assignedPlans":[],"city":null,"companyName":null,"country":null,"creationType":null,"department":null,"dirSyncEnabled":null,"displayName":"David
+    body: {string: '{"odata.metadata":"https://graph.windows.net/54826b22-38d6-4fb2-bad9-b7b93a3e9c5a/$metadata#directoryObjects","value":[{"odata.type":"Microsoft.DirectoryServices.User","objectType":"User","objectId":"5963f50c-7c43-405c-af7e-53294de76abd","deletionTimestamp":null,"accountEnabled":true,"signInNames":[],"assignedLicenses":[],"assignedPlans":[],"city":null,"companyName":null,"country":null,"creationType":null,"department":null,"dirSyncEnabled":null,"displayName":"Admin2","facsimileTelephoneNumber":null,"givenName":"Admin2","immutableId":null,"isCompromised":null,"jobTitle":null,"lastDirSyncTime":null,"mail":null,"mailNickname":"admin2","mobile":null,"onPremisesSecurityIdentifier":null,"otherMails":["destanko@microsoft.com"],"passwordPolicies":"None","passwordProfile":null,"physicalDeliveryOfficeName":null,"postalCode":null,"preferredLanguage":null,"provisionedPlans":[],"provisioningErrors":[],"proxyAddresses":[],"refreshTokensValidFromDateTime":"2017-01-03T20:58:19Z","showInAddressList":null,"sipProxyAddress":null,"state":null,"streetAddress":null,"surname":"Admin2","telephoneNumber":null,"thumbnailPhoto@odata.mediaEditLink":"directoryObjects/5963f50c-7c43-405c-af7e-53294de76abd/Microsoft.DirectoryServices.User/thumbnailPhoto","usageLocation":null,"userPrincipalName":"admin2@AzureSDKTeam.onmicrosoft.com","userType":"Member"}]}'}
-        Justice","facsimileTelephoneNumber":null,"givenName":"David","immutableId":null,"isCompromised":null,"jobTitle":null,"lastDirSyncTime":null,"mail":null,"mailNickname":"david_devigned.com#EXT#","mobile":null,"onPremisesSecurityIdentifier":null,"otherMails":["david@devigned.com"],"passwordPolicies":null,"passwordProfile":null,"physicalDeliveryOfficeName":null,"postalCode":null,"preferredLanguage":null,"provisionedPlans":[],"provisioningErrors":[],"proxyAddresses":[],"refreshTokensValidFromDateTime":"2014-05-21T18:21:24Z","showInAddressList":null,"sipProxyAddress":null,"state":null,"streetAddress":null,"surname":"Justice","telephoneNumber":null,"thumbnailPhoto@odata.mediaEditLink":"directoryObjects/882b503c-c281-4fe9-a85c-d9e0cd66d376/Microsoft.DirectoryServices.User/thumbnailPhoto","usageLocation":null,"userPrincipalName":"david_devigned.com#EXT#@daviddevigned.onmicrosoft.com","userType":"Member"}'}
     headers:
       Access-Control-Allow-Origin: ['*']
       Cache-Control: [no-cache]
-      Content-Length: ['1377']
+      Content-Length: ['1344']
       Content-Type: [application/json;odata=minimalmetadata;streaming=true;charset=utf-8]
       DataServiceVersion: [3.0;]
-      Date: ['Wed, 22 Feb 2017 21:28:17 GMT']
+      Date: ['Thu, 09 Mar 2017 20:54:05 GMT']
-      Duration: ['2159969']
+      Duration: ['921667']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-IIS/8.5]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
       X-AspNet-Version: [4.0.30319]
       X-Powered-By: [ASP.NET, ASP.NET]
-      ocp-aad-diagnostics-server-name: [C6wUGxPx6EyCvip7rXtseehyCnwl+vm9NBkEKCUjowE=]
+      ocp-aad-diagnostics-server-name: [62GtVCvRcZCtOZCobkymTssN6Wq9mZtp7TF7aoH8iz4=]
-      ocp-aad-session-key: [Lf9Ph82sUNsQTy58xLTOsBkE-sLXXaTBRKw36zYJ-b8Qv5J3-EXlIjSCX8iPNwdn129MCZklWkndrypeD9q2LhGTXS1-ROEtvG4dYVuqiA_KMc0VbqTaNM9b51JFC6sk.U1snpTun9g2BEM7mjlvJ9yxBdfNNtCk0m1WGtf-U8zU]
+      ocp-aad-session-key: [A6RF-5Cg6s9sjQRPJ5hyMkEn07_0sjDOgBjFlALnTg-RcshogL3olq9zdIkHGaj7-uPqr8OGm3UbQ0F_ZyEwYgaGaTTxyB1bGIczwjcueQaw5vhuzmiicrcIIdCrQW_t.L1O2hKOBo0LTx8UB5c_h7b5HrzdQtK4ZXXVFg9gs6UA]
-      request-id: [d132735a-1b34-4a3d-afb7-46ba1a8c9058]
+      request-id: [f21b3736-cdf9-4b11-a8b6-e647fc97d19d]
       x-ms-dirapi-data-contract-version: ['1.6']
     status: {code: 200, message: OK}
 - request:
-    body: '{"location": "westus", "properties": {"enabledForTemplateDeployment": true,
+    body: '{"properties": {"accessPolicies": [{"objectId": "5963f50c-7c43-405c-af7e-53294de76abd",
-      "accessPolicies": [{"objectId": "882b503c-c281-4fe9-a85c-d9e0cd66d376", "permissions":
+      "permissions": {"secrets": ["all"], "certificates": ["all"], "keys": ["get",
-      {"keys": ["get", "create", "delete", "list", "update", "import", "backup", "restore"],
+      "create", "delete", "list", "update", "import", "backup", "restore"]}, "tenantId":
-      "secrets": ["all"], "certificates": ["all"]}, "tenantId": "9148c3a5-1e1b-4e0a-87c2-302229534991"}],
+      "54826b22-38d6-4fb2-bad9-b7b93a3e9c5a"}], "enabledForTemplateDeployment": true,
-      "enabledForDeployment": true, "sku": {"family": "A", "name": "standard"}, "tenantId":
+      "sku": {"family": "A", "name": "standard"}, "enabledForDeployment": true, "tenantId":
-      "9148c3a5-1e1b-4e0a-87c2-302229534991"}}'
+      "54826b22-38d6-4fb2-bad9-b7b93a3e9c5a"}, "location": "westus"}'
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Length: ['476']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 keyvaultmanagementclient/0.30.0 Azure-SDK-For-Python
-          AZURECLI/TEST/0.1.2rc1+dev]
+          AZURECLI/TEST/2.0.0+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [d40189c6-f945-11e6-81c5-24f49a5003ca]
+      x-ms-client-request-id: [88ff6650-050a-11e7-ae95-a0b3ccf7272a]
     method: PUT
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.KeyVault/vaults/vmcreatelinuxsecret3333?api-version=2015-06-01
   response:
-    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.KeyVault/vaults/vmcreatelinuxsecret3333","name":"vmcreatelinuxsecret3333","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{},"properties":{"sku":{"family":"A","name":"standard"},"tenantId":"9148c3a5-1e1b-4e0a-87c2-302229534991","accessPolicies":[{"tenantId":"9148c3a5-1e1b-4e0a-87c2-302229534991","objectId":"882b503c-c281-4fe9-a85c-d9e0cd66d376","permissions":{"keys":["get","create","delete","list","update","import","backup","restore"],"secrets":["all"],"certificates":["all"]}}],"enabledForDeployment":true,"enabledForTemplateDeployment":true,"vaultUri":"https://vmcreatelinuxsecret3333.vault.azure.net"}}'}
+    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.KeyVault/vaults/vmcreatelinuxsecret3333","name":"vmcreatelinuxsecret3333","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{},"properties":{"sku":{"family":"A","name":"standard"},"tenantId":"54826b22-38d6-4fb2-bad9-b7b93a3e9c5a","accessPolicies":[{"tenantId":"54826b22-38d6-4fb2-bad9-b7b93a3e9c5a","objectId":"5963f50c-7c43-405c-af7e-53294de76abd","permissions":{"secrets":["all"],"certificates":["all"],"keys":["get","create","delete","list","update","import","backup","restore"]}}],"enabledForDeployment":true,"enabledForTemplateDeployment":true,"vaultUri":"https://vmcreatelinuxsecret3333.vault.azure.net"}}'}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Wed, 22 Feb 2017 21:28:20 GMT']
+      Date: ['Thu, 09 Mar 2017 20:54:07 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-IIS/8.5]
@@ -70,27 +69,28 @@ interactions:
       X-Content-Type-Options: [nosniff]
       X-Powered-By: [ASP.NET]
       content-length: ['758']
-      x-ms-keyvault-service-version: [1.0.0.151]
+      x-ms-keyvault-service-version: [1.0.0.153]
       x-ms-ratelimit-remaining-subscription-writes: ['1199']
     status: {code: 200, message: OK}
 - request:
-    body: '{"attributes": {"enabled": true}, "policy": {"attributes": {"enabled":
+    body: '{"attributes": {"enabled": true}, "policy": {"issuer": {"name": "Self"},
-      true}, "secret_props": {"contentType": "application/x-pkcs12"}, "key_props":
+      "x509_props": {"subject": "C=US, ST=WA, L=Redmon, O=Test Noodle, OU=TestNugget,
-      {"exportable": true, "key_size": 2048, "kty": "RSA", "reuse_key": false}, "lifetime_actions":
+      CN=www.mytestdomain.com", "key_usage": ["digitalSignature", "nonRepudiation",
-      [{"action": {"action_type": "AutoRenew"}, "trigger": {"lifetime_percentage":
+      "keyEncipherment", "keyAgreement", "keyCertSign"], "validity_months": 60}, "attributes":
-      90}}], "issuer": {"name": "Self"}, "x509_props": {"validity_months": 60, "key_usage":
+      {"enabled": true}, "secret_props": {"contentType": "application/x-pkcs12"},
-      ["digitalSignature", "nonRepudiation", "keyEncipherment", "keyAgreement", "keyCertSign"],
+      "key_props": {"exportable": true, "key_size": 2048, "kty": "RSA", "reuse_key":
-      "subject": "C=US, ST=WA, L=Redmon, O=Test Noodle, OU=TestNugget, CN=www.mytestdomain.com"}}}'
+      false}, "lifetime_actions": [{"action": {"action_type": "AutoRenew"}, "trigger":
+      {"lifetime_percentage": 90}}]}}'
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Length: ['587']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 keyvaultclient/0.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
-      x-ms-client-request-id: [d5e30d9c-f945-11e6-8dc3-24f49a5003ca]
+      x-ms-client-request-id: [8a296f48-050a-11e7-90e4-a0b3ccf7272a]
     method: POST
     uri: https://vmcreatelinuxsecret3333.vault.azure.net/certificates/cert1/create?api-version=2016-10-01
   response:
@@ -98,50 +98,51 @@ interactions:
     headers:
       Cache-Control: [no-cache]
       Content-Length: ['0']
-      Date: ['Wed, 22 Feb 2017 21:28:22 GMT']
+      Date: ['Thu, 09 Mar 2017 20:54:07 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-IIS/8.5]
       Strict-Transport-Security: [max-age=31536000;includeSubDomains]
-      WWW-Authenticate: ['Bearer authorization="https://login.windows.net/9148c3a5-1e1b-4e0a-87c2-302229534991",
+      WWW-Authenticate: ['Bearer authorization="https://login.windows.net/54826b22-38d6-4fb2-bad9-b7b93a3e9c5a",
           resource="https://vault.azure.net"']
       X-AspNet-Version: [4.0.30319]
       X-Content-Type-Options: [nosniff]
       X-Powered-By: [ASP.NET]
       x-ms-keyvault-region: [westus]
-      x-ms-keyvault-service-version: [1.0.0.800]
+      x-ms-keyvault-service-version: [1.0.0.802]
     status: {code: 401, message: Unauthorized}
 - request:
-    body: '{"attributes": {"enabled": true}, "policy": {"attributes": {"enabled":
+    body: '{"attributes": {"enabled": true}, "policy": {"issuer": {"name": "Self"},
-      true}, "secret_props": {"contentType": "application/x-pkcs12"}, "key_props":
+      "x509_props": {"subject": "C=US, ST=WA, L=Redmon, O=Test Noodle, OU=TestNugget,
-      {"exportable": true, "key_size": 2048, "kty": "RSA", "reuse_key": false}, "lifetime_actions":
+      CN=www.mytestdomain.com", "key_usage": ["digitalSignature", "nonRepudiation",
-      [{"action": {"action_type": "AutoRenew"}, "trigger": {"lifetime_percentage":
+      "keyEncipherment", "keyAgreement", "keyCertSign"], "validity_months": 60}, "attributes":
-      90}}], "issuer": {"name": "Self"}, "x509_props": {"validity_months": 60, "key_usage":
+      {"enabled": true}, "secret_props": {"contentType": "application/x-pkcs12"},
-      ["digitalSignature", "nonRepudiation", "keyEncipherment", "keyAgreement", "keyCertSign"],
+      "key_props": {"exportable": true, "key_size": 2048, "kty": "RSA", "reuse_key":
-      "subject": "C=US, ST=WA, L=Redmon, O=Test Noodle, OU=TestNugget, CN=www.mytestdomain.com"}}}'
+      false}, "lifetime_actions": [{"action": {"action_type": "AutoRenew"}, "trigger":
+      {"lifetime_percentage": 90}}]}}'
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Length: ['587']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 keyvaultclient/0.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
-      x-ms-client-request-id: [d5e30d9c-f945-11e6-8dc3-24f49a5003ca]
+      x-ms-client-request-id: [8a296f48-050a-11e7-90e4-a0b3ccf7272a]
     method: POST
     uri: https://vmcreatelinuxsecret3333.vault.azure.net/certificates/cert1/create?api-version=2016-10-01
   response:
-    body: {string: '{"id":"https://vmcreatelinuxsecret3333.vault.azure.net/certificates/cert1/pending","issuer":{"name":"Self"},"csr":"MIIDBTCCAe0CAQAwdTEdMBsGA1UEAxMUd3d3Lm15dGVzdGRvbWFpbi5jb20xEzARBgNVBAsTClRlc3ROdWdnZXQxFDASBgNVBAoTC1Rlc3QgTm9vZGxlMQ8wDQYDVQQHEwZSZWRtb24xCzAJBgNVBAgTAldBMQswCQYDVQQGEwJVUzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPP9yOej/UusL1eGRK3eoOjQ0vpuUzSlNr7QWxvI9U95s713tfFAD5XWozb0VMeQKC5WprSNGgGmV8BbcCyxFjOp3xQPh1H/IlcR76su9z6MoC4n7hCkfOHEufGCIQvyLbAnecvF24nvbWrkX17SUrEyPI5UU+TAOxAajgVEgrHYInSlBGXCQxlVGXf8tLv1LwpEDcLhd2hV8MJ/y+4fVYUU3qwh0Vr8cCu/F0eQFKj4HsI5ATxvZhk/jN0SX2gf5t6wpiGZa5IcE082K+Ot6g6fsC6NRipiyqTlP1I3aFb9y6xChBQPg5C663mAfx7Ti2w1iz+yD65dlsyxDy95OuUCAwEAAaBLMEkGCSqGSIb3DQEJDjE8MDowDgYDVR0PAQH/BAQDAgLsMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAJBgNVHRMEAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQB2x/Eqo95Q2eNQL/KuXdM3SdsOwWRD3j0dLXE2EEiXch2tlpLB0XmljaRN+wtqIfeoCYaDfsdz+dpGrlpYYCY+K63G/f0TW2yiPEWQ27WePWUkyxd01xUuRmF2YEWzLGvTsb+bCSksYPypFpFzMBXGJNAyX6AY4kJ6Ot5rTx4UJBqNDOE3S0SUKsamnLDnBmNsVzone29RdknBeCqjOKpfwtCmcw43NH1ZW5iDgq82vi1WalQ6To1AY+4A/40Fsy5iu6KB/o343kuOb8oT6nS77XlzX9QaXsx+LNFu3zaIf3KJQSSXv5v0gUynFanFcTV4M40idnP2tBED+fLLvJfW","cancellation_requested":false,"status":"inProgress","status_details":"Pending
+    body: {string: '{"id":"https://vmcreatelinuxsecret3333.vault.azure.net/certificates/cert1/pending","issuer":{"name":"Self"},"csr":"MIIDBTCCAe0CAQAwdTEdMBsGA1UEAxMUd3d3Lm15dGVzdGRvbWFpbi5jb20xEzARBgNVBAsTClRlc3ROdWdnZXQxFDASBgNVBAoTC1Rlc3QgTm9vZGxlMQ8wDQYDVQQHEwZSZWRtb24xCzAJBgNVBAgTAldBMQswCQYDVQQGEwJVUzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKrpjHXGO07fQvLAnGCTqcIlhnFgryCmr8ptoJ4w933oxWQ3NecVUvQIIarhFDFlOa2LGhXfGs0DUttzBjcDTedWixqV2Jo2hFw6ruPix8r1nWwVCdXl9PirGLnTbs3v6o0BJg1SktEGgORc2ai/2H+ZfBS+lxV2rbcCMpnJkQ6RGEte1CQiiqDnSg++qHl2wFQn/ztWuZhW/ApxArVDJmvpf+nNuWHw1CjaBQ53xhFguxLA7C2e/vH4tW2CgwVZ1Dq64RorxvgJvXfo8nmJw7mPAOdGVA23Y1Q/0JqJzMuE/y52Y1i8+aGoXZmNNa5TDe2Sve+JxmgzHwGpcLKjFN8CAwEAAaBLMEkGCSqGSIb3DQEJDjE8MDowDgYDVR0PAQH/BAQDAgLsMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAJBgNVHRMEAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQBSZiR2n4xeUqEA2znbw7G8zYMRutLOW9+syg47/rjMbSefLy8CTgUuM5QscGV+600aUjlpRxqy4693SHi5L3gzbjo74rHHV0RPXQHs903kCIwlFawioDbVQaWvqqwM0jDNty98vpygQ4DYreRvqVwPztykWEAOETLy25kPshCZF6QCxWqyfn0jJOuSyzBoanEGz+awMQxxd3roB8TTDiPpQNxOjOHnqVKW7eZOZIkhaKTVLlLIolwrwwBCeNpM9PuzJkuNg4VNR74OgWFcOTc+PZFqeoF8jTm+f27eMFnVIUrUd9WkTJ0pzvh4Ear8EqDFV2U4wnnvYu75zhP/wsH1","cancellation_requested":false,"status":"inProgress","status_details":"Pending
         certificate created. Certificate request is in progress. This may take some
-        time based on the issuer provider. Please check again later.","request_id":"7f70f1426a3445cb9c0096c23c411489"}'}
+        time based on the issuer provider. Please check again later.","request_id":"45c1477af5a44a4c9bab7cd0e9bdb984"}'}
     headers:
       Cache-Control: [no-cache]
       Content-Length: ['1418']
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Wed, 22 Feb 2017 21:28:23 GMT']
+      Date: ['Thu, 09 Mar 2017 20:54:08 GMT']
       Expires: ['-1']
-      Location: ['https://vmcreatelinuxsecret3333.vault.azure.net/certificates/cert1/pending?api-version=2016-10-01&request_id=7f70f1426a3445cb9c0096c23c411489']
+      Location: ['https://vmcreatelinuxsecret3333.vault.azure.net/certificates/cert1/pending?api-version=2016-10-01&request_id=45c1477af5a44a4c9bab7cd0e9bdb984']
       Pragma: [no-cache]
       Server: [Microsoft-IIS/8.5]
       Strict-Transport-Security: [max-age=31536000;includeSubDomains]
@@ -149,7 +150,7 @@ interactions:
       X-Content-Type-Options: [nosniff]
       X-Powered-By: [ASP.NET]
       x-ms-keyvault-region: [westus]
-      x-ms-keyvault-service-version: [1.0.0.800]
+      x-ms-keyvault-service-version: [1.0.0.802]
     status: {code: 202, message: Accepted}
 - request:
     body: null
@@ -158,21 +159,21 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 keyvaultclient/0.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
-      x-ms-client-request-id: [d6a62234-f945-11e6-9065-24f49a5003ca]
+      x-ms-client-request-id: [8b74e0f0-050a-11e7-a92c-a0b3ccf7272a]
     method: GET
     uri: https://vmcreatelinuxsecret3333.vault.azure.net/certificates/cert1/pending?api-version=2016-10-01
   response:
-    body: {string: '{"id":"https://vmcreatelinuxsecret3333.vault.azure.net/certificates/cert1/pending","issuer":{"name":"Self"},"csr":"MIIDBTCCAe0CAQAwdTEdMBsGA1UEAxMUd3d3Lm15dGVzdGRvbWFpbi5jb20xEzARBgNVBAsTClRlc3ROdWdnZXQxFDASBgNVBAoTC1Rlc3QgTm9vZGxlMQ8wDQYDVQQHEwZSZWRtb24xCzAJBgNVBAgTAldBMQswCQYDVQQGEwJVUzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPP9yOej/UusL1eGRK3eoOjQ0vpuUzSlNr7QWxvI9U95s713tfFAD5XWozb0VMeQKC5WprSNGgGmV8BbcCyxFjOp3xQPh1H/IlcR76su9z6MoC4n7hCkfOHEufGCIQvyLbAnecvF24nvbWrkX17SUrEyPI5UU+TAOxAajgVEgrHYInSlBGXCQxlVGXf8tLv1LwpEDcLhd2hV8MJ/y+4fVYUU3qwh0Vr8cCu/F0eQFKj4HsI5ATxvZhk/jN0SX2gf5t6wpiGZa5IcE082K+Ot6g6fsC6NRipiyqTlP1I3aFb9y6xChBQPg5C663mAfx7Ti2w1iz+yD65dlsyxDy95OuUCAwEAAaBLMEkGCSqGSIb3DQEJDjE8MDowDgYDVR0PAQH/BAQDAgLsMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAJBgNVHRMEAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQB2x/Eqo95Q2eNQL/KuXdM3SdsOwWRD3j0dLXE2EEiXch2tlpLB0XmljaRN+wtqIfeoCYaDfsdz+dpGrlpYYCY+K63G/f0TW2yiPEWQ27WePWUkyxd01xUuRmF2YEWzLGvTsb+bCSksYPypFpFzMBXGJNAyX6AY4kJ6Ot5rTx4UJBqNDOE3S0SUKsamnLDnBmNsVzone29RdknBeCqjOKpfwtCmcw43NH1ZW5iDgq82vi1WalQ6To1AY+4A/40Fsy5iu6KB/o343kuOb8oT6nS77XlzX9QaXsx+LNFu3zaIf3KJQSSXv5v0gUynFanFcTV4M40idnP2tBED+fLLvJfW","cancellation_requested":false,"status":"inProgress","status_details":"Pending
+    body: {string: '{"id":"https://vmcreatelinuxsecret3333.vault.azure.net/certificates/cert1/pending","issuer":{"name":"Self"},"csr":"MIIDBTCCAe0CAQAwdTEdMBsGA1UEAxMUd3d3Lm15dGVzdGRvbWFpbi5jb20xEzARBgNVBAsTClRlc3ROdWdnZXQxFDASBgNVBAoTC1Rlc3QgTm9vZGxlMQ8wDQYDVQQHEwZSZWRtb24xCzAJBgNVBAgTAldBMQswCQYDVQQGEwJVUzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKrpjHXGO07fQvLAnGCTqcIlhnFgryCmr8ptoJ4w933oxWQ3NecVUvQIIarhFDFlOa2LGhXfGs0DUttzBjcDTedWixqV2Jo2hFw6ruPix8r1nWwVCdXl9PirGLnTbs3v6o0BJg1SktEGgORc2ai/2H+ZfBS+lxV2rbcCMpnJkQ6RGEte1CQiiqDnSg++qHl2wFQn/ztWuZhW/ApxArVDJmvpf+nNuWHw1CjaBQ53xhFguxLA7C2e/vH4tW2CgwVZ1Dq64RorxvgJvXfo8nmJw7mPAOdGVA23Y1Q/0JqJzMuE/y52Y1i8+aGoXZmNNa5TDe2Sve+JxmgzHwGpcLKjFN8CAwEAAaBLMEkGCSqGSIb3DQEJDjE8MDowDgYDVR0PAQH/BAQDAgLsMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAJBgNVHRMEAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQBSZiR2n4xeUqEA2znbw7G8zYMRutLOW9+syg47/rjMbSefLy8CTgUuM5QscGV+600aUjlpRxqy4693SHi5L3gzbjo74rHHV0RPXQHs903kCIwlFawioDbVQaWvqqwM0jDNty98vpygQ4DYreRvqVwPztykWEAOETLy25kPshCZF6QCxWqyfn0jJOuSyzBoanEGz+awMQxxd3roB8TTDiPpQNxOjOHnqVKW7eZOZIkhaKTVLlLIolwrwwBCeNpM9PuzJkuNg4VNR74OgWFcOTc+PZFqeoF8jTm+f27eMFnVIUrUd9WkTJ0pzvh4Ear8EqDFV2U4wnnvYu75zhP/wsH1","cancellation_requested":false,"status":"inProgress","status_details":"Pending
         certificate created. Certificate request is in progress. This may take some
-        time based on the issuer provider. Please check again later.","request_id":"7f70f1426a3445cb9c0096c23c411489"}'}
+        time based on the issuer provider. Please check again later.","request_id":"45c1477af5a44a4c9bab7cd0e9bdb984"}'}
     headers:
       Cache-Control: [no-cache]
       Content-Length: ['1418']
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Wed, 22 Feb 2017 21:28:21 GMT']
+      Date: ['Thu, 09 Mar 2017 20:54:09 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-IIS/8.5]
@@ -181,7 +182,7 @@ interactions:
       X-Content-Type-Options: [nosniff]
       X-Powered-By: [ASP.NET]
       x-ms-keyvault-region: [westus]
-      x-ms-keyvault-service-version: [1.0.0.800]
+      x-ms-keyvault-service-version: [1.0.0.802]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -190,21 +191,21 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 keyvaultclient/0.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
-      x-ms-client-request-id: [dcb30b88-f945-11e6-b4bd-24f49a5003ca]
+      x-ms-client-request-id: [91888766-050a-11e7-a71e-a0b3ccf7272a]
     method: GET
     uri: https://vmcreatelinuxsecret3333.vault.azure.net/certificates/cert1/pending?api-version=2016-10-01
   response:
-    body: {string: '{"id":"https://vmcreatelinuxsecret3333.vault.azure.net/certificates/cert1/pending","issuer":{"name":"Self"},"csr":"MIIDBTCCAe0CAQAwdTEdMBsGA1UEAxMUd3d3Lm15dGVzdGRvbWFpbi5jb20xEzARBgNVBAsTClRlc3ROdWdnZXQxFDASBgNVBAoTC1Rlc3QgTm9vZGxlMQ8wDQYDVQQHEwZSZWRtb24xCzAJBgNVBAgTAldBMQswCQYDVQQGEwJVUzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPP9yOej/UusL1eGRK3eoOjQ0vpuUzSlNr7QWxvI9U95s713tfFAD5XWozb0VMeQKC5WprSNGgGmV8BbcCyxFjOp3xQPh1H/IlcR76su9z6MoC4n7hCkfOHEufGCIQvyLbAnecvF24nvbWrkX17SUrEyPI5UU+TAOxAajgVEgrHYInSlBGXCQxlVGXf8tLv1LwpEDcLhd2hV8MJ/y+4fVYUU3qwh0Vr8cCu/F0eQFKj4HsI5ATxvZhk/jN0SX2gf5t6wpiGZa5IcE082K+Ot6g6fsC6NRipiyqTlP1I3aFb9y6xChBQPg5C663mAfx7Ti2w1iz+yD65dlsyxDy95OuUCAwEAAaBLMEkGCSqGSIb3DQEJDjE8MDowDgYDVR0PAQH/BAQDAgLsMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAJBgNVHRMEAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQB2x/Eqo95Q2eNQL/KuXdM3SdsOwWRD3j0dLXE2EEiXch2tlpLB0XmljaRN+wtqIfeoCYaDfsdz+dpGrlpYYCY+K63G/f0TW2yiPEWQ27WePWUkyxd01xUuRmF2YEWzLGvTsb+bCSksYPypFpFzMBXGJNAyX6AY4kJ6Ot5rTx4UJBqNDOE3S0SUKsamnLDnBmNsVzone29RdknBeCqjOKpfwtCmcw43NH1ZW5iDgq82vi1WalQ6To1AY+4A/40Fsy5iu6KB/o343kuOb8oT6nS77XlzX9QaXsx+LNFu3zaIf3KJQSSXv5v0gUynFanFcTV4M40idnP2tBED+fLLvJfW","cancellation_requested":false,"status":"inProgress","status_details":"Pending
+    body: {string: '{"id":"https://vmcreatelinuxsecret3333.vault.azure.net/certificates/cert1/pending","issuer":{"name":"Self"},"csr":"MIIDBTCCAe0CAQAwdTEdMBsGA1UEAxMUd3d3Lm15dGVzdGRvbWFpbi5jb20xEzARBgNVBAsTClRlc3ROdWdnZXQxFDASBgNVBAoTC1Rlc3QgTm9vZGxlMQ8wDQYDVQQHEwZSZWRtb24xCzAJBgNVBAgTAldBMQswCQYDVQQGEwJVUzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKrpjHXGO07fQvLAnGCTqcIlhnFgryCmr8ptoJ4w933oxWQ3NecVUvQIIarhFDFlOa2LGhXfGs0DUttzBjcDTedWixqV2Jo2hFw6ruPix8r1nWwVCdXl9PirGLnTbs3v6o0BJg1SktEGgORc2ai/2H+ZfBS+lxV2rbcCMpnJkQ6RGEte1CQiiqDnSg++qHl2wFQn/ztWuZhW/ApxArVDJmvpf+nNuWHw1CjaBQ53xhFguxLA7C2e/vH4tW2CgwVZ1Dq64RorxvgJvXfo8nmJw7mPAOdGVA23Y1Q/0JqJzMuE/y52Y1i8+aGoXZmNNa5TDe2Sve+JxmgzHwGpcLKjFN8CAwEAAaBLMEkGCSqGSIb3DQEJDjE8MDowDgYDVR0PAQH/BAQDAgLsMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAJBgNVHRMEAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQBSZiR2n4xeUqEA2znbw7G8zYMRutLOW9+syg47/rjMbSefLy8CTgUuM5QscGV+600aUjlpRxqy4693SHi5L3gzbjo74rHHV0RPXQHs903kCIwlFawioDbVQaWvqqwM0jDNty98vpygQ4DYreRvqVwPztykWEAOETLy25kPshCZF6QCxWqyfn0jJOuSyzBoanEGz+awMQxxd3roB8TTDiPpQNxOjOHnqVKW7eZOZIkhaKTVLlLIolwrwwBCeNpM9PuzJkuNg4VNR74OgWFcOTc+PZFqeoF8jTm+f27eMFnVIUrUd9WkTJ0pzvh4Ear8EqDFV2U4wnnvYu75zhP/wsH1","cancellation_requested":false,"status":"inProgress","status_details":"Pending
         certificate created. Certificate request is in progress. This may take some
-        time based on the issuer provider. Please check again later.","request_id":"7f70f1426a3445cb9c0096c23c411489"}'}
+        time based on the issuer provider. Please check again later.","request_id":"45c1477af5a44a4c9bab7cd0e9bdb984"}'}
     headers:
       Cache-Control: [no-cache]
       Content-Length: ['1418']
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Wed, 22 Feb 2017 21:28:33 GMT']
+      Date: ['Thu, 09 Mar 2017 20:54:20 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-IIS/8.5]
@@ -213,7 +214,7 @@ interactions:
       X-Content-Type-Options: [nosniff]
       X-Powered-By: [ASP.NET]
       x-ms-keyvault-region: [westus]
-      x-ms-keyvault-service-version: [1.0.0.800]
+      x-ms-keyvault-service-version: [1.0.0.802]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -222,19 +223,19 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 keyvaultclient/0.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
-      x-ms-client-request-id: [e2c754de-f945-11e6-9a3e-24f49a5003ca]
+      x-ms-client-request-id: [97e2aaa6-050a-11e7-883a-a0b3ccf7272a]
     method: GET
     uri: https://vmcreatelinuxsecret3333.vault.azure.net/certificates/cert1/pending?api-version=2016-10-01
   response:
-    body: {string: '{"id":"https://vmcreatelinuxsecret3333.vault.azure.net/certificates/cert1/pending","issuer":{"name":"Self"},"csr":"MIIDBTCCAe0CAQAwdTEdMBsGA1UEAxMUd3d3Lm15dGVzdGRvbWFpbi5jb20xEzARBgNVBAsTClRlc3ROdWdnZXQxFDASBgNVBAoTC1Rlc3QgTm9vZGxlMQ8wDQYDVQQHEwZSZWRtb24xCzAJBgNVBAgTAldBMQswCQYDVQQGEwJVUzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPP9yOej/UusL1eGRK3eoOjQ0vpuUzSlNr7QWxvI9U95s713tfFAD5XWozb0VMeQKC5WprSNGgGmV8BbcCyxFjOp3xQPh1H/IlcR76su9z6MoC4n7hCkfOHEufGCIQvyLbAnecvF24nvbWrkX17SUrEyPI5UU+TAOxAajgVEgrHYInSlBGXCQxlVGXf8tLv1LwpEDcLhd2hV8MJ/y+4fVYUU3qwh0Vr8cCu/F0eQFKj4HsI5ATxvZhk/jN0SX2gf5t6wpiGZa5IcE082K+Ot6g6fsC6NRipiyqTlP1I3aFb9y6xChBQPg5C663mAfx7Ti2w1iz+yD65dlsyxDy95OuUCAwEAAaBLMEkGCSqGSIb3DQEJDjE8MDowDgYDVR0PAQH/BAQDAgLsMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAJBgNVHRMEAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQB2x/Eqo95Q2eNQL/KuXdM3SdsOwWRD3j0dLXE2EEiXch2tlpLB0XmljaRN+wtqIfeoCYaDfsdz+dpGrlpYYCY+K63G/f0TW2yiPEWQ27WePWUkyxd01xUuRmF2YEWzLGvTsb+bCSksYPypFpFzMBXGJNAyX6AY4kJ6Ot5rTx4UJBqNDOE3S0SUKsamnLDnBmNsVzone29RdknBeCqjOKpfwtCmcw43NH1ZW5iDgq82vi1WalQ6To1AY+4A/40Fsy5iu6KB/o343kuOb8oT6nS77XlzX9QaXsx+LNFu3zaIf3KJQSSXv5v0gUynFanFcTV4M40idnP2tBED+fLLvJfW","cancellation_requested":false,"status":"completed","target":"https://vmcreatelinuxsecret3333.vault.azure.net/certificates/cert1","request_id":"7f70f1426a3445cb9c0096c23c411489"}'}
+    body: {string: '{"id":"https://vmcreatelinuxsecret3333.vault.azure.net/certificates/cert1/pending","issuer":{"name":"Self"},"csr":"MIIDBTCCAe0CAQAwdTEdMBsGA1UEAxMUd3d3Lm15dGVzdGRvbWFpbi5jb20xEzARBgNVBAsTClRlc3ROdWdnZXQxFDASBgNVBAoTC1Rlc3QgTm9vZGxlMQ8wDQYDVQQHEwZSZWRtb24xCzAJBgNVBAgTAldBMQswCQYDVQQGEwJVUzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKrpjHXGO07fQvLAnGCTqcIlhnFgryCmr8ptoJ4w933oxWQ3NecVUvQIIarhFDFlOa2LGhXfGs0DUttzBjcDTedWixqV2Jo2hFw6ruPix8r1nWwVCdXl9PirGLnTbs3v6o0BJg1SktEGgORc2ai/2H+ZfBS+lxV2rbcCMpnJkQ6RGEte1CQiiqDnSg++qHl2wFQn/ztWuZhW/ApxArVDJmvpf+nNuWHw1CjaBQ53xhFguxLA7C2e/vH4tW2CgwVZ1Dq64RorxvgJvXfo8nmJw7mPAOdGVA23Y1Q/0JqJzMuE/y52Y1i8+aGoXZmNNa5TDe2Sve+JxmgzHwGpcLKjFN8CAwEAAaBLMEkGCSqGSIb3DQEJDjE8MDowDgYDVR0PAQH/BAQDAgLsMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAJBgNVHRMEAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQBSZiR2n4xeUqEA2znbw7G8zYMRutLOW9+syg47/rjMbSefLy8CTgUuM5QscGV+600aUjlpRxqy4693SHi5L3gzbjo74rHHV0RPXQHs903kCIwlFawioDbVQaWvqqwM0jDNty98vpygQ4DYreRvqVwPztykWEAOETLy25kPshCZF6QCxWqyfn0jJOuSyzBoanEGz+awMQxxd3roB8TTDiPpQNxOjOHnqVKW7eZOZIkhaKTVLlLIolwrwwBCeNpM9PuzJkuNg4VNR74OgWFcOTc+PZFqeoF8jTm+f27eMFnVIUrUd9WkTJ0pzvh4Ear8EqDFV2U4wnnvYu75zhP/wsH1","cancellation_requested":false,"status":"completed","target":"https://vmcreatelinuxsecret3333.vault.azure.net/certificates/cert1","request_id":"45c1477af5a44a4c9bab7cd0e9bdb984"}'}
     headers:
       Cache-Control: [no-cache]
       Content-Length: ['1331']
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Wed, 22 Feb 2017 21:28:45 GMT']
+      Date: ['Thu, 09 Mar 2017 20:54:30 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-IIS/8.5]
@@ -243,7 +244,7 @@ interactions:
       X-Content-Type-Options: [nosniff]
       X-Powered-By: [ASP.NET]
       x-ms-keyvault-region: [westus]
-      x-ms-keyvault-service-version: [1.0.0.800]
+      x-ms-keyvault-service-version: [1.0.0.802]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -252,19 +253,19 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 keyvaultclient/0.1.0 Azure-SDK-For-Python]
       accept-language: [en-US]
-      x-ms-client-request-id: [e39e833e-f945-11e6-b360-24f49a5003ca]
+      x-ms-client-request-id: [98605a5e-050a-11e7-8b85-a0b3ccf7272a]
     method: GET
     uri: https://vmcreatelinuxsecret3333.vault.azure.net/secrets/cert1/versions?api-version=2016-10-01
   response:
-    body: {string: '{"value":[{"contentType":"application/x-pkcs12","id":"https://vmcreatelinuxsecret3333.vault.azure.net/secrets/cert1/52bc666854c044c996a82ce6482a1cd1","managed":true,"attributes":{"enabled":false,"nbf":1487798303,"exp":1645565303,"created":1487798904,"updated":1487798904}},{"contentType":"application/x-pkcs12","id":"https://vmcreatelinuxsecret3333.vault.azure.net/secrets/cert1/8ce387980c8d4d1e9b8d8980dff93f92","managed":true,"attributes":{"enabled":true,"nbf":1487798316,"exp":1645565316,"created":1487798917,"updated":1487798917}}],"nextLink":null}'}
+    body: {string: '{"value":[{"contentType":"application/x-pkcs12","id":"https://vmcreatelinuxsecret3333.vault.azure.net/secrets/cert1/6b6e10412fc54a0284bb4c6bc2ca9519","managed":true,"attributes":{"enabled":true,"nbf":1489092260,"exp":1646859260,"created":1489092861,"updated":1489092861}},{"contentType":"application/x-pkcs12","id":"https://vmcreatelinuxsecret3333.vault.azure.net/secrets/cert1/74a3528a979e43ae969dbd5addfa2877","managed":true,"attributes":{"enabled":false,"nbf":1489092247,"exp":1646859247,"created":1489092848,"updated":1489092848}}],"nextLink":null}'}
     headers:
       Cache-Control: [no-cache]
       Content-Length: ['552']
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Wed, 22 Feb 2017 21:28:42 GMT']
+      Date: ['Thu, 09 Mar 2017 20:54:31 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-IIS/8.5]
@@ -273,7 +274,7 @@ interactions:
       X-Content-Type-Options: [nosniff]
       X-Powered-By: [ASP.NET]
       x-ms-keyvault-region: [westus]
-      x-ms-keyvault-service-version: [1.0.0.800]
+      x-ms-keyvault-service-version: [1.0.0.802]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -282,24 +283,24 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 keyvaultmanagementclient/0.30.0 Azure-SDK-For-Python
-          AZURECLI/TEST/0.1.2rc1+dev]
+          AZURECLI/TEST/2.0.0+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [e49566fe-f945-11e6-9a5d-24f49a5003ca]
+      x-ms-client-request-id: [98dd1108-050a-11e7-a707-a0b3ccf7272a]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resources?api-version=2015-11-01&$filter=resourceType%20eq%20%27Microsoft.KeyVault%2Fvaults%27
   response:
-    body: {string: '{"value":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.KeyVault/vaults/vmcreatelinuxsecret3333","name":"vmcreatelinuxsecret3333","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{}}]}'}
+    body: {string: '{"value":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.KeyVault/vaults/vmcreatelinuxsecret3333","name":"vmcreatelinuxsecret3333","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{}},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/tjp-kv/providers/Microsoft.KeyVault/vaults/python-sdk-test-keyvault","name":"python-sdk-test-keyvault","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{}},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/tjp-kv/providers/Microsoft.KeyVault/vaults/tjpkeyvault3","name":"tjpkeyvault3","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{}}]}'}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Wed, 22 Feb 2017 21:28:46 GMT']
+      Date: ['Thu, 09 Mar 2017 20:54:33 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
       Vary: [Accept-Encoding]
-      content-length: ['286']
+      content-length: ['748']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -308,19 +309,19 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 keyvaultmanagementclient/0.30.0 Azure-SDK-For-Python
-          AZURECLI/TEST/0.1.2rc1+dev]
+          AZURECLI/TEST/2.0.0+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [e4be6750-f945-11e6-a718-24f49a5003ca]
+      x-ms-client-request-id: [98ed4fde-050a-11e7-9e81-a0b3ccf7272a]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.KeyVault/vaults/vmcreatelinuxsecret3333?api-version=2015-06-01
   response:
-    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.KeyVault/vaults/vmcreatelinuxsecret3333","name":"vmcreatelinuxsecret3333","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{},"properties":{"sku":{"family":"A","name":"standard"},"tenantId":"9148c3a5-1e1b-4e0a-87c2-302229534991","accessPolicies":[{"tenantId":"9148c3a5-1e1b-4e0a-87c2-302229534991","objectId":"882b503c-c281-4fe9-a85c-d9e0cd66d376","permissions":{"keys":["get","create","delete","list","update","import","backup","restore"],"secrets":["all"],"certificates":["all"]}}],"enabledForDeployment":true,"enabledForTemplateDeployment":true,"vaultUri":"https://vmcreatelinuxsecret3333.vault.azure.net/"}}'}
+    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.KeyVault/vaults/vmcreatelinuxsecret3333","name":"vmcreatelinuxsecret3333","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{},"properties":{"sku":{"family":"A","name":"standard"},"tenantId":"54826b22-38d6-4fb2-bad9-b7b93a3e9c5a","accessPolicies":[{"tenantId":"54826b22-38d6-4fb2-bad9-b7b93a3e9c5a","objectId":"5963f50c-7c43-405c-af7e-53294de76abd","permissions":{"secrets":["all"],"certificates":["all"],"keys":["get","create","delete","list","update","import","backup","restore"]}}],"enabledForDeployment":true,"enabledForTemplateDeployment":true,"vaultUri":"https://vmcreatelinuxsecret3333.vault.azure.net/"}}'}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Wed, 22 Feb 2017 21:28:46 GMT']
+      Date: ['Thu, 09 Mar 2017 20:54:32 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-IIS/8.5]
@@ -331,7 +332,7 @@ interactions:
       X-Content-Type-Options: [nosniff]
       X-Powered-By: [ASP.NET]
       content-length: ['759']
-      x-ms-keyvault-service-version: [1.0.0.151]
+      x-ms-keyvault-service-version: [1.0.0.153]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -340,11 +341,11 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 resourcemanagementclient/0.30.2 Azure-SDK-For-Python
-          AZURECLI/TEST/0.1.2rc1+dev]
+          AZURECLI/TEST/2.0.0+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [e5a3a612-f945-11e6-a5e9-24f49a5003ca]
+      x-ms-client-request-id: [995e562c-050a-11e7-a912-a0b3ccf7272a]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_vmss_create_linux_secrets?api-version=2016-09-01
   response:
@@ -352,7 +353,7 @@ interactions:
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Wed, 22 Feb 2017 21:28:47 GMT']
+      Date: ['Thu, 09 Mar 2017 20:54:33 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
@@ -368,50 +369,52 @@ interactions:
     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\",\n
+    body: {string: "{\n  \"$schema\":\"http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json\"\
-        \ \"contentVersion\":\"1.0.0.0\",\n  \"parameters\":{},\n  \"variables\":{},\n
+        ,\n  \"contentVersion\":\"1.0.0.0\",\n  \"parameters\":{},\n  \"variables\"\
-        \ \"resources\":[],\n\n  \"outputs\":{\n    \"aliases\":{\n      \"metadata\":{\n
+        :{},\n  \"resources\":[],\n\n  \"outputs\":{\n    \"aliases\":{\n      \"\
-        \       \"description\":\"This list of aliases is used by Azure XPLAT CLI,
+        type\":\"object\",\n      \"value\":{\n\n        \"Linux\":{\n          \"\
-        Azure Powershell, and Azure Portal as shorthands for commonly used VM images.
+        CentOS\":{\n            \"publisher\":\"OpenLogic\",\n            \"offer\"\
-        If you change this file, please verify that this doesn't break VMSS creation
+        :\"CentOS\",\n            \"sku\":\"7.3\",\n            \"version\":\"latest\"\
-        from Portal :).\"\n      },\n      \"type\":\"object\",\n      \"value\":{\n\n
+        \n          },\n          \"CoreOS\":{\n            \"publisher\":\"CoreOS\"\
-        \       \"Linux\":{\n          \"CentOS\":{\n            \"publisher\":\"OpenLogic\",\n
+        ,\n            \"offer\":\"CoreOS\",\n            \"sku\":\"Stable\",\n  \
-        \           \"offer\":\"CentOS\",\n            \"sku\":\"7.2\",\n            \"version\":\"latest\"\n
+        \          \"version\":\"latest\"\n          },\n          \"Debian\":{\n\
-        \         },\n          \"CoreOS\":{\n            \"publisher\":\"CoreOS\",\n
+        \            \"publisher\":\"credativ\",\n            \"offer\":\"Debian\"\
-        \           \"offer\":\"CoreOS\",\n            \"sku\":\"Stable\",\n            \"version\":\"latest\"\n
+        ,\n            \"sku\":\"8\",\n            \"version\":\"latest\"\n      \
-        \         },\n          \"Debian\":{\n            \"publisher\":\"credativ\",\n
+        \    },\n          \"openSUSE-Leap\": {\n            \"publisher\":\"SUSE\"\
-        \           \"offer\":\"Debian\",\n            \"sku\":\"8\",\n            \"version\":\"latest\"\n
+        ,\n            \"offer\":\"openSUSE-Leap\",\n            \"sku\":\"42.2\"\
-        \         },\n          \"openSUSE\":{\n            \"publisher\":\"SUSE\",\n
+        ,\n            \"version\": \"latest\"\n          },\n          \"RHEL\":{\n\
-        \           \"offer\":\"openSUSE\",\n            \"sku\":\"13.2\",\n            \"version\":\"latest\"\n
+        \            \"publisher\":\"RedHat\",\n            \"offer\":\"RHEL\",\n\
-        \         },\n          \"RHEL\":{\n            \"publisher\":\"RedHat\",\n
+        \            \"sku\":\"7.3\",\n            \"version\":\"latest\"\n      \
-        \           \"offer\":\"RHEL\",\n            \"sku\":\"7.2\",\n            \"version\":\"latest\"\n
+        \    },\n          \"SLES\":{\n            \"publisher\":\"SUSE\",\n     \
-        \         },\n          \"SLES\":{\n            \"publisher\":\"SUSE\",\n
+        \       \"offer\":\"SLES\",\n            \"sku\":\"12-SP2\",\n           \
-        \           \"offer\":\"SLES\",\n            \"sku\":\"12-SP1\",\n            \"version\":\"latest\"\n
+        \ \"version\":\"latest\"\n          },\n          \"UbuntuLTS\":{\n      \
-        \         },\n          \"UbuntuLTS\":{\n            \"publisher\":\"Canonical\",\n
+        \      \"publisher\":\"Canonical\",\n            \"offer\":\"UbuntuServer\"\
-        \           \"offer\":\"UbuntuServer\",\n            \"sku\":\"14.04.4-LTS\",\n
+        ,\n            \"sku\":\"16.04-LTS\",\n            \"version\":\"latest\"\n\
-        \           \"version\":\"latest\"\n          }\n        },\n\n        \"Windows\":{\n
+        \          }\n        },\n\n        \"Windows\":{\n          \"Win2016Datacenter\"\
-        \         \"Win2016Datacenter\":{\n            \"publisher\":\"MicrosoftWindowsServer\",\n
+        :{\n            \"publisher\":\"MicrosoftWindowsServer\",\n            \"\
-        \           \"offer\":\"WindowsServer\",\n            \"sku\":\"2016-Datacenter\",\n
+        offer\":\"WindowsServer\",\n            \"sku\":\"2016-Datacenter\",\n   \
-        \           \"version\":\"latest\"\n          },\n          \"Win2012R2Datacenter\":{\n
+        \         \"version\":\"latest\"\n          },\n          \"Win2012R2Datacenter\"\
-        \           \"publisher\":\"MicrosoftWindowsServer\",\n            \"offer\":\"WindowsServer\",\n
+        :{\n            \"publisher\":\"MicrosoftWindowsServer\",\n            \"\
-        \           \"sku\":\"2012-R2-Datacenter\",\n            \"version\":\"latest\"\n
+        offer\":\"WindowsServer\",\n            \"sku\":\"2012-R2-Datacenter\",\n\
-        \         },\n          \"Win2012Datacenter\":{\n            \"publisher\":\"MicrosoftWindowsServer\",\n
+        \            \"version\":\"latest\"\n          },\n          \"Win2012Datacenter\"\
-        \           \"offer\":\"WindowsServer\",\n            \"sku\":\"2012-Datacenter\",\n
+        :{\n            \"publisher\":\"MicrosoftWindowsServer\",\n            \"\
-        \           \"version\":\"latest\"\n          },\n          \"Win2008R2SP1\":{\n
+        offer\":\"WindowsServer\",\n            \"sku\":\"2012-Datacenter\",\n   \
-        \           \"publisher\":\"MicrosoftWindowsServer\",\n            \"offer\":\"WindowsServer\",\n
+        \         \"version\":\"latest\"\n          },\n          \"Win2008R2SP1\"\
-        \           \"sku\":\"2008-R2-SP1\",\n            \"version\":\"latest\"\n
+        :{\n            \"publisher\":\"MicrosoftWindowsServer\",\n            \"\
-        \         }\n        }\n      }\n    }\n  }\n}\n"}
+        offer\":\"WindowsServer\",\n            \"sku\":\"2008-R2-SP1\",\n       \
+        \     \"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: ['2497']
+      Content-Length: ['2235']
       Content-Security-Policy: [default-src 'none'; style-src 'unsafe-inline']
       Content-Type: [text/plain; charset=utf-8]
-      Date: ['Wed, 22 Feb 2017 21:28:52 GMT']
+      Date: ['Thu, 09 Mar 2017 20:54:34 GMT']
-      ETag: ['"176c0a6aa96be3f7c227ab95161b3f5317b72a64"']
+      ETag: ['"d6824855d13e27c5258a680eb60f635d088fd05e"']
-      Expires: ['Wed, 22 Feb 2017 21:33:52 GMT']
+      Expires: ['Thu, 09 Mar 2017 20:59:34 GMT']
       Source-Age: ['0']
       Strict-Transport-Security: [max-age=31536000]
       Vary: ['Authorization,Accept-Encoding']
@@ -419,12 +422,12 @@ interactions:
       X-Cache: [MISS]
       X-Cache-Hits: ['0']
       X-Content-Type-Options: [nosniff]
-      X-Fastly-Request-ID: [5ba540b25e853b445e53391f70797e0ac46096ff]
+      X-Fastly-Request-ID: [5c03cd0f550e3695d1ea5dab3afdaccca51c5e1c]
       X-Frame-Options: [deny]
       X-Geo-Block-List: ['']
-      X-GitHub-Request-Id: ['C54C:6244:422D0D3:4464169:58AE0294']
+      X-GitHub-Request-Id: ['F5F6:6DC5:57D38:5A958:58C1C10A']
-      X-Served-By: [cache-sjc3135-SJC]
+      X-Served-By: [cache-sea1021-SEA]
-      X-Timer: ['S1487798932.396475,VS0,VE91']
+      X-Timer: ['S1489092874.206708,VS0,VE113']
       X-XSS-Protection: [1; mode=block]
     status: {code: 200, message: OK}
 - request:
@@ -434,10 +437,10 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
-          msrest_azure/0.4.7 networkmanagementclient/0.30.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.2rc1+dev]
+          msrest_azure/0.4.7 networkmanagementclient/0.30.0 Azure-SDK-For-Python AZURECLI/TEST/2.0.0+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [e834fd0c-f945-11e6-84ac-24f49a5003ca]
+      x-ms-client-request-id: [99a3ef52-050a-11e7-a7e3-a0b3ccf7272a]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Network/virtualNetworks?api-version=2016-09-01
   response:
@@ -445,7 +448,7 @@ interactions:
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Wed, 22 Feb 2017 21:28:52 GMT']
+      Date: ['Thu, 09 Mar 2017 20:54:34 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
@@ -453,76 +456,77 @@ interactions:
       content-length: ['12']
     status: {code: 200, message: OK}
 - request:
-    body: '{"properties": {"mode": "Incremental", "template": {"contentVersion": "1.0.0.0",
+    body: '{"properties": {"template": {"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
-      "variables": {"vhdContainers": ["[concat(''https://'', variables(''storageAccountNames'')[0],
+      "resources": [{"dependsOn": [], "properties": {"addressSpace": {"addressPrefixes":
-      ''.blob.core.windows.net/vhds'')]", "[concat(''https://'', variables(''storageAccountNames'')[1],
+      ["10.0.0.0/16"]}, "subnets": [{"properties": {"addressPrefix": "10.0.0.0/24"},
-      ''.blob.core.windows.net/vhds'')]", "[concat(''https://'', variables(''storageAccountNames'')[2],
+      "name": "vmss1-nameSubnet"}]}, "apiVersion": "2015-06-15", "location": "westus",
-      ''.blob.core.windows.net/vhds'')]", "[concat(''https://'', variables(''storageAccountNames'')[3],
+      "tags": {}, "type": "Microsoft.Network/virtualNetworks", "name": "vmss1-nameVNET"},
-      ''.blob.core.windows.net/vhds'')]", "[concat(''https://'', variables(''storageAccountNames'')[4],
+      {"dependsOn": [], "properties": {"publicIPAllocationMethod": "dynamic"}, "name":
-      ''.blob.core.windows.net/vhds'')]"], "storageAccountNames": ["vmss1hiti0", "vmss1hiti1",
+      "vmss1-nameLBPublicIP", "location": "westus", "tags": {}, "type": "Microsoft.Network/publicIPAddresses",
-      "vmss1hiti2", "vmss1hiti3", "vmss1hiti4"]}, "outputs": {"VMSS": {"value": "[reference(resourceId(''Microsoft.Compute/virtualMachineScaleSets'',
+      "apiVersion": "2015-06-15"}, {"dependsOn": ["Microsoft.Network/publicIpAddresses/vmss1-nameLBPublicIP"],
+      "properties": {"frontendIPConfigurations": [{"properties": {"publicIPAddress":
+      {"id": "/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Network/publicIPAddresses/vmss1-nameLBPublicIP"}},
+      "name": "loadBalancerFrontEnd"}], "inboundNatPools": [{"properties": {"protocol":
+      "tcp", "backendPort": 22, "frontendIPConfiguration": {"id": "[concat(resourceId(''Microsoft.Network/loadBalancers'',
+      ''vmss1-nameLB''), ''/frontendIPConfigurations/'', ''loadBalancerFrontEnd'')]"},
+      "frontendPortRangeEnd": "50119", "frontendPortRangeStart": "50000"}, "name":
+      "vmss1-nameLBNatPool"}], "backendAddressPools": [{"name": "vmss1-nameLBBEPool"}]},
+      "name": "vmss1-nameLB", "location": "westus", "tags": {}, "type": "Microsoft.Network/loadBalancers",
+      "apiVersion": "2015-06-15"}, {"dependsOn": ["Microsoft.Network/virtualNetworks/vmss1-nameVNET",
+      "Microsoft.Network/loadBalancers/vmss1-nameLB"], "properties": {"singlePlacementGroup":
+      true, "upgradePolicy": {"mode": "Manual"}, "virtualMachineProfile": {"storageProfile":
+      {"imageReference": {"publisher": "credativ", "version": "latest", "offer": "Debian",
+      "sku": "8"}, "osDisk": {"createOption": "FromImage", "managedDisk": {"storageAccountType":
+      "Standard_LRS"}, "caching": "ReadOnly"}}, "networkProfile": {"networkInterfaceConfigurations":
+      [{"properties": {"primary": "true", "ipConfigurations": [{"properties": {"loadBalancerBackendAddressPools":
+      [{"id": "/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Network/loadBalancers/vmss1-nameLB/backendAddressPools/vmss1-nameLBBEPool"}],
+      "loadBalancerInboundNatPools": [{"id": "/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Network/loadBalancers/vmss1-nameLB/inboundNatPools/vmss1-nameLBNatPool"}],
+      "subnet": {"id": "/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Network/virtualNetworks/vmss1-nameVNET/subnets/vmss1-nameSubnet"}},
+      "name": "vmss1dmubIPConfig"}]}, "name": "vmss1dmubNic"}]}, "osProfile": {"secrets":
+      [{"sourceVault": {"id": "/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.KeyVault/vaults/vmcreatelinuxsecret3333"},
+      "vaultCertificates": [{"certificateUrl": "https://vmcreatelinuxsecret3333.vault.azure.net/secrets/cert1/6b6e10412fc54a0284bb4c6bc2ca9519"}]}],
+      "adminUsername": "deploy", "linuxConfiguration": {"disablePasswordAuthentication":
+      true, "ssh": {"publicKeys": [{"path": "/home/deploy/.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"}]}}, "computerNamePrefix": "vmss1dmub"}}, "overprovision":
+      true}, "sku": {"tier": "Standard", "name": "Standard_D1_v2", "capacity": 2},
+      "name": "vmss1-name", "location": "westus", "tags": {}, "type": "Microsoft.Compute/virtualMachineScaleSets",
+      "apiVersion": "2016-04-30-preview"}], "variables": {"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'')]"],
+      "storageAccountNames": ["vmss1dmub0", "vmss1dmub1", "vmss1dmub2", "vmss1dmub3",
+      "vmss1dmub4"]}, "contentVersion": "1.0.0.0", "parameters": {}, "outputs": {"VMSS":
+      {"value": "[reference(resourceId(''Microsoft.Compute/virtualMachineScaleSets'',
       ''vmss1-name''),providers(''Microsoft.Compute'', ''virtualMachineScaleSets'').apiVersions[0])]",
-      "type": "object"}}, "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+      "type": "object"}}}, "parameters": {}, "mode": "Incremental"}}'
-      "resources": [{"tags": {}, "properties": {"subnets": [{"properties": {"addressPrefix":
-      "10.0.0.0/24"}, "name": "vmss1-nameSubnet"}], "addressSpace": {"addressPrefixes":
-      ["10.0.0.0/16"]}}, "type": "Microsoft.Network/virtualNetworks", "location":
-      "westus", "apiVersion": "2015-06-15", "dependsOn": [], "name": "vmss1-nameVNET"},
-      {"tags": {}, "properties": {"publicIPAllocationMethod": "dynamic"}, "type":
-      "Microsoft.Network/publicIPAddresses", "location": "westus", "apiVersion": "2015-06-15",
-      "dependsOn": [], "name": "vmss1-nameLBPublicIP"}, {"tags": {}, "properties":
-      {"backendAddressPools": [{"name": "vmss1-nameLBBEPool"}], "frontendIPConfigurations":
-      [{"properties": {"publicIPAddress": {"id": "/subscriptions/cbbdaed0-fea9-4693-bf0c-d446ac93c030/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Network/publicIPAddresses/vmss1-nameLBPublicIP"}},
-      "name": "loadBalancerFrontEnd"}], "inboundNatPools": [{"properties": {"frontendIPConfiguration":
-      {"id": "[concat(resourceId(''Microsoft.Network/loadBalancers'', ''vmss1-nameLB''),
-      ''/frontendIPConfigurations/'', ''loadBalancerFrontEnd'')]"}, "frontendPortRangeStart":
-      "50000", "protocol": "tcp", "frontendPortRangeEnd": "50119", "backendPort":
-      22}, "name": "vmss1-nameLBNatPool"}]}, "type": "Microsoft.Network/loadBalancers",
-      "location": "westus", "apiVersion": "2015-06-15", "dependsOn": ["Microsoft.Network/publicIpAddresses/vmss1-nameLBPublicIP"],
-      "name": "vmss1-nameLB"}, {"tags": {}, "apiVersion": "2016-04-30-preview", "properties":
-      {"virtualMachineProfile": {"storageProfile": {"osDisk": {"managedDisk": {"storageAccountType":
-      "Standard_LRS"}, "createOption": "FromImage", "caching": "ReadOnly"}, "imageReference":
-      {"offer": "Debian", "publisher": "credativ", "version": "latest", "sku": "8"}},
-      "osProfile": {"computerNamePrefix": "vmss1hiti", "linuxConfiguration": {"ssh":
-      {"publicKeys": [{"path": "/home/deploy/.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}, "adminUsername":
-      "deploy", "secrets": [{"sourceVault": {"id": "/subscriptions/cbbdaed0-fea9-4693-bf0c-d446ac93c030/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.KeyVault/vaults/vmcreatelinuxsecret3333"},
-      "vaultCertificates": [{"certificateUrl": "https://vmcreatelinuxsecret3333.vault.azure.net/secrets/cert1/8ce387980c8d4d1e9b8d8980dff93f92"}]}]},
-      "networkProfile": {"networkInterfaceConfigurations": [{"properties": {"ipConfigurations":
-      [{"properties": {"loadBalancerBackendAddressPools": [{"id": "/subscriptions/cbbdaed0-fea9-4693-bf0c-d446ac93c030/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Network/loadBalancers/vmss1-nameLB/backendAddressPools/vmss1-nameLBBEPool"}],
-      "loadBalancerInboundNatPools": [{"id": "/subscriptions/cbbdaed0-fea9-4693-bf0c-d446ac93c030/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Network/loadBalancers/vmss1-nameLB/inboundNatPools/vmss1-nameLBNatPool"}],
-      "subnet": {"id": "/subscriptions/cbbdaed0-fea9-4693-bf0c-d446ac93c030/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Network/virtualNetworks/vmss1-nameVNET/subnets/vmss1-nameSubnet"}},
-      "name": "vmss1hitiIPConfig"}], "primary": "true"}, "name": "vmss1hitiNic"}]}},
-      "upgradePolicy": {"mode": "Manual"}, "overprovision": true, "singlePlacementGroup":
-      true}, "sku": {"tier": "Standard", "capacity": 2, "name": "Standard_D1_v2"},
-      "location": "westus", "type": "Microsoft.Compute/virtualMachineScaleSets", "dependsOn":
-      ["Microsoft.Network/virtualNetworks/vmss1-nameVNET", "Microsoft.Network/loadBalancers/vmss1-nameLB"],
-      "name": "vmss1-name"}], "parameters": {}}, "parameters": {}}}'
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Length: ['5370']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 resourcemanagementclient/0.30.2 Azure-SDK-For-Python
-          AZURECLI/TEST/0.1.2rc1+dev]
+          AZURECLI/TEST/2.0.0+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [e85bc024-f945-11e6-bb4d-24f49a5003ca]
+      x-ms-client-request-id: [99bc74de-050a-11e7-80dd-a0b3ccf7272a]
     method: PUT
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_vmss_create_linux_secrets/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_linux_secrets/providers/Microsoft.Resources/deployments/vmss_deploy_q82NLt1eBtnwcVOuRX2zpP5ScjvWC3uC","name":"vmss_deploy_q82NLt1eBtnwcVOuRX2zpP5ScjvWC3uC","properties":{"templateHash":"7126384745149127503","parameters":{},"mode":"Incremental","provisioningState":"Accepted","timestamp":"2017-02-22T21:28:54.5653668Z","duration":"PT0.8120888S","correlationId":"674d52b5-a14d-4ab2-b449-3bb8a7548aaf","providers":[{"namespace":"Microsoft.Network","resourceTypes":[{"resourceType":"virtualNetworks","locations":["westus"]},{"resourceType":"publicIPAddresses","locations":["westus"]},{"resourceType":"loadBalancers","locations":["westus"]}]},{"namespace":"Microsoft.Compute","resourceTypes":[{"resourceType":"virtualMachineScaleSets","locations":["westus"]}]}],"dependencies":[{"dependsOn":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Network/publicIpAddresses/vmss1-nameLBPublicIP","resourceType":"Microsoft.Network/publicIpAddresses","resourceName":"vmss1-nameLBPublicIP"}],"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Network/loadBalancers/vmss1-nameLB","resourceType":"Microsoft.Network/loadBalancers","resourceName":"vmss1-nameLB"},{"dependsOn":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Network/virtualNetworks/vmss1-nameVNET","resourceType":"Microsoft.Network/virtualNetworks","resourceName":"vmss1-nameVNET"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Network/loadBalancers/vmss1-nameLB","resourceType":"Microsoft.Network/loadBalancers","resourceName":"vmss1-nameLB"}],"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Compute/virtualMachineScaleSets/vmss1-name","resourceType":"Microsoft.Compute/virtualMachineScaleSets","resourceName":"vmss1-name"}]}}'}
+    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Resources/deployments/vmss_deploy_ZA3yEYzXT0UFnFD9PEuiDRVyj85BnXZi","name":"vmss_deploy_ZA3yEYzXT0UFnFD9PEuiDRVyj85BnXZi","properties":{"templateHash":"4678752365076987065","parameters":{},"mode":"Incremental","provisioningState":"Accepted","timestamp":"2017-03-09T20:54:35.8743212Z","duration":"PT0.5864032S","correlationId":"bb6d3c57-1412-4bd9-bcee-b0e1a016e461","providers":[{"namespace":"Microsoft.Network","resourceTypes":[{"resourceType":"virtualNetworks","locations":["westus"]},{"resourceType":"publicIPAddresses","locations":["westus"]},{"resourceType":"loadBalancers","locations":["westus"]}]},{"namespace":"Microsoft.Compute","resourceTypes":[{"resourceType":"virtualMachineScaleSets","locations":["westus"]}]}],"dependencies":[{"dependsOn":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Network/publicIpAddresses/vmss1-nameLBPublicIP","resourceType":"Microsoft.Network/publicIpAddresses","resourceName":"vmss1-nameLBPublicIP"}],"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Network/loadBalancers/vmss1-nameLB","resourceType":"Microsoft.Network/loadBalancers","resourceName":"vmss1-nameLB"},{"dependsOn":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Network/virtualNetworks/vmss1-nameVNET","resourceType":"Microsoft.Network/virtualNetworks","resourceName":"vmss1-nameVNET"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Network/loadBalancers/vmss1-nameLB","resourceType":"Microsoft.Network/loadBalancers","resourceName":"vmss1-nameLB"}],"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Compute/virtualMachineScaleSets/vmss1-name","resourceType":"Microsoft.Compute/virtualMachineScaleSets","resourceName":"vmss1-name"}]}}'}
     headers:
-      Azure-AsyncOperation: ['https://management.azure.com/subscriptions/cbbdaed0-fea9-4693-bf0c-d446ac93c030/resourcegroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Resources/deployments/vmss_deploy_q82NLt1eBtnwcVOuRX2zpP5ScjvWC3uC/operationStatuses/08587138079517243681?api-version=2016-09-01']
+      Azure-AsyncOperation: ['https://management.azure.com/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/resourcegroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Resources/deployments/vmss_deploy_ZA3yEYzXT0UFnFD9PEuiDRVyj85BnXZi/operationStatuses/08587125140101897312?api-version=2016-09-01']
       Cache-Control: [no-cache]
       Content-Length: ['2207']
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Wed, 22 Feb 2017 21:28:54 GMT']
+      Date: ['Thu, 09 Mar 2017 20:54:35 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
-      x-ms-ratelimit-remaining-subscription-writes: ['1198']
+      x-ms-ratelimit-remaining-subscription-writes: ['1199']
     status: {code: 201, message: Created}
 - request:
     body: null
@@ -531,19 +535,19 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 resourcemanagementclient/0.30.2 Azure-SDK-For-Python
-          AZURECLI/TEST/0.1.2rc1+dev]
+          AZURECLI/TEST/2.0.0+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [e85bc024-f945-11e6-bb4d-24f49a5003ca]
+      x-ms-client-request-id: [99bc74de-050a-11e7-80dd-a0b3ccf7272a]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08587138079517243681?api-version=2016-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08587125140101897312?api-version=2016-09-01
   response:
     body: {string: '{"status":"Running"}'}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Wed, 22 Feb 2017 21:29:24 GMT']
+      Date: ['Thu, 09 Mar 2017 20:55:05 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
@@ -557,19 +561,19 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 resourcemanagementclient/0.30.2 Azure-SDK-For-Python
-          AZURECLI/TEST/0.1.2rc1+dev]
+          AZURECLI/TEST/2.0.0+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [e85bc024-f945-11e6-bb4d-24f49a5003ca]
+      x-ms-client-request-id: [99bc74de-050a-11e7-80dd-a0b3ccf7272a]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08587138079517243681?api-version=2016-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08587125140101897312?api-version=2016-09-01
   response:
     body: {string: '{"status":"Running"}'}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Wed, 22 Feb 2017 21:29:55 GMT']
+      Date: ['Thu, 09 Mar 2017 20:55:36 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
@@ -583,19 +587,19 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 resourcemanagementclient/0.30.2 Azure-SDK-For-Python
-          AZURECLI/TEST/0.1.2rc1+dev]
+          AZURECLI/TEST/2.0.0+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [e85bc024-f945-11e6-bb4d-24f49a5003ca]
+      x-ms-client-request-id: [99bc74de-050a-11e7-80dd-a0b3ccf7272a]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08587138079517243681?api-version=2016-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08587125140101897312?api-version=2016-09-01
   response:
     body: {string: '{"status":"Running"}'}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Wed, 22 Feb 2017 21:30:25 GMT']
+      Date: ['Thu, 09 Mar 2017 20:56:07 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
@@ -609,71 +613,19 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 resourcemanagementclient/0.30.2 Azure-SDK-For-Python
-          AZURECLI/TEST/0.1.2rc1+dev]
+          AZURECLI/TEST/2.0.0+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [e85bc024-f945-11e6-bb4d-24f49a5003ca]
+      x-ms-client-request-id: [99bc74de-050a-11e7-80dd-a0b3ccf7272a]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08587138079517243681?api-version=2016-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08587125140101897312?api-version=2016-09-01
-  response:
-    body: {string: '{"status":"Running"}'}
-    headers:
-      Cache-Control: [no-cache]
-      Content-Type: [application/json; charset=utf-8]
-      Date: ['Wed, 22 Feb 2017 21:30:56 GMT']
-      Expires: ['-1']
-      Pragma: [no-cache]
-      Strict-Transport-Security: [max-age=31536000; includeSubDomains]
-      Vary: [Accept-Encoding]
-      content-length: ['20']
-    status: {code: 200, message: OK}
-- request:
-    body: null
-    headers:
-      Accept: [application/json]
-      Accept-Encoding: ['gzip, deflate']
-      Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) 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.2rc1+dev]
-      accept-language: [en-US]
-      x-ms-client-request-id: [e85bc024-f945-11e6-bb4d-24f49a5003ca]
-    method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08587138079517243681?api-version=2016-09-01
-  response:
-    body: {string: '{"status":"Running"}'}
-    headers:
-      Cache-Control: [no-cache]
-      Content-Type: [application/json; charset=utf-8]
-      Date: ['Wed, 22 Feb 2017 21:31:29 GMT']
-      Expires: ['-1']
-      Pragma: [no-cache]
-      Strict-Transport-Security: [max-age=31536000; includeSubDomains]
-      Vary: [Accept-Encoding]
-      content-length: ['20']
-    status: {code: 200, message: OK}
-- request:
-    body: null
-    headers:
-      Accept: [application/json]
-      Accept-Encoding: ['gzip, deflate']
-      Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) 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.2rc1+dev]
-      accept-language: [en-US]
-      x-ms-client-request-id: [e85bc024-f945-11e6-bb4d-24f49a5003ca]
-    method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08587138079517243681?api-version=2016-09-01
   response:
     body: {string: '{"status":"Succeeded"}'}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Wed, 22 Feb 2017 21:32:00 GMT']
+      Date: ['Thu, 09 Mar 2017 20:56:37 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
@@ -687,21 +639,21 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 resourcemanagementclient/0.30.2 Azure-SDK-For-Python
-          AZURECLI/TEST/0.1.2rc1+dev]
+          AZURECLI/TEST/2.0.0+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [e85bc024-f945-11e6-bb4d-24f49a5003ca]
+      x-ms-client-request-id: [99bc74de-050a-11e7-80dd-a0b3ccf7272a]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_vmss_create_linux_secrets/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_linux_secrets/providers/Microsoft.Resources/deployments/vmss_deploy_q82NLt1eBtnwcVOuRX2zpP5ScjvWC3uC","name":"vmss_deploy_q82NLt1eBtnwcVOuRX2zpP5ScjvWC3uC","properties":{"templateHash":"7126384745149127503","parameters":{},"mode":"Incremental","provisioningState":"Succeeded","timestamp":"2017-02-22T21:31:57.3428123Z","duration":"PT3M3.5895343S","correlationId":"674d52b5-a14d-4ab2-b449-3bb8a7548aaf","providers":[{"namespace":"Microsoft.Network","resourceTypes":[{"resourceType":"virtualNetworks","locations":["westus"]},{"resourceType":"publicIPAddresses","locations":["westus"]},{"resourceType":"loadBalancers","locations":["westus"]}]},{"namespace":"Microsoft.Compute","resourceTypes":[{"resourceType":"virtualMachineScaleSets","locations":["westus"]}]}],"dependencies":[{"dependsOn":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Network/publicIpAddresses/vmss1-nameLBPublicIP","resourceType":"Microsoft.Network/publicIpAddresses","resourceName":"vmss1-nameLBPublicIP"}],"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Network/loadBalancers/vmss1-nameLB","resourceType":"Microsoft.Network/loadBalancers","resourceName":"vmss1-nameLB"},{"dependsOn":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Network/virtualNetworks/vmss1-nameVNET","resourceType":"Microsoft.Network/virtualNetworks","resourceName":"vmss1-nameVNET"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Network/loadBalancers/vmss1-nameLB","resourceType":"Microsoft.Network/loadBalancers","resourceName":"vmss1-nameLB"}],"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Compute/virtualMachineScaleSets/vmss1-name","resourceType":"Microsoft.Compute/virtualMachineScaleSets","resourceName":"vmss1-name"}],"outputs":{"vmss":{"type":"Object","value":{"singlePlacementGroup":true,"upgradePolicy":{"mode":"Manual"},"virtualMachineProfile":{"osProfile":{"computerNamePrefix":"vmss1hiti","adminUsername":"deploy","linuxConfiguration":{"disablePasswordAuthentication":true,"ssh":{"publicKeys":[{"path":"/home/deploy/.ssh/authorized_keys","keyData":"ssh-rsa
+    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Resources/deployments/vmss_deploy_ZA3yEYzXT0UFnFD9PEuiDRVyj85BnXZi","name":"vmss_deploy_ZA3yEYzXT0UFnFD9PEuiDRVyj85BnXZi","properties":{"templateHash":"4678752365076987065","parameters":{},"mode":"Incremental","provisioningState":"Succeeded","timestamp":"2017-03-09T20:56:35.7222884Z","duration":"PT2M0.4343704S","correlationId":"bb6d3c57-1412-4bd9-bcee-b0e1a016e461","providers":[{"namespace":"Microsoft.Network","resourceTypes":[{"resourceType":"virtualNetworks","locations":["westus"]},{"resourceType":"publicIPAddresses","locations":["westus"]},{"resourceType":"loadBalancers","locations":["westus"]}]},{"namespace":"Microsoft.Compute","resourceTypes":[{"resourceType":"virtualMachineScaleSets","locations":["westus"]}]}],"dependencies":[{"dependsOn":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Network/publicIpAddresses/vmss1-nameLBPublicIP","resourceType":"Microsoft.Network/publicIpAddresses","resourceName":"vmss1-nameLBPublicIP"}],"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Network/loadBalancers/vmss1-nameLB","resourceType":"Microsoft.Network/loadBalancers","resourceName":"vmss1-nameLB"},{"dependsOn":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Network/virtualNetworks/vmss1-nameVNET","resourceType":"Microsoft.Network/virtualNetworks","resourceName":"vmss1-nameVNET"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Network/loadBalancers/vmss1-nameLB","resourceType":"Microsoft.Network/loadBalancers","resourceName":"vmss1-nameLB"}],"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Compute/virtualMachineScaleSets/vmss1-name","resourceType":"Microsoft.Compute/virtualMachineScaleSets","resourceName":"vmss1-name"}],"outputs":{"vmss":{"type":"Object","value":{"singlePlacementGroup":true,"upgradePolicy":{"mode":"Manual"},"virtualMachineProfile":{"osProfile":{"computerNamePrefix":"vmss1dmub","adminUsername":"deploy","linuxConfiguration":{"disablePasswordAuthentication":true,"ssh":{"publicKeys":[{"path":"/home/deploy/.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":[{"sourceVault":{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.KeyVault/vaults/vmcreatelinuxsecret3333"},"vaultCertificates":[{"certificateUrl":"https://vmcreatelinuxsecret3333.vault.azure.net/secrets/cert1/8ce387980c8d4d1e9b8d8980dff93f92"}]}]},"storageProfile":{"osDisk":{"createOption":"FromImage","caching":"ReadOnly","managedDisk":{"storageAccountType":"Standard_LRS"}},"imageReference":{"publisher":"credativ","offer":"Debian","sku":"8","version":"latest"}},"networkProfile":{"networkInterfaceConfigurations":[{"name":"vmss1hitiNic","properties":{"primary":true,"ipConfigurations":[{"name":"vmss1hitiIPConfig","properties":{"subnet":{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Network/virtualNetworks/vmss1-nameVNET/subnets/vmss1-nameSubnet"},"loadBalancerBackendAddressPools":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Network/loadBalancers/vmss1-nameLB/backendAddressPools/vmss1-nameLBBEPool"}],"loadBalancerInboundNatPools":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Network/loadBalancers/vmss1-nameLB/inboundNatPools/vmss1-nameLBNatPool"}]}}]}}]}},"provisioningState":"Succeeded","overprovision":true,"uniqueId":"309e3e48-c75f-4340-ad49-399cb831e444"}}},"outputResources":[{"id":"Microsoft.Compute/virtualMachineScaleSets/vmss1-name"},{"id":"Microsoft.Network/loadBalancers/vmss1-nameLB"},{"id":"Microsoft.Network/publicIPAddresses/vmss1-nameLBPublicIP"},{"id":"Microsoft.Network/virtualNetworks/vmss1-nameVNET"}]}}'}
+        test@example.com\n"}]}},"secrets":[{"sourceVault":{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.KeyVault/vaults/vmcreatelinuxsecret3333"},"vaultCertificates":[{"certificateUrl":"https://vmcreatelinuxsecret3333.vault.azure.net/secrets/cert1/6b6e10412fc54a0284bb4c6bc2ca9519"}]}]},"storageProfile":{"osDisk":{"createOption":"FromImage","caching":"ReadOnly","managedDisk":{"storageAccountType":"Standard_LRS"}},"imageReference":{"publisher":"credativ","offer":"Debian","sku":"8","version":"latest"}},"networkProfile":{"networkInterfaceConfigurations":[{"name":"vmss1dmubNic","properties":{"primary":true,"ipConfigurations":[{"name":"vmss1dmubIPConfig","properties":{"subnet":{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Network/virtualNetworks/vmss1-nameVNET/subnets/vmss1-nameSubnet"},"loadBalancerBackendAddressPools":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Network/loadBalancers/vmss1-nameLB/backendAddressPools/vmss1-nameLBBEPool"}],"loadBalancerInboundNatPools":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Network/loadBalancers/vmss1-nameLB/inboundNatPools/vmss1-nameLBNatPool"}]}}]}}]}},"provisioningState":"Succeeded","overprovision":true,"uniqueId":"8a398943-a6b6-4536-9def-96fa56e6b2f2"}}},"outputResources":[{"id":"Microsoft.Compute/virtualMachineScaleSets/vmss1-name"},{"id":"Microsoft.Network/loadBalancers/vmss1-nameLB"},{"id":"Microsoft.Network/publicIPAddresses/vmss1-nameLBPublicIP"},{"id":"Microsoft.Network/virtualNetworks/vmss1-nameVNET"}]}}'}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Wed, 22 Feb 2017 21:32:00 GMT']
+      Date: ['Thu, 09 Mar 2017 20:56:37 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
@@ -715,44 +667,50 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.3 (Darwin-16.4.0-x86_64-i386-64bit) requests/2.9.1 msrest/0.4.4
+      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.9.1 msrest/0.4.5
           msrest_azure/0.4.7 computemanagementclient/0.33.1rc1 Azure-SDK-For-Python
-          AZURECLI/TEST/0.1.2rc1+dev]
+          AZURECLI/TEST/2.0.0+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [59308d34-f946-11e6-ad6f-24f49a5003ca]
+      x-ms-client-request-id: [e40d00ee-050a-11e7-b9b2-a0b3ccf7272a]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Compute/virtualMachineScaleSets/vmss1-name?api-version=2016-04-30-preview
   response:
-    body: {string: "{\r\n  \"sku\": {\r\n    \"name\": \"Standard_D1_v2\",\r\n    \"tier\":
+    body: {string: "{\r\n  \"sku\": {\r\n    \"name\": \"Standard_D1_v2\",\r\n   \
-        \"Standard\",\r\n    \"capacity\": 2\r\n  },\r\n  \"properties\": {\r\n    \"singlePlacementGroup\":
+        \ \"tier\": \"Standard\",\r\n    \"capacity\": 2\r\n  },\r\n  \"properties\"\
-        true,\r\n    \"upgradePolicy\": {\r\n      \"mode\": \"Manual\"\r\n    },\r\n
+        : {\r\n    \"singlePlacementGroup\": true,\r\n    \"upgradePolicy\": {\r\n\
-        \   \"virtualMachineProfile\": {\r\n      \"osProfile\": {\r\n        \"computerNamePrefix\":
+        \      \"mode\": \"Manual\"\r\n    },\r\n    \"virtualMachineProfile\": {\r\
-        \"vmss1hiti\",\r\n        \"adminUsername\": \"deploy\",\r\n        \"linuxConfiguration\":
+        \n      \"osProfile\": {\r\n        \"computerNamePrefix\": \"vmss1dmub\"\
-        {\r\n          \"disablePasswordAuthentication\": true,\r\n          \"ssh\":
+        ,\r\n        \"adminUsername\": \"deploy\",\r\n        \"linuxConfiguration\"\
-        {\r\n            \"publicKeys\": [\r\n              {\r\n                \"path\":
+        : {\r\n          \"disablePasswordAuthentication\": true,\r\n          \"\
-        \"/home/deploy/.ssh/authorized_keys\",\r\n                \"keyData\": \"ssh-rsa
+        ssh\": {\r\n            \"publicKeys\": [\r\n              {\r\n         \
-        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/deploy/.ssh/authorized_keys\",\r\n             \
-        test@example.com\\n\"\r\n              }\r\n            ]\r\n          }\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==\
-        \       },\r\n        \"secrets\": [\r\n          {\r\n            \"sourceVault\":
+        \ test@example.com\\n\"\r\n              }\r\n            ]\r\n          }\r\
-        {\r\n              \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.KeyVault/vaults/vmcreatelinuxsecret3333\"\r\n
+        \n        },\r\n        \"secrets\": [\r\n          {\r\n            \"sourceVault\"\
-        \           },\r\n            \"vaultCertificates\": [\r\n              {\r\n
+        : {\r\n              \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.KeyVault/vaults/vmcreatelinuxsecret3333\"\
-        \               \"certificateUrl\": \"https://vmcreatelinuxsecret3333.vault.azure.net/secrets/cert1/8ce387980c8d4d1e9b8d8980dff93f92\"\r\n
+        \r\n            },\r\n            \"vaultCertificates\": [\r\n           \
-        \             }\r\n            ]\r\n          }\r\n        ]\r\n      },\r\n
+        \   {\r\n                \"certificateUrl\": \"https://vmcreatelinuxsecret3333.vault.azure.net/secrets/cert1/6b6e10412fc54a0284bb4c6bc2ca9519\"\
-        \     \"storageProfile\": {\r\n        \"osDisk\": {\r\n          \"createOption\":
+        \r\n              }\r\n            ]\r\n          }\r\n        ]\r\n     \
-        \"FromImage\",\r\n          \"caching\": \"ReadOnly\",\r\n          \"managedDisk\":
+        \ },\r\n      \"storageProfile\": {\r\n        \"osDisk\": {\r\n         \
-        {\r\n            \"storageAccountType\": \"Standard_LRS\"\r\n          }\r\n
+        \ \"createOption\": \"FromImage\",\r\n          \"caching\": \"ReadOnly\"\
-        \       },\r\n        \"imageReference\": {\r\n          \"publisher\": \"credativ\",\r\n
+        ,\r\n          \"managedDisk\": {\r\n            \"storageAccountType\": \"\
-        \         \"offer\": \"Debian\",\r\n          \"sku\": \"8\",\r\n          \"version\":
+        Standard_LRS\"\r\n          }\r\n        },\r\n        \"imageReference\"\
-        \"latest\"\r\n        }\r\n      },\r\n      \"networkProfile\": {\"networkInterfaceConfigurations\":[{\"name\":\"vmss1hitiNic\",\"properties\":{\"primary\":true,\"ipConfigurations\":[{\"name\":\"vmss1hitiIPConfig\",\"properties\":{\"subnet\":{\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Network/virtualNetworks/vmss1-nameVNET/subnets/vmss1-nameSubnet\"},\"loadBalancerBackendAddressPools\":[{\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Network/loadBalancers/vmss1-nameLB/backendAddressPools/vmss1-nameLBBEPool\"}],\"loadBalancerInboundNatPools\":[{\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Network/loadBalancers/vmss1-nameLB/inboundNatPools/vmss1-nameLBNatPool\"}]}}]}}]}\r\n
+        : {\r\n          \"publisher\": \"credativ\",\r\n          \"offer\": \"Debian\"\
-        \   },\r\n    \"provisioningState\": \"Succeeded\",\r\n    \"overprovision\":
+        ,\r\n          \"sku\": \"8\",\r\n          \"version\": \"latest\"\r\n  \
-        true,\r\n    \"uniqueId\": \"309e3e48-c75f-4340-ad49-399cb831e444\"\r\n  },\r\n
+        \      }\r\n      },\r\n      \"networkProfile\": {\"networkInterfaceConfigurations\"\
-        \ \"type\": \"Microsoft.Compute/virtualMachineScaleSets\",\r\n  \"location\":
+        :[{\"name\":\"vmss1dmubNic\",\"properties\":{\"primary\":true,\"ipConfigurations\"\
-        \"westus\",\r\n  \"tags\": {},\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Compute/virtualMachineScaleSets/vmss1-name\",\r\n
+        :[{\"name\":\"vmss1dmubIPConfig\",\"properties\":{\"subnet\":{\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Network/virtualNetworks/vmss1-nameVNET/subnets/vmss1-nameSubnet\"\
-        \ \"name\": \"vmss1-name\"\r\n}"}
+        },\"loadBalancerBackendAddressPools\":[{\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Network/loadBalancers/vmss1-nameLB/backendAddressPools/vmss1-nameLBBEPool\"\
+        }],\"loadBalancerInboundNatPools\":[{\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_vmss_create_linux_secrets/providers/Microsoft.Network/loadBalancers/vmss1-nameLB/inboundNatPools/vmss1-nameLBNatPool\"\
+        }]}}]}}]}\r\n    },\r\n    \"provisioningState\": \"Succeeded\",\r\n    \"\
+        overprovision\": true,\r\n    \"uniqueId\": \"8a398943-a6b6-4536-9def-96fa56e6b2f2\"\
+        \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_linux_secrets/providers/Microsoft.Compute/virtualMachineScaleSets/vmss1-name\"\
+        ,\r\n  \"name\": \"vmss1-name\"\r\n}"}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json; charset=utf-8]
-      Date: ['Wed, 22 Feb 2017 21:32:02 GMT']
+      Date: ['Thu, 09 Mar 2017 20:56:39 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]