Repository: Azure/azure-cli

Issue:
extension hack not working 

### **This is autogenerated. Please review and update as needed.**

## Describe the bug

**Command Name**
`az hack`

**Errors:**
```
libffi.so.6: cannot open shared object file: No such file or directory
Traceback (most recent call last):
python3.8/site-packages/knack/cli.py, ln 206, in invoke
    cmd_result = self.invocation.execute(args)
cli/core/commands/__init__.py, ln 554, in execute
    parsed_args = self.parser.parse_args(args)
python3.8/site-packages/knack/parser.py, ln 259, in parse_args
    return super(CLICommandParser, self).parse_args(args)
...
site-packages/cryptography/x509/extensions.py, ln 20, in <module>
    from cryptography.hazmat.primitives import constant_time, serialization
cryptography/hazmat/primitives/constant_time.py, ln 11, in <module>
    from cryptography.hazmat.bindings._constant_time import lib
ImportError: libffi.so.6: cannot open shared object file: No such file or directory
```

## To Reproduce:
Steps to reproduce the behavior. Note that argument values have been redacted, as they may contain sensitive information.

- _Put any pre-requisite steps here..._
- `az hack -h`

## Expected Behavior

## Environment Summary
```
Linux-5.4.0-47-generic-x86_64-with-glibc2.2.5
Python 3.8.1

azure-cli 2.1.0 *

Extensions:
hack 0.4.2
interactive 0.4.4
subscription 0.1.4
aks-preview 0.4.62
k8sconfiguration 0.1.7
azure-devops 0.17.0

```
## Additional Context

<!--Please don't remove this:-->
<!--auto-generated-->



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


```diff
@@            Coverage Diff             @@
##           master    #2346      +/-   ##
==========================================
- Coverage   72.86%   72.85%   -0.02%     
==========================================
  Files         425      425              
  Lines       19306    19306              
  Branches     2742     2743       +1     
==========================================
- Hits        14067    14065       -2     
- Misses       4330     4364      +34     
+ Partials      909      877      -32
```


| [Impacted Files](https://codecov.io/gh/Azure/azure-cli/pull/2346?src=pr&el=tree) | Coverage Δ | |
|---|---|---|
| [...rage/azure/cli/command_modules/storage/commands.py](https://codecov.io/gh/Azure/azure-cli/compare/23b3145b4623edf2648ee28a101175199d92cb1c...60d0433c7c7a07f9ad38b5a2fa028ecba4fbe311?src=pr&el=tree#diff-c3JjL2NvbW1hbmRfbW9kdWxlcy9henVyZS1jbGktc3RvcmFnZS9henVyZS9jbGkvY29tbWFuZF9tb2R1bGVzL3N0b3JhZ2UvY29tbWFuZHMucHk=) | `98.75% <ø> (ø)` | :white_check_mark: |
| [...e/azure/cli/command_modules/storage/_validators.py](https://codecov.io/gh/Azure/azure-cli/compare/23b3145b4623edf2648ee28a101175199d92cb1c...60d0433c7c7a07f9ad38b5a2fa028ecba4fbe311?src=pr&el=tree#diff-c3JjL2NvbW1hbmRfbW9kdWxlcy9henVyZS1jbGktc3RvcmFnZS9henVyZS9jbGkvY29tbWFuZF9tb2R1bGVzL3N0b3JhZ2UvX3ZhbGlkYXRvcnMucHk=) | `53.65% <0%> (+0.03%)` | :white_check_mark: |
| [...orage/azure/cli/command_modules/storage/_params.py](https://codecov.io/gh/Azure/azure-cli/compare/23b3145b4623edf2648ee28a101175199d92cb1c...60d0433c7c7a07f9ad38b5a2fa028ecba4fbe311?src=pr&el=tree#diff-c3JjL2NvbW1hbmRfbW9kdWxlcy9henVyZS1jbGktc3RvcmFnZS9henVyZS9jbGkvY29tbWFuZF9tb2R1bGVzL3N0b3JhZ2UvX3BhcmFtcy5weQ==) | `86.9% <100%> (-0.04%)` | :x: |
| [...torage/azure/cli/command_modules/storage/custom.py](https://codecov.io/gh/Azure/azure-cli/compare/23b3145b4623edf2648ee28a101175199d92cb1c...60d0433c7c7a07f9ad38b5a2fa028ecba4fbe311?src=pr&el=tree#diff-c3JjL2NvbW1hbmRfbW9kdWxlcy9henVyZS1jbGktc3RvcmFnZS9henVyZS9jbGkvY29tbWFuZF9tb2R1bGVzL3N0b3JhZ2UvY3VzdG9tLnB5) | `86.02% <33.33%> (-1.48%)` | :x: |
| [...e-cli-acs/azure/cli/command_modules/acs/_params.py](https://codecov.io/gh/Azure/azure-cli/compare/23b3145b4623edf2648ee28a101175199d92cb1c...60d0433c7c7a07f9ad38b5a2fa028ecba4fbe311?src=pr&el=tree#diff-c3JjL2NvbW1hbmRfbW9kdWxlcy9henVyZS1jbGktYWNzL2F6dXJlL2NsaS9jb21tYW5kX21vZHVsZXMvYWNzL19wYXJhbXMucHk=) | `68.51% <0%> (ø)` | :white_check_mark: |
| [src/azure-cli-core/azure/cli/core/telemetry.py](https://codecov.io/gh/Azure/azure-cli/compare/23b3145b4623edf2648ee28a101175199d92cb1c...60d0433c7c7a07f9ad38b5a2fa028ecba4fbe311?src=pr&el=tree#diff-c3JjL2F6dXJlLWNsaS1jb3JlL2F6dXJlL2NsaS9jb3JlL3RlbGVtZXRyeS5weQ==) | `54.1% <0%> (ø)` | :white_check_mark: |
| [...twork/azure/cli/command_modules/network/_params.py](https://codecov.io/gh/Azure/azure-cli/compare/23b3145b4623edf2648ee28a101175199d92cb1c...60d0433c7c7a07f9ad38b5a2fa028ecba4fbe311?src=pr&el=tree#diff-c3JjL2NvbW1hbmRfbW9kdWxlcy9henVyZS1jbGktbmV0d29yay9henVyZS9jbGkvY29tbWFuZF9tb2R1bGVzL25ldHdvcmsvX3BhcmFtcy5weQ==) | `92.51% <0%> (ø)` | :white_check_mark: |
| [...i-cloud/azure/cli/command_modules/cloud/_params.py](https://codecov.io/gh/Azure/azure-cli/compare/23b3145b4623edf2648ee28a101175199d92cb1c...60d0433c7c7a07f9ad38b5a2fa028ecba4fbe311?src=pr&el=tree#diff-c3JjL2NvbW1hbmRfbW9kdWxlcy9henVyZS1jbGktY2xvdWQvYXp1cmUvY2xpL2NvbW1hbmRfbW9kdWxlcy9jbG91ZC9fcGFyYW1zLnB5) | `92.3% <0%> (ø)` | :white_check_mark: |
| [...cli-vm/azure/cli/command_modules/vm/_validators.py](https://codecov.io/gh/Azure/azure-cli/compare/23b3145b4623edf2648ee28a101175199d92cb1c...60d0433c7c7a07f9ad38b5a2fa028ecba4fbe311?src=pr&el=tree#diff-c3JjL2NvbW1hbmRfbW9kdWxlcy9henVyZS1jbGktdm0vYXp1cmUvY2xpL2NvbW1hbmRfbW9kdWxlcy92bS9fdmFsaWRhdG9ycy5weQ==) | `73.69% <0%> (ø)` | :white_check_mark: |
| [...-cli-role/azure/cli/command_modules/role/custom.py](https://codecov.io/gh/Azure/azure-cli/compare/23b3145b4623edf2648ee28a101175199d92cb1c...60d0433c7c7a07f9ad38b5a2fa028ecba4fbe311?src=pr&el=tree#diff-c3JjL2NvbW1hbmRfbW9kdWxlcy9henVyZS1jbGktcm9sZS9henVyZS9jbGkvY29tbWFuZF9tb2R1bGVzL3JvbGUvY3VzdG9tLnB5) | `20.44% <0%> (ø)` | :white_check_mark: |
| ... and [14 more](https://codecov.io/gh/Azure/azure-cli/pull/2346?src=pr&el=tree-more) | |

------

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

Patch:
diff --git a/azure-cli.pyproj b/azure-cli.pyproj
index 6a88538e3..c714d3247 100644
--- a/azure-cli.pyproj
+++ b/azure-cli.pyproj
@@ -333,6 +333,9 @@
     <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_vnet_gateway\lib\version.py" />
     <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_vnet_gateway\lib\vnet_gateway_creation_client.py" />
     <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_vnet_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>
diff --git a/src/azure-cli-core/azure/cli/core/_profile.py b/src/azure-cli-core/azure/cli/core/_profile.py
index e5bb75d77..a4b13bf17 100644
--- a/src/azure-cli-core/azure/cli/core/_profile.py
+++ b/src/azure-cli-core/azure/cli/core/_profile.py
@@ -10,6 +10,7 @@ import errno
 import json
 import os.path
 from pprint import pformat
+from copy import deepcopy
 from enum import Enum
 
 import adal
@@ -137,7 +138,8 @@ class Profile(object):
                                                      subscriptions,
                                                      is_service_principal)
         self._set_subscriptions(consolidated)
-        return consolidated
+        # use deepcopy as we don't want to persist these changes to file.
+        return deepcopy(consolidated)
 
     @staticmethod
     def _normalize_properties(user, subscriptions, is_service_principal):
@@ -224,8 +226,10 @@ class Profile(object):
     def load_cached_subscriptions(self, all_clouds=False):
         subscriptions = self._storage.get(_SUBSCRIPTIONS) or []
         active_cloud = get_active_cloud()
-        return [sub for sub in subscriptions
-                if all_clouds or sub[_ENVIRONMENT_NAME] == active_cloud.name]
+        cached_subscriptions = [sub for sub in subscriptions
+                                if all_clouds or sub[_ENVIRONMENT_NAME] == active_cloud.name]
+        # use deepcopy as we don't want to persist these changes to file.
+        return deepcopy(cached_subscriptions)
 
     def get_current_account_user(self):
         try:
@@ -282,7 +286,6 @@ class Profile(object):
             result[_ENVIRONMENT_NAME] = CLOUD.name
             result['subscriptionName'] = account[_SUBSCRIPTION_NAME]
         else:  # has logged in through cli
-            from copy import deepcopy
             result = deepcopy(account)
             user_type = account[_USER_ENTITY].get(_USER_TYPE)
             if user_type == _SERVICE_PRINCIPAL:
diff --git a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/custom.py b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/custom.py
index afe5d3ffd..3a7bd967c 100644
--- a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/custom.py
+++ b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/custom.py
@@ -39,12 +39,19 @@ from azure.cli.command_modules.network.zone_file.make_zone_file import make_zone
 
 logger = azlogging.get_az_logger(__name__)
 
-def _upsert(collection, obj, key_name, key_value):
-    match = next((x for x in collection if getattr(x, key_name, None) == key_value), None)
+def _upsert(parent, collection_name, obj_to_add, key_name):
+
+    if not getattr(parent, collection_name, None):
+        setattr(parent, collection_name, [])
+    collection = getattr(parent, collection_name, None)
+
+    value = getattr(obj_to_add, key_name)
+    match = next((x for x in collection if getattr(x, key_name, None) == value), None)
     if match:
-        logger.warning("Item '%s' already exists. Replacing with new values.", key_value)
+        logger.warning("Item '%s' already exists. Replacing with new values.", value)
         collection.remove(match)
-    collection.append(obj)
+
+    collection.append(obj_to_add)
 
 #region Generic list commands
 def _generic_list(operation_name, resource_group_name):
@@ -101,7 +108,7 @@ def create_ag_authentication_certificate(resource_group_name, application_gatewa
     ncf = _network_client_factory().application_gateways
     ag = ncf.get(resource_group_name, application_gateway_name)
     new_cert = AuthCert(data=cert_data, name=item_name)
-    _upsert(ag.authentication_certificates, new_cert, 'name', item_name)
+    _upsert(ag, 'authentication_certificates', new_cert, 'name')
     return ncf.create_or_update(resource_group_name, application_gateway_name, ag, raw=no_wait)
 
 def update_ag_authentication_certificate(instance, parent, item_name, cert_data): # pylint: disable=unused-argument
@@ -114,7 +121,7 @@ def create_ag_backend_address_pool(resource_group_name, application_gateway_name
     ncf = _network_client_factory()
     ag = ncf.application_gateways.get(resource_group_name, application_gateway_name)
     new_pool = ApplicationGatewayBackendAddressPool(name=item_name, backend_addresses=servers)
-    _upsert(ag.backend_address_pools, new_pool, 'name', item_name)
+    _upsert(ag, 'backend_address_pools', new_pool, 'name')
     return ncf.application_gateways.create_or_update(
         resource_group_name, application_gateway_name, ag, raw=no_wait)
 create_ag_backend_address_pool.__doc__ = AppGatewayOperations.create_or_update.__doc__
@@ -141,7 +148,7 @@ def create_ag_frontend_ip_configuration(resource_group_name, application_gateway
             private_ip_address=private_ip_address if private_ip_address else None,
             private_ip_allocation_method='Static' if private_ip_address else 'Dynamic',
             subnet=SubResource(subnet))
-    _upsert(ag.frontend_ip_configurations, new_config, 'name', item_name)
+    _upsert(ag, 'frontend_ip_configurations', new_config, 'name')
     return ncf.application_gateways.create_or_update(
         resource_group_name, application_gateway_name, ag, raw=no_wait)
 create_ag_frontend_ip_configuration.__doc__ = AppGatewayOperations.create_or_update.__doc__
@@ -165,7 +172,7 @@ def create_ag_frontend_port(resource_group_name, application_gateway_name, item_
     ncf = _network_client_factory()
     ag = ncf.application_gateways.get(resource_group_name, application_gateway_name)
     new_port = ApplicationGatewayFrontendPort(name=item_name, port=port)
-    _upsert(ag.frontend_ports, new_port, 'name', item_name)
+    _upsert(ag, 'frontend_ports', new_port, 'name')
     return ncf.application_gateways.create_or_update(
         resource_group_name, application_gateway_name, ag, raw=no_wait)
 
@@ -188,7 +195,7 @@ def create_ag_http_listener(resource_group_name, application_gateway_name, item_
         require_server_name_indication=True if ssl_cert and host_name else None,
         protocol='https' if ssl_cert else 'http',
         ssl_certificate=SubResource(ssl_cert) if ssl_cert else None)
-    _upsert(ag.http_listeners, new_listener, 'name', item_name)
+    _upsert(ag, 'http_listeners', new_listener, 'name')
     return ncf.application_gateways.create_or_update(
         resource_group_name, application_gateway_name, ag, raw=no_wait)
 
@@ -225,7 +232,7 @@ def create_ag_backend_http_settings_collection(resource_group_name, application_
         request_timeout=timeout,
         probe=SubResource(probe) if probe else None,
         name=item_name)
-    _upsert(ag.backend_http_settings_collection, new_settings, 'name', item_name)
+    _upsert(ag, 'backend_http_settings_collection', new_settings, 'name')
     return ncf.application_gateways.create_or_update(
         resource_group_name, application_gateway_name, ag, raw=no_wait)
 
@@ -257,7 +264,7 @@ def create_ag_probe(resource_group_name, application_gateway_name, item_name, pr
         interval=interval,
         timeout=timeout,
         unhealthy_threshold=threshold)
-    _upsert(ag.probes, new_probe, 'name', item_name)
+    _upsert(ag, 'probes', new_probe, 'name')
     return ncf.application_gateways.create_or_update(
         resource_group_name, application_gateway_name, ag, raw=no_wait)
 
@@ -290,7 +297,7 @@ def create_ag_request_routing_rule(resource_group_name, application_gateway_name
         backend_http_settings=SubResource(http_settings),
         http_listener=SubResource(http_listener),
         url_path_map=SubResource(url_path_map) if url_path_map else None)
-    _upsert(ag.request_routing_rules, new_rule, 'name', item_name)
+    _upsert(ag, 'request_routing_rules', new_rule, 'name')
     return ncf.application_gateways.create_or_update(
         resource_group_name, application_gateway_name, ag, raw=no_wait)
 
@@ -316,7 +323,7 @@ def create_ag_ssl_certificate(resource_group_name, application_gateway_name, ite
     ag = ncf.application_gateways.get(resource_group_name, application_gateway_name)
     new_cert = ApplicationGatewaySslCertificate(
         name=item_name, data=cert_data, password=cert_password)
-    _upsert(ag.ssl_certificates, new_cert, 'name', item_name)
+    _upsert(ag, 'ssl_certificates', new_cert, 'name')
     return ncf.application_gateways.create_or_update(
         resource_group_name, application_gateway_name, ag, raw=no_wait)
 create_ag_ssl_certificate.__doc__ = AppGatewayOperations.create_or_update.__doc__
@@ -359,7 +366,7 @@ def create_ag_url_path_map(resource_group_name, application_gateway_name, item_n
             backend_http_settings=SubResource(http_settings),
             paths=paths
         )])
-    _upsert(ag.url_path_maps, new_map, 'name', item_name)
+    _upsert(ag, 'url_path_maps', new_map, 'name')
     return ncf.application_gateways.create_or_update(
         resource_group_name, application_gateway_name, ag, raw=no_wait)
 
@@ -387,7 +394,7 @@ def create_ag_url_path_map_rule(resource_group_name, application_gateway_name, u
             if address_pool else SubResource(url_map.default_backend_address_pool.id),
         backend_http_settings=SubResource(http_settings) \
             if http_settings else SubResource(url_map.default_backend_http_settings.id))
-    _upsert(url_map.path_rules, new_rule, 'name', item_name)
+    _upsert(url_map, 'path_rules', new_rule, 'name')
     return ncf.application_gateways.create_or_update(
         resource_group_name, application_gateway_name, ag, raw=no_wait)
 
@@ -432,7 +439,7 @@ def create_lb_inbound_nat_rule(
         frontend_ip_configuration=frontend_ip,
         enable_floating_ip=floating_ip == 'true',
         idle_timeout_in_minutes=idle_timeout)
-    _upsert(lb.inbound_nat_rules, new_rule, 'name', item_name)
+    _upsert(lb, 'inbound_nat_rules', new_rule, 'name')
     poller = ncf.load_balancers.create_or_update(resource_group_name, load_balancer_name, lb)
     return _get_property(poller.result().inbound_nat_rules, item_name)
 
@@ -467,7 +474,7 @@ def create_lb_inbound_nat_pool(
         frontend_port_range_start=frontend_port_range_start,
         frontend_port_range_end=frontend_port_range_end,
         backend_port=backend_port)
-    _upsert(lb.inbound_nat_pools, new_pool, 'name', item_name)
+    _upsert(lb, 'inbound_nat_pools', new_pool, 'name')
     poller = ncf.load_balancers.create_or_update(resource_group_name, load_balancer_name, lb)
     return _get_property(poller.result().inbound_nat_pools, item_name)
 
@@ -500,7 +507,7 @@ def create_lb_frontend_ip_configuration(
         private_ip_allocation_method=private_ip_address_allocation,
         public_ip_address=PublicIPAddress(public_ip_address) if public_ip_address else None,
         subnet=Subnet(subnet) if subnet else None)
-    _upsert(lb.frontend_ip_configurations, new_config, 'name', item_name)
+    _upsert(lb, 'frontend_ip_configurations', new_config, 'name')
     poller = ncf.load_balancers.create_or_update(resource_group_name, load_balancer_name, lb)
     return _get_property(poller.result().frontend_ip_configurations, item_name)
 
@@ -532,7 +539,7 @@ def create_lb_backend_address_pool(resource_group_name, load_balancer_name, item
     ncf = _network_client_factory()
     lb = ncf.load_balancers.get(resource_group_name, load_balancer_name)
     new_pool = BackendAddressPool(name=item_name)
-    _upsert(lb.backend_address_pools, new_pool, 'name', item_name)
+    _upsert(lb, 'backend_address_pools', new_pool, 'name')
     poller = ncf.load_balancers.create_or_update(resource_group_name, load_balancer_name, lb)
     return _get_property(poller.result().backend_address_pools, item_name)
 
@@ -543,7 +550,7 @@ def create_lb_probe(resource_group_name, load_balancer_name, item_name, protocol
     new_probe = Probe(
         protocol, port, interval_in_seconds=interval, number_of_probes=threshold,
         request_path=path, name=item_name)
-    _upsert(lb.probes, new_probe, 'name', item_name)
+    _upsert(lb, 'probes', new_probe, 'name')
     poller = ncf.load_balancers.create_or_update(resource_group_name, load_balancer_name, lb)
     return _get_property(poller.result().probes, item_name)
 
@@ -577,7 +584,7 @@ def create_lb_rule(
         load_distribution=load_distribution,
         enable_floating_ip=floating_ip == 'true',
         idle_timeout_in_minutes=idle_timeout)
-    _upsert(lb.load_balancing_rules, new_rule, 'name', item_name)
+    _upsert(lb, 'load_balancing_rules', new_rule, 'name')
     poller = ncf.load_balancers.create_or_update(resource_group_name, load_balancer_name, lb)
     return _get_property(poller.result().load_balancing_rules, item_name)
 
@@ -658,7 +665,7 @@ def create_nic_ip_config(resource_group_name, network_interface_name, ip_config_
         private_ip_allocation_method=private_ip_address_allocation,
         private_ip_address_version=private_ip_address_version,
         primary=make_primary)
-    _upsert(nic.ip_configurations, new_config, 'name', ip_config_name)
+    _upsert(nic, 'ip_configurations', new_config, 'name')
     poller = ncf.network_interfaces.create_or_update(
         resource_group_name, network_interface_name, nic)
     return _get_property(poller.result().ip_configurations, ip_config_name)
@@ -708,19 +715,25 @@ def set_nic_ip_config(instance, parent, ip_config_name, subnet=None, # pylint: d
     return parent
 set_nic_ip_config.__doc__ = NicOperations.create_or_update.__doc__
 
+def _get_nic_ip_config(nic, name):
+    if nic.ip_configurations:
+        ip_config = next(
+            (x for x in nic.ip_configurations if x.name.lower() == name.lower()), None)
+    else:
+        ip_config = None
+    if not ip_config:
+        raise CLIError('IP configuration {} not found.'.format(name))
+    return ip_config
+
 def add_nic_ip_config_address_pool(
         resource_group_name, network_interface_name, ip_config_name, backend_address_pool,
         load_balancer_name=None): # pylint: disable=unused-argument
     client = _network_client_factory().network_interfaces
     nic = client.get(resource_group_name, network_interface_name)
-    ip_config = next(
-        (x for x in nic.ip_configurations if x.name.lower() == ip_config_name.lower()), None)
-    try:
-        _upsert(ip_config.load_balancer_backend_address_pools,
-                BackendAddressPool(backend_address_pool),
-                'name', backend_address_pool)
-    except AttributeError:
-        ip_config.load_balancer_backend_address_pools = [BackendAddressPool(backend_address_pool)]
+    ip_config = _get_nic_ip_config(nic, ip_config_name)
+    _upsert(ip_config, 'load_balancer_backend_address_pools',
+            BackendAddressPool(backend_address_pool),
+            'name')
     poller = client.create_or_update(resource_group_name, network_interface_name, nic)
     return _get_property(poller.result().ip_configurations, ip_config_name)
 
@@ -729,10 +742,7 @@ def remove_nic_ip_config_address_pool(
         load_balancer_name=None): # pylint: disable=unused-argument
     client = _network_client_factory().network_interfaces
     nic = client.get(resource_group_name, network_interface_name)
-    ip_config = next(
-        (x for x in nic.ip_configurations if x.name.lower() == ip_config_name.lower()), None)
-    if not ip_config:
-        raise CLIError('IP configuration {} not found.'.format(ip_config_name))
+    ip_config = _get_nic_ip_config(nic, ip_config_name)
     keep_items = \
         [x for x in ip_config.load_balancer_backend_address_pools or [] \
             if x.id != backend_address_pool]
@@ -745,14 +755,10 @@ def add_nic_ip_config_inbound_nat_rule(
         load_balancer_name=None): # pylint: disable=unused-argument
     client = _network_client_factory().network_interfaces
     nic = client.get(resource_group_name, network_interface_name)
-    ip_config = next(
-        (x for x in nic.ip_configurations if x.name.lower() == ip_config_name.lower()), None)
-    try:
-        _upsert(ip_config.load_balancer_inbound_nat_rules,
-                InboundNatRule(inbound_nat_rule),
-                'name', inbound_nat_rule)
-    except AttributeError:
-        ip_config.load_balancer_inbound_nat_rules = [InboundNatRule(inbound_nat_rule)]
+    ip_config = _get_nic_ip_config(nic, ip_config_name)
+    _upsert(ip_config, 'load_balancer_inbound_nat_rules',
+            InboundNatRule(inbound_nat_rule),
+            'name')
     poller = client.create_or_update(resource_group_name, network_interface_name, nic)
     return  _get_property(poller.result().ip_configurations, ip_config_name)
 
@@ -761,10 +767,7 @@ def remove_nic_ip_config_inbound_nat_rule(
         load_balancer_name=None): # pylint: disable=unused-argument
     client = _network_client_factory().network_interfaces
     nic = client.get(resource_group_name, network_interface_name)
-    ip_config = next(
-        (x for x in nic.ip_configurations or [] if x.name.lower() == ip_config_name.lower()), None)
-    if not ip_config:
-        raise CLIError('IP configuration {} not found.'.format(ip_config_name))
+    ip_config = _get_nic_ip_config(nic, ip_config_name)
     keep_items = \
         [x for x in ip_config.load_balancer_inbound_nat_rules if x.id != inbound_nat_rule]
     ip_config.load_balancer_inbound_nat_rules = keep_items
@@ -1074,7 +1077,7 @@ def create_vnet_gateway_root_cert(resource_group_name, gateway_name, public_cert
         config.vpn_client_root_certificates = []
 
     cert = VpnClientRootCertificate(name=cert_name, public_cert_data=public_cert_data)
-    _upsert(config.vpn_client_root_certificates, cert, 'name', cert_name)
+    _upsert(config, 'vpn_client_root_certificates', cert, 'name')
     return ncf.create_or_update(resource_group_name, gateway_name, gateway)
 
 def delete_vnet_gateway_root_cert(resource_group_name, gateway_name, cert_name):
@@ -1094,7 +1097,7 @@ def create_vnet_gateway_revoked_cert(resource_group_name, gateway_name, thumbpri
     config, gateway, ncf = _prep_cert_create(gateway_name, resource_group_name)
 
     cert = VpnClientRevokedCertificate(name=cert_name, thumbprint=thumbprint)
-    _upsert(config.vpn_client_revoked_certificates, cert, 'name', cert_name)
+    _upsert(config, 'vpn_client_revoked_certificates', cert, 'name')
     return ncf.create_or_update(resource_group_name, gateway_name, gateway)
 
 def delete_vnet_gateway_revoked_cert(resource_group_name, gateway_name, cert_name):
diff --git a/src/command_modules/azure-cli-profile/azure/cli/command_modules/profile/custom.py b/src/command_modules/azure-cli-profile/azure/cli/command_modules/profile/custom.py
index caa1ea222..e30d0a245 100644
--- a/src/command_modules/azure-cli-profile/azure/cli/command_modules/profile/custom.py
+++ b/src/command_modules/azure-cli-profile/azure/cli/command_modules/profile/custom.py
@@ -3,7 +3,6 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
 
-from copy import deepcopy
 import requests
 from adal.adal_error import AdalError
 from azure.cli.core.prompting import prompt_pass, NoTTYException
@@ -85,8 +84,7 @@ def login(username=None, password=None, service_principal=None, tenant=None):
         raise CLIError(err)
     except requests.exceptions.ConnectionError as err:
         raise CLIError('Please ensure you have network connection. Error detail: ' + str(err))
-    # use deepcopy as we don't want to persist these changes to file.
-    all_subscriptions = deepcopy(subscriptions)
+    all_subscriptions = list(subscriptions)
     for sub in all_subscriptions:
         sub['cloudName'] = sub.pop('environmentName', None)
     return all_subscriptions
diff --git a/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/_params.py b/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/_params.py
index 2cd7be83d..1e96ca573 100644
--- a/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/_params.py
+++ b/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/_params.py
@@ -250,10 +250,9 @@ for item in ['create', 'update']:
 
 register_cli_argument('storage account create', 'access_tier', help='Required for StandardBlob accounts. The access tier used for billing. Cannot be set for StandardLRS, StandardGRS, StandardRAGRS, or PremiumLRS account types.', **enum_choice_list(AccessTier))
 register_cli_argument('storage account update', 'access_tier', help='The access tier used for billing StandardBlob accounts. Cannot be set for StandardLRS, StandardGRS, StandardRAGRS, or PremiumLRS account types.', **enum_choice_list(AccessTier))
-register_cli_argument('storage account create', 'custom_domain', help='User domain assigned to the storage account. Name is the CNAME source.', validator=validate_custom_domain)
+register_cli_argument('storage account create', 'custom_domain', help='User domain assigned to the storage account. Name is the CNAME source.')
 register_cli_argument('storage account update', 'custom_domain', help='User domain assigned to the storage account. Name is the CNAME source. Use "" to clear existing value.', validator=validate_custom_domain)
-register_extra_cli_argument('storage account create', 'subdomain', options_list=('--use-subdomain',), help='Specify to enable indirect CNAME validation.', action='store_true')
-register_extra_cli_argument('storage account update', 'subdomain', options_list=('--use-subdomain',), help='Specify whether to use indirect CNAME validation.', default=None, **enum_choice_list(['true', 'false']))
+register_cli_argument('storage account update', 'use_subdomain', help='Specify whether to use indirect CNAME validation.', **enum_choice_list(['true', 'false']))
 
 register_cli_argument('storage account update', 'tags', tags_type, default=None)
 
diff --git a/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/_validators.py b/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/_validators.py
index 4648aa836..21beba5e9 100644
--- a/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/_validators.py
+++ b/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/_validators.py
@@ -15,7 +15,6 @@ from azure.cli.core._util import CLIError
 from azure.cli.core.commands.client_factory import get_mgmt_service_client
 from azure.cli.core.commands.validators import validate_key_value_pairs
 from azure.mgmt.storage import StorageManagementClient
-from azure.mgmt.storage.models import CustomDomain
 from azure.storage.sharedaccesssignature import SharedAccessSignature
 from azure.storage.blob import Include, PublicAccess
 from azure.storage.blob.baseblobservice import BaseBlobService
@@ -154,16 +153,19 @@ def validate_source_uri(namespace):  # pylint: disable=too-many-statements
     validate_client_parameters(namespace)  # must run first to resolve storage account
 
     # determine if the copy will happen in the same storage account
+    same_account = False
     if not source_account_name and source_account_key:
         raise ValueError(usage_string.format('Source account key is given but account name is not'))
     elif not source_account_name and not source_account_key:
         # neither source account name or key is given, assume that user intends to copy blob in
         # the same account
+        same_account = True
         source_account_name = ns.get('account_name', None)
         source_account_key = ns.get('account_key', None)
     elif source_account_name and not source_account_key:
         if source_account_name == ns.get('account_name', None):
             # the source account name is same as the destination account name
+            same_account = True
             source_account_key = ns.get('account_key', None)
         else:
             # the source account is different from destination account but the key is missing
@@ -180,11 +182,11 @@ def validate_source_uri(namespace):  # pylint: disable=too-many-statements
     if not sas:
         # generate a sas token even in the same account when the source and destination are not the
         # same kind.
-        if valid_file_source and ns.get('container_name', None):
+        if valid_file_source and (ns.get('container_name', None) or not same_account):
             dir_name, file_name = os.path.split(path) if path else (None, '')
             sas = _create_short_lived_file_sas(source_account_name, source_account_key, share,
                                                dir_name, file_name)
-        elif valid_blob_source and ns.get('share_name', None):
+        elif valid_blob_source and (ns.get('share_name', None) or not same_account):
             sas = _create_short_lived_blob_sas(source_account_name, source_account_key, container,
                                                blob)
 
@@ -272,11 +274,8 @@ def get_content_setting_validator(settings_class, update):
 
 
 def validate_custom_domain(namespace):
-    if namespace.custom_domain:
-        namespace.custom_domain = CustomDomain(namespace.custom_domain, namespace.subdomain)
-    if namespace.subdomain and not namespace.custom_domain:
-        raise ValueError("must specify '--custom-domain' to use the '--use-subdomain' flag")
-    del namespace.subdomain
+    if namespace.use_subdomain and not namespace.custom_domain:
+        raise ValueError('usage error: --custom-domain DOMAIN [--use-subdomain]')
 
 
 def validate_encryption(namespace):
diff --git a/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/commands.py b/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/commands.py
index e7243fa56..247c7c6fe 100644
--- a/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/commands.py
+++ b/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/commands.py
@@ -57,7 +57,7 @@ cli_command(__name__, 'storage account keys renew', mgmt_path + 'regenerate_key'
 cli_command(__name__, 'storage account keys list', mgmt_path + 'list_keys', factory, transform=lambda x: x.keys)
 cli_generic_update_command(__name__, 'storage account update',
                            mgmt_path + 'get_properties',
-                           mgmt_path + 'create', factory,
+                           mgmt_path + 'update', factory,
                            custom_function_op=custom_path + 'update_storage_account')
 cli_storage_data_plane_command('storage account generate-sas', 'azure.storage.cloudstorageaccount#CloudStorageAccount.generate_shared_access_signature', cloud_storage_account_service_factory)
 
diff --git a/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/custom.py b/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/custom.py
index b89a8e196..0976aad5f 100644
--- a/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/custom.py
+++ b/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/custom.py
@@ -103,23 +103,26 @@ def create_storage_account(resource_group_name, account_name, sku, location,
         kind=Kind(kind),
         location=location,
         tags=tags,
-        custom_domain=CustomDomain(custom_domain) if custom_domain else None,
+        custom_domain=CustomDomain(custom_domain, None) if custom_domain else None,
         encryption=encryption,
         access_tier=AccessTier(access_tier) if access_tier else None)
     return scf.storage_accounts.create(resource_group_name, account_name, params)
 
 
 def update_storage_account(instance, sku=None, tags=None, custom_domain=None,
-                           encryption=None, access_tier=None):
+                           use_subdomain=None, encryption=None, access_tier=None):
     from azure.mgmt.storage.models import \
-        (StorageAccountCreateParameters, Sku, CustomDomain, AccessTier)
-
-    params = StorageAccountCreateParameters(
+        (StorageAccountUpdateParameters, Sku, CustomDomain, AccessTier)
+    domain = instance.custom_domain
+    if custom_domain is not None:
+        domain = CustomDomain(custom_domain)
+        if use_subdomain is not None:
+            domain.name = use_subdomain == 'true'
+
+    params = StorageAccountUpdateParameters(
         sku=Sku(sku) if sku is not None else instance.sku,
-        kind=instance.kind,
-        location=instance.location,
         tags=tags if tags is not None else instance.tags,
-        custom_domain=CustomDomain(custom_domain) if custom_domain is not None else instance.custom_domain,  # pylint: disable=line-too-long
+        custom_domain=domain,
         encryption=encryption if encryption is not None else instance.encryption,
         access_tier=AccessTier(access_tier) if access_tier is not None else instance.access_tier
     )


Test patch:
diff --git a/scripts/automation/tests/run.py b/scripts/automation/tests/run.py
index b3dc92b3e..76a98b118 100644
--- a/scripts/automation/tests/run.py
+++ b/scripts/automation/tests/run.py
@@ -20,14 +20,14 @@ def run_tests(modules, parallel, run_live):
     # create test results folder
     test_results_folder = get_test_results_dir(with_timestamp=True, prefix='tests')
 
-    # get test runner
-    run_nose = get_nose_runner(test_results_folder, xunit_report=True, exclude_integration=True,
-                               parallel=parallel)
-
     # set environment variable
     if run_live:
         os.environ['AZURE_CLI_TEST_RUN_LIVE'] = 'True'
 
+    # get test runner
+    run_nose = get_nose_runner(test_results_folder, xunit_report=True, exclude_integration=True,
+                               parallel=parallel, process_timeout=3600 if run_live else 600)
+
     # run tests
     test_folders = [test_path for _, _, test_path in modules]
     result, test_result = run_nose(test_folders)
diff --git a/src/azure-cli-core/azure/cli/core/tests/test_profile.py b/src/azure-cli-core/azure/cli/core/tests/test_profile.py
index 878e318f2..cef7e5644 100644
--- a/src/azure-cli-core/azure/cli/core/tests/test_profile.py
+++ b/src/azure-cli-core/azure/cli/core/tests/test_profile.py
@@ -157,13 +157,11 @@ class Test_Profile(unittest.TestCase):  # pylint: disable=too-many-public-method
                                                      False)
         profile._set_subscriptions(consolidated)
 
-        subscription1 = storage_mock['subscriptions'][0]
-        subscription2 = storage_mock['subscriptions'][1]
-        self.assertTrue(subscription2['isDefault'])
+        self.assertTrue(storage_mock['subscriptions'][1]['isDefault'])
 
-        profile.set_active_subscription(subscription1['id'])
-        self.assertFalse(subscription2['isDefault'])
-        self.assertTrue(subscription1['isDefault'])
+        profile.set_active_subscription(storage_mock['subscriptions'][0]['id'])
+        self.assertFalse(storage_mock['subscriptions'][1]['isDefault'])
+        self.assertTrue(storage_mock['subscriptions'][0]['isDefault'])
 
     def test_get_subscription(self):
         storage_mock = {'subscriptions': None}
diff --git a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/tests/test_network_unit_tests.py b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/tests/test_network_unit_tests.py
new file mode 100644
index 000000000..66ab9a44d
--- /dev/null
+++ b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/tests/test_network_unit_tests.py
@@ -0,0 +1,84 @@
+# --------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# --------------------------------------------------------------------------------------------
+
+import unittest
+
+import mock
+
+from azure.cli.core._util import CLIError
+
+class Test_Network_Unit_Tests(unittest.TestCase):
+
+    def test_network_get_nic_ip_config(self):
+        from azure.cli.command_modules.network.custom import _get_nic_ip_config
+
+        # 1 -  Test that if ip_configurations property is null, error is thrown
+        nic = mock.MagicMock()
+        nic.ip_configurations = None
+        with self.assertRaises(CLIError):
+            _get_nic_ip_config(nic, 'test')
+
+        def mock_ip_config(name, value):
+            fake = mock.MagicMock()
+            fake.name = name
+            fake.value = value
+            return fake
+
+        nic = mock.MagicMock()
+        nic.ip_configurations = [
+            mock_ip_config('test1', '1'),
+            mock_ip_config('test2', '2'),
+            mock_ip_config('test3', '3'),
+        ]
+        # 2 - Test that if ip_configurations is not null but no match, error is thrown
+        with self.assertRaises(CLIError):
+            _get_nic_ip_config(nic, 'test4')
+
+        # 3 - Test that match is returned
+        self.assertEqual(_get_nic_ip_config(nic, 'test2').value, '2')
+
+    def test_network_upsert(self):
+        from azure.cli.command_modules.network.custom import _upsert
+
+        obj1 = mock.MagicMock()
+        obj1.key = 'object1'
+        obj1.value = 'cat'
+
+        obj2 = mock.MagicMock()
+        obj2.key = 'object2'
+        obj2.value = 'dog'
+
+        # 1 - verify upsert to a null collection
+        parent_with_null_collection = mock.MagicMock()
+        parent_with_null_collection.collection = None
+        _upsert(parent_with_null_collection, 'collection', obj1, 'key')
+        result = parent_with_null_collection.collection
+        self.assertEqual(len(result), 1)
+        self.assertEqual(result[0].value, 'cat')
+
+        # 2 - verify upsert to an empty collection
+        parent_with_empty_collection = mock.MagicMock()
+        parent_with_empty_collection.collection = []
+        _upsert(parent_with_empty_collection, 'collection', obj1, 'key')
+        result = parent_with_empty_collection.collection
+        self.assertEqual(len(result), 1)
+        self.assertEqual(result[0].value, 'cat')
+
+        # 3 - verify can add more than one
+        _upsert(parent_with_empty_collection, 'collection', obj2, 'key')
+        result = parent_with_empty_collection.collection
+        self.assertEqual(len(result), 2)
+        self.assertEqual(result[1].value, 'dog')
+
+        # 4 - verify update to existing collection
+        obj2.value = 'noodle'
+        _upsert(parent_with_empty_collection, 'collection', obj2, 'key')
+        result = parent_with_empty_collection.collection
+        self.assertEqual(len(result), 2)
+        self.assertEqual(result[1].value, 'noodle')
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/tests/recordings/test_storage_account_scenario.yaml b/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/tests/recordings/test_storage_account_scenario.yaml
index 1c2f83a9e..1fc3a1527 100644
--- a/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/tests/recordings/test_storage_account_scenario.yaml
+++ b/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/tests/recordings/test_storage_account_scenario.yaml
@@ -7,10 +7,10 @@ interactions:
       Connection: [keep-alive]
       Content-Length: ['73']
       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.4
-          msrest_azure/0.4.7 storagemanagementclient/0.31.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
+      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 storagemanagementclient/0.31.0 Azure-SDK-For-Python AZURECLI/TEST/2.0.0+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [d3fbbbf4-f3c9-11e6-ab1b-74c63bed1137]
+      x-ms-client-request-id: [9c9be3b6-fed7-11e6-8ca8-a0b3ccf7272a]
     method: POST
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Storage/checkNameAvailability?api-version=2016-12-01
   response:
@@ -20,7 +20,7 @@ interactions:
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json]
-      Date: ['Wed, 15 Feb 2017 21:58:03 GMT']
+      Date: ['Wed, 01 Mar 2017 23:34:28 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-Azure-Storage-Resource-Provider/1.0, Microsoft-HTTPAPI/2.0]
@@ -37,10 +37,10 @@ interactions:
       Connection: [keep-alive]
       Content-Length: ['73']
       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.4
-          msrest_azure/0.4.7 storagemanagementclient/0.31.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
+      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 storagemanagementclient/0.31.0 Azure-SDK-For-Python AZURECLI/TEST/2.0.0+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [d4c73850-f3c9-11e6-9371-74c63bed1137]
+      x-ms-client-request-id: [9d4cbb68-fed7-11e6-96c5-a0b3ccf7272a]
     method: POST
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Storage/checkNameAvailability?api-version=2016-12-01
   response:
@@ -50,7 +50,7 @@ interactions:
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json]
-      Date: ['Wed, 15 Feb 2017 21:58:04 GMT']
+      Date: ['Wed, 01 Mar 2017 23:34:28 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-Azure-Storage-Resource-Provider/1.0, Microsoft-HTTPAPI/2.0]
@@ -60,17 +60,17 @@ interactions:
       content-length: ['23']
     status: {code: 200, message: OK}
 - request:
-    body: '{"sku": {"name": "Standard_LRS"}, "kind": "Storage", "location": "westus"}'
+    body: '{"sku": {"name": "Standard_LRS"}, "location": "westus", "kind": "Storage"}'
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Length: ['74']
       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.4
-          msrest_azure/0.4.7 storagemanagementclient/0.31.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
+      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 storagemanagementclient/0.31.0 Azure-SDK-For-Python AZURECLI/TEST/2.0.0+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [d58758a8-f3c9-11e6-93c6-74c63bed1137]
+      x-ms-client-request-id: [9dfccaee-fed7-11e6-ac56-a0b3ccf7272a]
     method: PUT
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_storage_account_scenario/providers/Microsoft.Storage/storageAccounts/dummystorage?api-version=2016-12-01
   response:
@@ -78,14 +78,14 @@ interactions:
     headers:
       Cache-Control: [no-cache]
       Content-Length: ['0']
-      Date: ['Wed, 15 Feb 2017 21:58:07 GMT']
+      Date: ['Wed, 01 Mar 2017 23:34:30 GMT']
       Expires: ['-1']
-      Location: ['https://management.azure.com/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/providers/Microsoft.Storage/operations/9147d762-549f-4705-a5ac-dbf05b9c7a94?monitor=true&api-version=2016-12-01']
+      Location: ['https://management.azure.com/subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/providers/Microsoft.Storage/operations/47260cb6-ad6b-4505-abf3-db1258120ff9?monitor=true&api-version=2016-12-01']
       Pragma: [no-cache]
       Retry-After: ['17']
       Server: [Microsoft-Azure-Storage-Resource-Provider/1.0, Microsoft-HTTPAPI/2.0]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
-      x-ms-ratelimit-remaining-subscription-writes: ['1196']
+      x-ms-ratelimit-remaining-subscription-writes: ['1199']
     status: {code: 202, message: Accepted}
 - request:
     body: null
@@ -94,20 +94,20 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       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.4
-          msrest_azure/0.4.7 storagemanagementclient/0.31.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
+      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 storagemanagementclient/0.31.0 Azure-SDK-For-Python AZURECLI/TEST/2.0.0+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [d58758a8-f3c9-11e6-93c6-74c63bed1137]
+      x-ms-client-request-id: [9dfccaee-fed7-11e6-ac56-a0b3ccf7272a]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Storage/operations/9147d762-549f-4705-a5ac-dbf05b9c7a94?monitor=true&api-version=2016-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Storage/operations/47260cb6-ad6b-4505-abf3-db1258120ff9?monitor=true&api-version=2016-12-01
   response:
-    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_storage_account_scenario/providers/Microsoft.Storage/storageAccounts/vcrstorage733641907300","kind":"Storage","location":"westus","name":"vcrstorage733641907300","properties":{"creationTime":"2017-02-15T21:58:07.7815453Z","primaryEndpoints":{"blob":"https://vcrstorage733641907300.blob.core.windows.net/","file":"https://vcrstorage733641907300.file.core.windows.net/","queue":"https://vcrstorage733641907300.queue.core.windows.net/","table":"https://vcrstorage733641907300.table.core.windows.net/"},"primaryLocation":"westus","provisioningState":"Succeeded","statusOfPrimary":"available"},"sku":{"name":"Standard_LRS","tier":"Standard"},"tags":{},"type":"Microsoft.Storage/storageAccounts"}
+    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_storage_account_scenario/providers/Microsoft.Storage/storageAccounts/vcrstorage000197884384","kind":"Storage","location":"westus","name":"vcrstorage000197884384","properties":{"creationTime":"2017-03-01T23:34:31.1193082Z","primaryEndpoints":{"blob":"https://vcrstorage000197884384.blob.core.windows.net/","file":"https://vcrstorage000197884384.file.core.windows.net/","queue":"https://vcrstorage000197884384.queue.core.windows.net/","table":"https://vcrstorage000197884384.table.core.windows.net/"},"primaryLocation":"westus","provisioningState":"Succeeded","statusOfPrimary":"available"},"sku":{"name":"Standard_LRS","tier":"Standard"},"tags":{},"type":"Microsoft.Storage/storageAccounts"}
 
         '}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json]
-      Date: ['Wed, 15 Feb 2017 21:58:24 GMT']
+      Date: ['Wed, 01 Mar 2017 23:34:47 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-Azure-Storage-Resource-Provider/1.0, Microsoft-HTTPAPI/2.0]
@@ -117,28 +117,28 @@ interactions:
       content-length: ['776']
     status: {code: 200, message: OK}
 - request:
-    body: '{"name": "vcrstorage733641907300", "type": "Microsoft.Storage/storageAccounts"}'
+    body: '{"name": "vcrstorage000197884384", "type": "Microsoft.Storage/storageAccounts"}'
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Length: ['79']
       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.4
-          msrest_azure/0.4.7 storagemanagementclient/0.31.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
+      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 storagemanagementclient/0.31.0 Azure-SDK-For-Python AZURECLI/TEST/2.0.0+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [e1bebfcc-f3c9-11e6-a3b6-74c63bed1137]
+      x-ms-client-request-id: [a9a247a6-fed7-11e6-88e9-a0b3ccf7272a]
     method: POST
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Storage/checkNameAvailability?api-version=2016-12-01
   response:
-    body: {string: '{"message":"The storage account named vcrstorage733641907300 is
+    body: {string: '{"message":"The storage account named vcrstorage000197884384 is
         already taken.","nameAvailable":false,"reason":"AlreadyExists"}
 
         '}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json]
-      Date: ['Wed, 15 Feb 2017 21:58:26 GMT']
+      Date: ['Wed, 01 Mar 2017 23:34:50 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-Azure-Storage-Resource-Provider/1.0, Microsoft-HTTPAPI/2.0]
@@ -154,20 +154,20 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       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.4
-          msrest_azure/0.4.7 storagemanagementclient/0.31.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
+      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 storagemanagementclient/0.31.0 Azure-SDK-For-Python AZURECLI/TEST/2.0.0+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [e25fb3ac-f3c9-11e6-9d53-74c63bed1137]
+      x-ms-client-request-id: [aa39415a-fed7-11e6-b244-a0b3ccf7272a]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_storage_account_scenario/providers/Microsoft.Storage/storageAccounts?api-version=2016-12-01
   response:
-    body: {string: '{"value":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_storage_account_scenario/providers/Microsoft.Storage/storageAccounts/vcrstorage733641907300","kind":"Storage","location":"westus","name":"vcrstorage733641907300","properties":{"creationTime":"2017-02-15T21:58:07.7815453Z","primaryEndpoints":{"blob":"https://vcrstorage733641907300.blob.core.windows.net/","file":"https://vcrstorage733641907300.file.core.windows.net/","queue":"https://vcrstorage733641907300.queue.core.windows.net/","table":"https://vcrstorage733641907300.table.core.windows.net/"},"primaryLocation":"westus","provisioningState":"Succeeded","statusOfPrimary":"available"},"sku":{"name":"Standard_LRS","tier":"Standard"},"tags":{},"type":"Microsoft.Storage/storageAccounts"}]}
+    body: {string: '{"value":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_storage_account_scenario/providers/Microsoft.Storage/storageAccounts/vcrstorage000197884384","kind":"Storage","location":"westus","name":"vcrstorage000197884384","properties":{"creationTime":"2017-03-01T23:34:31.1193082Z","primaryEndpoints":{"blob":"https://vcrstorage000197884384.blob.core.windows.net/","file":"https://vcrstorage000197884384.file.core.windows.net/","queue":"https://vcrstorage000197884384.queue.core.windows.net/","table":"https://vcrstorage000197884384.table.core.windows.net/"},"primaryLocation":"westus","provisioningState":"Succeeded","statusOfPrimary":"available"},"sku":{"name":"Standard_LRS","tier":"Standard"},"tags":{},"type":"Microsoft.Storage/storageAccounts"}]}
 
         '}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json]
-      Date: ['Wed, 15 Feb 2017 21:58:26 GMT']
+      Date: ['Wed, 01 Mar 2017 23:34:50 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-Azure-Storage-Resource-Provider/1.0, Microsoft-HTTPAPI/2.0]
@@ -183,20 +183,20 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       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.4
-          msrest_azure/0.4.7 storagemanagementclient/0.31.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
+      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 storagemanagementclient/0.31.0 Azure-SDK-For-Python AZURECLI/TEST/2.0.0+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [e2e57f30-f3c9-11e6-b459-74c63bed1137]
+      x-ms-client-request-id: [aad6b914-fed7-11e6-8f5e-a0b3ccf7272a]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_storage_account_scenario/providers/Microsoft.Storage/storageAccounts/dummystorage?api-version=2016-12-01
   response:
-    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_storage_account_scenario/providers/Microsoft.Storage/storageAccounts/vcrstorage733641907300","kind":"Storage","location":"westus","name":"vcrstorage733641907300","properties":{"creationTime":"2017-02-15T21:58:07.7815453Z","primaryEndpoints":{"blob":"https://vcrstorage733641907300.blob.core.windows.net/","file":"https://vcrstorage733641907300.file.core.windows.net/","queue":"https://vcrstorage733641907300.queue.core.windows.net/","table":"https://vcrstorage733641907300.table.core.windows.net/"},"primaryLocation":"westus","provisioningState":"Succeeded","statusOfPrimary":"available"},"sku":{"name":"Standard_LRS","tier":"Standard"},"tags":{},"type":"Microsoft.Storage/storageAccounts"}
+    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_storage_account_scenario/providers/Microsoft.Storage/storageAccounts/vcrstorage000197884384","kind":"Storage","location":"westus","name":"vcrstorage000197884384","properties":{"creationTime":"2017-03-01T23:34:31.1193082Z","primaryEndpoints":{"blob":"https://vcrstorage000197884384.blob.core.windows.net/","file":"https://vcrstorage000197884384.file.core.windows.net/","queue":"https://vcrstorage000197884384.queue.core.windows.net/","table":"https://vcrstorage000197884384.table.core.windows.net/"},"primaryLocation":"westus","provisioningState":"Succeeded","statusOfPrimary":"available"},"sku":{"name":"Standard_LRS","tier":"Standard"},"tags":{},"type":"Microsoft.Storage/storageAccounts"}
 
         '}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json]
-      Date: ['Wed, 15 Feb 2017 21:58:27 GMT']
+      Date: ['Wed, 01 Mar 2017 23:34:52 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-Azure-Storage-Resource-Provider/1.0, Microsoft-HTTPAPI/2.0]
@@ -212,21 +212,21 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       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.4
-          msrest_azure/0.4.7 storagemanagementclient/0.31.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
+      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 storagemanagementclient/0.31.0 Azure-SDK-For-Python AZURECLI/TEST/2.0.0+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [e3620122-f3c9-11e6-9d80-74c63bed1137]
+      x-ms-client-request-id: [ab60fc00-fed7-11e6-8a97-a0b3ccf7272a]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Storage/usages?api-version=2016-12-01
   response:
     body: {string: "{\r\n  \"value\": [\r\n    {\r\n      \"unit\": \"Count\",\r\n\
-        \      \"currentValue\": 41,\r\n      \"limit\": 250,\r\n      \"name\": {\r\
+        \      \"currentValue\": 43,\r\n      \"limit\": 250,\r\n      \"name\": {\r\
         \n        \"value\": \"StorageAccounts\",\r\n        \"localizedValue\": \"\
         Storage Accounts\"\r\n      }\r\n    }\r\n  ]\r\n}"}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json]
-      Date: ['Wed, 15 Feb 2017 21:58:28 GMT']
+      Date: ['Wed, 01 Mar 2017 23:34:52 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-Azure-Storage-Resource-Provider/1.0, Microsoft-HTTPAPI/2.0]
@@ -243,20 +243,20 @@ interactions:
       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.4
-          msrest_azure/0.4.7 storagemanagementclient/0.31.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
+      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 storagemanagementclient/0.31.0 Azure-SDK-For-Python AZURECLI/TEST/2.0.0+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [e3f246c6-f3c9-11e6-8348-74c63bed1137]
+      x-ms-client-request-id: [abff0f12-fed7-11e6-8753-a0b3ccf7272a]
     method: POST
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_storage_account_scenario/providers/Microsoft.Storage/storageAccounts/dummystorage/listKeys?api-version=2016-12-01
   response:
-    body: {string: '{"keys":[{"keyName":"key1","permissions":"Full","value":"FvHhwyIgb9w4f9IP8q8hsco9YRMQx2Cmw7/twW6Z5BDSqV7E3glSpl6XjhGd4EBoH1y3Qs7ZydIzRdzXb5RUlA=="},{"keyName":"key2","permissions":"Full","value":"bl05+mAzQpLT0w07vniIWTHZfgxJ8M9ywLnk6NmJ0EsWmpa/QBeO9zK7AObh4pOmsIBgeQq7ibjoDYpLBjLxmw=="}]}
+    body: {string: '{"keys":[{"keyName":"key1","permissions":"Full","value":"ItLmzJCF8AnEJIgk03B+Hnp6H7farh0R/pAriD55Jfpx1/h5VM7StJbEACuMPO+1yPL4F0JolztcG1Ma4wS1Sw=="},{"keyName":"key2","permissions":"Full","value":"sVCBmSEwOpBbPiI3MNKdBMJKBdrHun8OTUkiyRIkZQWwNbgt2xcfOFn0GluHepOkQ9Mopcjld8Xjxm7MfPD91g=="}]}
 
         '}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json]
-      Date: ['Wed, 15 Feb 2017 21:58:29 GMT']
+      Date: ['Wed, 01 Mar 2017 23:34:53 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-Azure-Storage-Resource-Provider/1.0, Microsoft-HTTPAPI/2.0]
@@ -264,7 +264,7 @@ interactions:
       Transfer-Encoding: [chunked]
       Vary: [Accept-Encoding]
       content-length: ['289']
-      x-ms-ratelimit-remaining-subscription-writes: ['1199']
+      x-ms-ratelimit-remaining-subscription-writes: ['1198']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -274,20 +274,20 @@ interactions:
       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.4
-          msrest_azure/0.4.7 storagemanagementclient/0.31.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
+      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 storagemanagementclient/0.31.0 Azure-SDK-For-Python AZURECLI/TEST/2.0.0+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [e461e3c2-f3c9-11e6-a33d-74c63bed1137]
+      x-ms-client-request-id: [ac779990-fed7-11e6-b38f-a0b3ccf7272a]
     method: POST
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_storage_account_scenario/providers/Microsoft.Storage/storageAccounts/dummystorage/listKeys?api-version=2016-12-01
   response:
-    body: {string: '{"keys":[{"keyName":"key1","permissions":"Full","value":"FvHhwyIgb9w4f9IP8q8hsco9YRMQx2Cmw7/twW6Z5BDSqV7E3glSpl6XjhGd4EBoH1y3Qs7ZydIzRdzXb5RUlA=="},{"keyName":"key2","permissions":"Full","value":"bl05+mAzQpLT0w07vniIWTHZfgxJ8M9ywLnk6NmJ0EsWmpa/QBeO9zK7AObh4pOmsIBgeQq7ibjoDYpLBjLxmw=="}]}
+    body: {string: '{"keys":[{"keyName":"key1","permissions":"Full","value":"ItLmzJCF8AnEJIgk03B+Hnp6H7farh0R/pAriD55Jfpx1/h5VM7StJbEACuMPO+1yPL4F0JolztcG1Ma4wS1Sw=="},{"keyName":"key2","permissions":"Full","value":"sVCBmSEwOpBbPiI3MNKdBMJKBdrHun8OTUkiyRIkZQWwNbgt2xcfOFn0GluHepOkQ9Mopcjld8Xjxm7MfPD91g=="}]}
 
         '}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json]
-      Date: ['Wed, 15 Feb 2017 21:58:31 GMT']
+      Date: ['Wed, 01 Mar 2017 23:34:54 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-Azure-Storage-Resource-Provider/1.0, Microsoft-HTTPAPI/2.0]
@@ -295,24 +295,24 @@ interactions:
       Transfer-Encoding: [chunked]
       Vary: [Accept-Encoding]
       content-length: ['289']
-      x-ms-ratelimit-remaining-subscription-writes: ['1199']
+      x-ms-ratelimit-remaining-subscription-writes: ['1198']
     status: {code: 200, message: OK}
 - request:
     body: null
     headers:
       Connection: [keep-alive]
-      User-Agent: [Azure-Storage/0.33.0 (Python CPython 3.5.3; Windows 10) AZURECLI/0.1.1b3+dev]
-      x-ms-client-request-id: [d1951d86-f3c9-11e6-849f-74c63bed1137]
-      x-ms-date: ['Wed, 15 Feb 2017 21:58:33 GMT']
+      User-Agent: [Azure-Storage/0.33.0 (Python CPython 3.5.1; Windows 10) AZURECLI/2.0.0+dev]
+      x-ms-client-request-id: [99cd850c-fed7-11e6-bb24-a0b3ccf7272a]
+      x-ms-date: ['Wed, 01 Mar 2017 23:34:55 GMT']
       x-ms-version: ['2015-07-08']
     method: GET
-    uri: https://dummystorage.blob.core.windows.net/?restype=service&comp=properties
+    uri: https://dummystorage.blob.core.windows.net/?comp=properties&restype=service
   response:
     body: {string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><StorageServiceProperties><Logging><Version>1.0</Version><Read>false</Read><Write>false</Write><Delete>false</Delete><RetentionPolicy><Enabled>false</Enabled></RetentionPolicy></Logging><HourMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>true</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>7</Days></RetentionPolicy></HourMetrics><MinuteMetrics><Version>1.0</Version><Enabled>false</Enabled><RetentionPolicy><Enabled>false</Enabled></RetentionPolicy></MinuteMetrics><Cors\
         \ /></StorageServiceProperties>"}
     headers:
       Content-Type: [application/xml]
-      Date: ['Wed, 15 Feb 2017 21:58:31 GMT']
+      Date: ['Wed, 01 Mar 2017 23:34:54 GMT']
       Server: [Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0]
       Transfer-Encoding: [chunked]
       x-ms-version: ['2015-07-08']
@@ -321,19 +321,19 @@ interactions:
     body: null
     headers:
       Connection: [keep-alive]
-      User-Agent: [Azure-Storage/0.33.0 (Python CPython 3.5.3; Windows 10) AZURECLI/0.1.1b3+dev]
-      x-ms-client-request-id: [d1951d86-f3c9-11e6-849f-74c63bed1137]
-      x-ms-date: ['Wed, 15 Feb 2017 21:58:34 GMT']
+      User-Agent: [Azure-Storage/0.33.0 (Python CPython 3.5.1; Windows 10) AZURECLI/2.0.0+dev]
+      x-ms-client-request-id: [99cd850c-fed7-11e6-bb24-a0b3ccf7272a]
+      x-ms-date: ['Wed, 01 Mar 2017 23:34:55 GMT']
       x-ms-version: ['2015-07-08']
     method: GET
-    uri: https://dummystorage.queue.core.windows.net/?restype=service&comp=properties
+    uri: https://dummystorage.queue.core.windows.net/?comp=properties&restype=service
   response:
     body: {string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><StorageServiceProperties><Logging><Version>1.0</Version><Read>false</Read><Write>false</Write><Delete>false</Delete><RetentionPolicy><Enabled>false</Enabled></RetentionPolicy></Logging><HourMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>true</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>7</Days></RetentionPolicy></HourMetrics><MinuteMetrics><Version>1.0</Version><Enabled>false</Enabled><RetentionPolicy><Enabled>false</Enabled></RetentionPolicy></MinuteMetrics><Cors\
         \ /></StorageServiceProperties>"}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/xml]
-      Date: ['Wed, 15 Feb 2017 21:58:32 GMT']
+      Date: ['Wed, 01 Mar 2017 23:34:57 GMT']
       Server: [Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0]
       Transfer-Encoding: [chunked]
       x-ms-version: ['2015-07-08']
@@ -344,18 +344,18 @@ interactions:
       Connection: [keep-alive]
       DataServiceVersion: [3.0;NetFx]
       MaxDataServiceVersion: ['3.0']
-      User-Agent: [Azure-Storage/0.33.0 (Python CPython 3.5.3; Windows 10) AZURECLI/0.1.1b3+dev]
-      x-ms-client-request-id: [d1951d86-f3c9-11e6-849f-74c63bed1137]
-      x-ms-date: ['Wed, 15 Feb 2017 21:58:34 GMT']
+      User-Agent: [Azure-Storage/0.33.0 (Python CPython 3.5.1; Windows 10) AZURECLI/2.0.0+dev]
+      x-ms-client-request-id: [99cd850c-fed7-11e6-bb24-a0b3ccf7272a]
+      x-ms-date: ['Wed, 01 Mar 2017 23:34:57 GMT']
       x-ms-version: ['2015-07-08']
     method: GET
-    uri: https://dummystorage.table.core.windows.net/?restype=service&comp=properties
+    uri: https://dummystorage.table.core.windows.net/?comp=properties&restype=service
   response:
     body: {string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><StorageServiceProperties><Logging><Version>1.0</Version><Read>false</Read><Write>false</Write><Delete>false</Delete><RetentionPolicy><Enabled>false</Enabled></RetentionPolicy></Logging><HourMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>true</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>7</Days></RetentionPolicy></HourMetrics><MinuteMetrics><Version>1.0</Version><Enabled>false</Enabled><RetentionPolicy><Enabled>false</Enabled></RetentionPolicy></MinuteMetrics><Cors\
         \ /></StorageServiceProperties>"}
     headers:
       Content-Type: [application/xml]
-      Date: ['Wed, 15 Feb 2017 21:58:31 GMT']
+      Date: ['Wed, 01 Mar 2017 23:34:56 GMT']
       Server: [Windows-Azure-Table/1.0 Microsoft-HTTPAPI/2.0]
       Transfer-Encoding: [chunked]
       x-ms-version: ['2015-07-08']
@@ -367,16 +367,16 @@ interactions:
     headers:
       Connection: [keep-alive]
       Content-Length: ['264']
-      User-Agent: [Azure-Storage/0.33.0 (Python CPython 3.5.3; Windows 10) AZURECLI/0.1.1b3+dev]
-      x-ms-client-request-id: [d1951d86-f3c9-11e6-849f-74c63bed1137]
-      x-ms-date: ['Wed, 15 Feb 2017 21:58:35 GMT']
+      User-Agent: [Azure-Storage/0.33.0 (Python CPython 3.5.1; Windows 10) AZURECLI/2.0.0+dev]
+      x-ms-client-request-id: [99cd850c-fed7-11e6-bb24-a0b3ccf7272a]
+      x-ms-date: ['Wed, 01 Mar 2017 23:34:58 GMT']
       x-ms-version: ['2015-07-08']
     method: PUT
-    uri: https://dummystorage.blob.core.windows.net/?restype=service&comp=properties
+    uri: https://dummystorage.blob.core.windows.net/?comp=properties&restype=service
   response:
     body: {string: ''}
     headers:
-      Date: ['Wed, 15 Feb 2017 21:58:32 GMT']
+      Date: ['Wed, 01 Mar 2017 23:34:57 GMT']
       Server: [Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0]
       Transfer-Encoding: [chunked]
       x-ms-version: ['2015-07-08']
@@ -385,18 +385,18 @@ interactions:
     body: null
     headers:
       Connection: [keep-alive]
-      User-Agent: [Azure-Storage/0.33.0 (Python CPython 3.5.3; Windows 10) AZURECLI/0.1.1b3+dev]
-      x-ms-client-request-id: [d1951d86-f3c9-11e6-849f-74c63bed1137]
-      x-ms-date: ['Wed, 15 Feb 2017 21:58:35 GMT']
+      User-Agent: [Azure-Storage/0.33.0 (Python CPython 3.5.1; Windows 10) AZURECLI/2.0.0+dev]
+      x-ms-client-request-id: [99cd850c-fed7-11e6-bb24-a0b3ccf7272a]
+      x-ms-date: ['Wed, 01 Mar 2017 23:34:59 GMT']
       x-ms-version: ['2015-07-08']
     method: GET
-    uri: https://dummystorage.blob.core.windows.net/?restype=service&comp=properties
+    uri: https://dummystorage.blob.core.windows.net/?comp=properties&restype=service
   response:
     body: {string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><StorageServiceProperties><Logging><Version>1.0</Version><Read>true</Read><Write>false</Write><Delete>false</Delete><RetentionPolicy><Enabled>true</Enabled><Days>1</Days></RetentionPolicy></Logging><HourMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>true</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>7</Days></RetentionPolicy></HourMetrics><MinuteMetrics><Version>1.0</Version><Enabled>false</Enabled><RetentionPolicy><Enabled>false</Enabled></RetentionPolicy></MinuteMetrics><Cors\
         \ /></StorageServiceProperties>"}
     headers:
       Content-Type: [application/xml]
-      Date: ['Wed, 15 Feb 2017 21:58:32 GMT']
+      Date: ['Wed, 01 Mar 2017 23:34:58 GMT']
       Server: [Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0]
       Transfer-Encoding: [chunked]
       x-ms-version: ['2015-07-08']
@@ -405,19 +405,19 @@ interactions:
     body: null
     headers:
       Connection: [keep-alive]
-      User-Agent: [Azure-Storage/0.33.0 (Python CPython 3.5.3; Windows 10) AZURECLI/0.1.1b3+dev]
-      x-ms-client-request-id: [d1951d86-f3c9-11e6-849f-74c63bed1137]
-      x-ms-date: ['Wed, 15 Feb 2017 21:58:35 GMT']
+      User-Agent: [Azure-Storage/0.33.0 (Python CPython 3.5.1; Windows 10) AZURECLI/2.0.0+dev]
+      x-ms-client-request-id: [99cd850c-fed7-11e6-bb24-a0b3ccf7272a]
+      x-ms-date: ['Wed, 01 Mar 2017 23:34:59 GMT']
       x-ms-version: ['2015-07-08']
     method: GET
-    uri: https://dummystorage.queue.core.windows.net/?restype=service&comp=properties
+    uri: https://dummystorage.queue.core.windows.net/?comp=properties&restype=service
   response:
     body: {string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><StorageServiceProperties><Logging><Version>1.0</Version><Read>false</Read><Write>false</Write><Delete>false</Delete><RetentionPolicy><Enabled>false</Enabled></RetentionPolicy></Logging><HourMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>true</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>7</Days></RetentionPolicy></HourMetrics><MinuteMetrics><Version>1.0</Version><Enabled>false</Enabled><RetentionPolicy><Enabled>false</Enabled></RetentionPolicy></MinuteMetrics><Cors\
         \ /></StorageServiceProperties>"}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/xml]
-      Date: ['Wed, 15 Feb 2017 21:58:33 GMT']
+      Date: ['Wed, 01 Mar 2017 23:34:58 GMT']
       Server: [Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0]
       Transfer-Encoding: [chunked]
       x-ms-version: ['2015-07-08']
@@ -428,18 +428,18 @@ interactions:
       Connection: [keep-alive]
       DataServiceVersion: [3.0;NetFx]
       MaxDataServiceVersion: ['3.0']
-      User-Agent: [Azure-Storage/0.33.0 (Python CPython 3.5.3; Windows 10) AZURECLI/0.1.1b3+dev]
-      x-ms-client-request-id: [d1951d86-f3c9-11e6-849f-74c63bed1137]
-      x-ms-date: ['Wed, 15 Feb 2017 21:58:35 GMT']
+      User-Agent: [Azure-Storage/0.33.0 (Python CPython 3.5.1; Windows 10) AZURECLI/2.0.0+dev]
+      x-ms-client-request-id: [99cd850c-fed7-11e6-bb24-a0b3ccf7272a]
+      x-ms-date: ['Wed, 01 Mar 2017 23:34:59 GMT']
       x-ms-version: ['2015-07-08']
     method: GET
-    uri: https://dummystorage.table.core.windows.net/?restype=service&comp=properties
+    uri: https://dummystorage.table.core.windows.net/?comp=properties&restype=service
   response:
     body: {string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><StorageServiceProperties><Logging><Version>1.0</Version><Read>false</Read><Write>false</Write><Delete>false</Delete><RetentionPolicy><Enabled>false</Enabled></RetentionPolicy></Logging><HourMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>true</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>7</Days></RetentionPolicy></HourMetrics><MinuteMetrics><Version>1.0</Version><Enabled>false</Enabled><RetentionPolicy><Enabled>false</Enabled></RetentionPolicy></MinuteMetrics><Cors\
         \ /></StorageServiceProperties>"}
     headers:
       Content-Type: [application/xml]
-      Date: ['Wed, 15 Feb 2017 21:58:33 GMT']
+      Date: ['Wed, 01 Mar 2017 23:34:58 GMT']
       Server: [Windows-Azure-Table/1.0 Microsoft-HTTPAPI/2.0]
       Transfer-Encoding: [chunked]
       x-ms-version: ['2015-07-08']
@@ -448,18 +448,18 @@ interactions:
     body: null
     headers:
       Connection: [keep-alive]
-      User-Agent: [Azure-Storage/0.33.0 (Python CPython 3.5.3; Windows 10) AZURECLI/0.1.1b3+dev]
-      x-ms-client-request-id: [d1951d86-f3c9-11e6-849f-74c63bed1137]
-      x-ms-date: ['Wed, 15 Feb 2017 21:58:36 GMT']
+      User-Agent: [Azure-Storage/0.33.0 (Python CPython 3.5.1; Windows 10) AZURECLI/2.0.0+dev]
+      x-ms-client-request-id: [99cd850c-fed7-11e6-bb24-a0b3ccf7272a]
+      x-ms-date: ['Wed, 01 Mar 2017 23:34:59 GMT']
       x-ms-version: ['2015-07-08']
     method: GET
-    uri: https://dummystorage.blob.core.windows.net/?restype=service&comp=properties
+    uri: https://dummystorage.blob.core.windows.net/?comp=properties&restype=service
   response:
     body: {string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><StorageServiceProperties><Logging><Version>1.0</Version><Read>true</Read><Write>false</Write><Delete>false</Delete><RetentionPolicy><Enabled>true</Enabled><Days>1</Days></RetentionPolicy></Logging><HourMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>true</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>7</Days></RetentionPolicy></HourMetrics><MinuteMetrics><Version>1.0</Version><Enabled>false</Enabled><RetentionPolicy><Enabled>false</Enabled></RetentionPolicy></MinuteMetrics><Cors\
         \ /></StorageServiceProperties>"}
     headers:
       Content-Type: [application/xml]
-      Date: ['Wed, 15 Feb 2017 21:58:33 GMT']
+      Date: ['Wed, 01 Mar 2017 23:34:58 GMT']
       Server: [Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0]
       Transfer-Encoding: [chunked]
       x-ms-version: ['2015-07-08']
@@ -468,18 +468,18 @@ interactions:
     body: null
     headers:
       Connection: [keep-alive]
-      User-Agent: [Azure-Storage/0.33.0 (Python CPython 3.5.3; Windows 10) AZURECLI/0.1.1b3+dev]
-      x-ms-client-request-id: [d1951d86-f3c9-11e6-849f-74c63bed1137]
-      x-ms-date: ['Wed, 15 Feb 2017 21:58:36 GMT']
+      User-Agent: [Azure-Storage/0.33.0 (Python CPython 3.5.1; Windows 10) AZURECLI/2.0.0+dev]
+      x-ms-client-request-id: [99cd850c-fed7-11e6-bb24-a0b3ccf7272a]
+      x-ms-date: ['Wed, 01 Mar 2017 23:34:59 GMT']
       x-ms-version: ['2015-07-08']
     method: GET
-    uri: https://dummystorage.file.core.windows.net/?restype=service&comp=properties
+    uri: https://dummystorage.file.core.windows.net/?comp=properties&restype=service
   response:
     body: {string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><StorageServiceProperties><HourMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>true</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>7</Days></RetentionPolicy></HourMetrics><MinuteMetrics><Version>1.0</Version><Enabled>false</Enabled><RetentionPolicy><Enabled>false</Enabled></RetentionPolicy></MinuteMetrics><Cors\
         \ /></StorageServiceProperties>"}
     headers:
       Content-Type: [application/xml]
-      Date: ['Wed, 15 Feb 2017 21:58:33 GMT']
+      Date: ['Wed, 01 Mar 2017 23:34:59 GMT']
       Server: [Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0]
       Transfer-Encoding: [chunked]
       x-ms-version: ['2015-07-08']
@@ -488,19 +488,19 @@ interactions:
     body: null
     headers:
       Connection: [keep-alive]
-      User-Agent: [Azure-Storage/0.33.0 (Python CPython 3.5.3; Windows 10) AZURECLI/0.1.1b3+dev]
-      x-ms-client-request-id: [d1951d86-f3c9-11e6-849f-74c63bed1137]
-      x-ms-date: ['Wed, 15 Feb 2017 21:58:36 GMT']
+      User-Agent: [Azure-Storage/0.33.0 (Python CPython 3.5.1; Windows 10) AZURECLI/2.0.0+dev]
+      x-ms-client-request-id: [99cd850c-fed7-11e6-bb24-a0b3ccf7272a]
+      x-ms-date: ['Wed, 01 Mar 2017 23:34:59 GMT']
       x-ms-version: ['2015-07-08']
     method: GET
-    uri: https://dummystorage.queue.core.windows.net/?restype=service&comp=properties
+    uri: https://dummystorage.queue.core.windows.net/?comp=properties&restype=service
   response:
     body: {string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><StorageServiceProperties><Logging><Version>1.0</Version><Read>false</Read><Write>false</Write><Delete>false</Delete><RetentionPolicy><Enabled>false</Enabled></RetentionPolicy></Logging><HourMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>true</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>7</Days></RetentionPolicy></HourMetrics><MinuteMetrics><Version>1.0</Version><Enabled>false</Enabled><RetentionPolicy><Enabled>false</Enabled></RetentionPolicy></MinuteMetrics><Cors\
         \ /></StorageServiceProperties>"}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/xml]
-      Date: ['Wed, 15 Feb 2017 21:58:34 GMT']
+      Date: ['Wed, 01 Mar 2017 23:34:59 GMT']
       Server: [Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0]
       Transfer-Encoding: [chunked]
       x-ms-version: ['2015-07-08']
@@ -511,18 +511,18 @@ interactions:
       Connection: [keep-alive]
       DataServiceVersion: [3.0;NetFx]
       MaxDataServiceVersion: ['3.0']
-      User-Agent: [Azure-Storage/0.33.0 (Python CPython 3.5.3; Windows 10) AZURECLI/0.1.1b3+dev]
-      x-ms-client-request-id: [d1951d86-f3c9-11e6-849f-74c63bed1137]
-      x-ms-date: ['Wed, 15 Feb 2017 21:58:36 GMT']
+      User-Agent: [Azure-Storage/0.33.0 (Python CPython 3.5.1; Windows 10) AZURECLI/2.0.0+dev]
+      x-ms-client-request-id: [99cd850c-fed7-11e6-bb24-a0b3ccf7272a]
+      x-ms-date: ['Wed, 01 Mar 2017 23:35:00 GMT']
       x-ms-version: ['2015-07-08']
     method: GET
-    uri: https://dummystorage.table.core.windows.net/?restype=service&comp=properties
+    uri: https://dummystorage.table.core.windows.net/?comp=properties&restype=service
   response:
     body: {string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><StorageServiceProperties><Logging><Version>1.0</Version><Read>false</Read><Write>false</Write><Delete>false</Delete><RetentionPolicy><Enabled>false</Enabled></RetentionPolicy></Logging><HourMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>true</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>7</Days></RetentionPolicy></HourMetrics><MinuteMetrics><Version>1.0</Version><Enabled>false</Enabled><RetentionPolicy><Enabled>false</Enabled></RetentionPolicy></MinuteMetrics><Cors\
         \ /></StorageServiceProperties>"}
     headers:
       Content-Type: [application/xml]
-      Date: ['Wed, 15 Feb 2017 21:58:33 GMT']
+      Date: ['Wed, 01 Mar 2017 23:34:59 GMT']
       Server: [Windows-Azure-Table/1.0 Microsoft-HTTPAPI/2.0]
       Transfer-Encoding: [chunked]
       x-ms-version: ['2015-07-08']
@@ -534,16 +534,16 @@ interactions:
     headers:
       Connection: [keep-alive]
       Content-Length: ['386']
-      User-Agent: [Azure-Storage/0.33.0 (Python CPython 3.5.3; Windows 10) AZURECLI/0.1.1b3+dev]
-      x-ms-client-request-id: [d1951d86-f3c9-11e6-849f-74c63bed1137]
-      x-ms-date: ['Wed, 15 Feb 2017 21:58:37 GMT']
+      User-Agent: [Azure-Storage/0.33.0 (Python CPython 3.5.1; Windows 10) AZURECLI/2.0.0+dev]
+      x-ms-client-request-id: [99cd850c-fed7-11e6-bb24-a0b3ccf7272a]
+      x-ms-date: ['Wed, 01 Mar 2017 23:35:00 GMT']
       x-ms-version: ['2015-07-08']
     method: PUT
-    uri: https://dummystorage.file.core.windows.net/?restype=service&comp=properties
+    uri: https://dummystorage.file.core.windows.net/?comp=properties&restype=service
   response:
     body: {string: ''}
     headers:
-      Date: ['Wed, 15 Feb 2017 21:58:34 GMT']
+      Date: ['Wed, 01 Mar 2017 23:35:00 GMT']
       Server: [Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0]
       Transfer-Encoding: [chunked]
       x-ms-version: ['2015-07-08']
@@ -552,18 +552,18 @@ interactions:
     body: null
     headers:
       Connection: [keep-alive]
-      User-Agent: [Azure-Storage/0.33.0 (Python CPython 3.5.3; Windows 10) AZURECLI/0.1.1b3+dev]
-      x-ms-client-request-id: [d1951d86-f3c9-11e6-849f-74c63bed1137]
-      x-ms-date: ['Wed, 15 Feb 2017 21:58:37 GMT']
+      User-Agent: [Azure-Storage/0.33.0 (Python CPython 3.5.1; Windows 10) AZURECLI/2.0.0+dev]
+      x-ms-client-request-id: [99cd850c-fed7-11e6-bb24-a0b3ccf7272a]
+      x-ms-date: ['Wed, 01 Mar 2017 23:35:01 GMT']
       x-ms-version: ['2015-07-08']
     method: GET
-    uri: https://dummystorage.blob.core.windows.net/?restype=service&comp=properties
+    uri: https://dummystorage.blob.core.windows.net/?comp=properties&restype=service
   response:
     body: {string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><StorageServiceProperties><Logging><Version>1.0</Version><Read>true</Read><Write>false</Write><Delete>false</Delete><RetentionPolicy><Enabled>true</Enabled><Days>1</Days></RetentionPolicy></Logging><HourMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>true</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>7</Days></RetentionPolicy></HourMetrics><MinuteMetrics><Version>1.0</Version><Enabled>false</Enabled><RetentionPolicy><Enabled>false</Enabled></RetentionPolicy></MinuteMetrics><Cors\
         \ /></StorageServiceProperties>"}
     headers:
       Content-Type: [application/xml]
-      Date: ['Wed, 15 Feb 2017 21:58:34 GMT']
+      Date: ['Wed, 01 Mar 2017 23:35:00 GMT']
       Server: [Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0]
       Transfer-Encoding: [chunked]
       x-ms-version: ['2015-07-08']
@@ -572,18 +572,18 @@ interactions:
     body: null
     headers:
       Connection: [keep-alive]
-      User-Agent: [Azure-Storage/0.33.0 (Python CPython 3.5.3; Windows 10) AZURECLI/0.1.1b3+dev]
-      x-ms-client-request-id: [d1951d86-f3c9-11e6-849f-74c63bed1137]
-      x-ms-date: ['Wed, 15 Feb 2017 21:58:37 GMT']
+      User-Agent: [Azure-Storage/0.33.0 (Python CPython 3.5.1; Windows 10) AZURECLI/2.0.0+dev]
+      x-ms-client-request-id: [99cd850c-fed7-11e6-bb24-a0b3ccf7272a]
+      x-ms-date: ['Wed, 01 Mar 2017 23:35:01 GMT']
       x-ms-version: ['2015-07-08']
     method: GET
-    uri: https://dummystorage.file.core.windows.net/?restype=service&comp=properties
+    uri: https://dummystorage.file.core.windows.net/?comp=properties&restype=service
   response:
     body: {string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><StorageServiceProperties><HourMetrics><Version>1.0</Version><Enabled>false</Enabled><RetentionPolicy><Enabled>true</Enabled><Days>1</Days></RetentionPolicy></HourMetrics><MinuteMetrics><Version>1.0</Version><Enabled>false</Enabled><RetentionPolicy><Enabled>true</Enabled><Days>1</Days></RetentionPolicy></MinuteMetrics><Cors\
         \ /></StorageServiceProperties>"}
     headers:
       Content-Type: [application/xml]
-      Date: ['Wed, 15 Feb 2017 21:58:35 GMT']
+      Date: ['Wed, 01 Mar 2017 23:35:01 GMT']
       Server: [Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0]
       Transfer-Encoding: [chunked]
       x-ms-version: ['2015-07-08']
@@ -592,19 +592,19 @@ interactions:
     body: null
     headers:
       Connection: [keep-alive]
-      User-Agent: [Azure-Storage/0.33.0 (Python CPython 3.5.3; Windows 10) AZURECLI/0.1.1b3+dev]
-      x-ms-client-request-id: [d1951d86-f3c9-11e6-849f-74c63bed1137]
-      x-ms-date: ['Wed, 15 Feb 2017 21:58:37 GMT']
+      User-Agent: [Azure-Storage/0.33.0 (Python CPython 3.5.1; Windows 10) AZURECLI/2.0.0+dev]
+      x-ms-client-request-id: [99cd850c-fed7-11e6-bb24-a0b3ccf7272a]
+      x-ms-date: ['Wed, 01 Mar 2017 23:35:01 GMT']
       x-ms-version: ['2015-07-08']
     method: GET
-    uri: https://dummystorage.queue.core.windows.net/?restype=service&comp=properties
+    uri: https://dummystorage.queue.core.windows.net/?comp=properties&restype=service
   response:
     body: {string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><StorageServiceProperties><Logging><Version>1.0</Version><Read>false</Read><Write>false</Write><Delete>false</Delete><RetentionPolicy><Enabled>false</Enabled></RetentionPolicy></Logging><HourMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>true</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>7</Days></RetentionPolicy></HourMetrics><MinuteMetrics><Version>1.0</Version><Enabled>false</Enabled><RetentionPolicy><Enabled>false</Enabled></RetentionPolicy></MinuteMetrics><Cors\
         \ /></StorageServiceProperties>"}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/xml]
-      Date: ['Wed, 15 Feb 2017 21:58:35 GMT']
+      Date: ['Wed, 01 Mar 2017 23:35:01 GMT']
       Server: [Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0]
       Transfer-Encoding: [chunked]
       x-ms-version: ['2015-07-08']
@@ -615,18 +615,18 @@ interactions:
       Connection: [keep-alive]
       DataServiceVersion: [3.0;NetFx]
       MaxDataServiceVersion: ['3.0']
-      User-Agent: [Azure-Storage/0.33.0 (Python CPython 3.5.3; Windows 10) AZURECLI/0.1.1b3+dev]
-      x-ms-client-request-id: [d1951d86-f3c9-11e6-849f-74c63bed1137]
-      x-ms-date: ['Wed, 15 Feb 2017 21:58:38 GMT']
+      User-Agent: [Azure-Storage/0.33.0 (Python CPython 3.5.1; Windows 10) AZURECLI/2.0.0+dev]
+      x-ms-client-request-id: [99cd850c-fed7-11e6-bb24-a0b3ccf7272a]
+      x-ms-date: ['Wed, 01 Mar 2017 23:35:01 GMT']
       x-ms-version: ['2015-07-08']
     method: GET
-    uri: https://dummystorage.table.core.windows.net/?restype=service&comp=properties
+    uri: https://dummystorage.table.core.windows.net/?comp=properties&restype=service
   response:
     body: {string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><StorageServiceProperties><Logging><Version>1.0</Version><Read>false</Read><Write>false</Write><Delete>false</Delete><RetentionPolicy><Enabled>false</Enabled></RetentionPolicy></Logging><HourMetrics><Version>1.0</Version><Enabled>true</Enabled><IncludeAPIs>true</IncludeAPIs><RetentionPolicy><Enabled>true</Enabled><Days>7</Days></RetentionPolicy></HourMetrics><MinuteMetrics><Version>1.0</Version><Enabled>false</Enabled><RetentionPolicy><Enabled>false</Enabled></RetentionPolicy></MinuteMetrics><Cors\
         \ /></StorageServiceProperties>"}
     headers:
       Content-Type: [application/xml]
-      Date: ['Wed, 15 Feb 2017 21:58:35 GMT']
+      Date: ['Wed, 01 Mar 2017 23:35:00 GMT']
       Server: [Windows-Azure-Table/1.0 Microsoft-HTTPAPI/2.0]
       Transfer-Encoding: [chunked]
       x-ms-version: ['2015-07-08']
@@ -639,20 +639,20 @@ interactions:
       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.4
-          msrest_azure/0.4.7 storagemanagementclient/0.31.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
+      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 storagemanagementclient/0.31.0 Azure-SDK-For-Python AZURECLI/TEST/2.0.0+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [e7dff490-f3c9-11e6-94b6-74c63bed1137]
+      x-ms-client-request-id: [b0eb465e-fed7-11e6-af56-a0b3ccf7272a]
     method: POST
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_storage_account_scenario/providers/Microsoft.Storage/storageAccounts/dummystorage/listKeys?api-version=2016-12-01
   response:
-    body: {string: '{"keys":[{"keyName":"key1","permissions":"Full","value":"FvHhwyIgb9w4f9IP8q8hsco9YRMQx2Cmw7/twW6Z5BDSqV7E3glSpl6XjhGd4EBoH1y3Qs7ZydIzRdzXb5RUlA=="},{"keyName":"key2","permissions":"Full","value":"bl05+mAzQpLT0w07vniIWTHZfgxJ8M9ywLnk6NmJ0EsWmpa/QBeO9zK7AObh4pOmsIBgeQq7ibjoDYpLBjLxmw=="}]}
+    body: {string: '{"keys":[{"keyName":"key1","permissions":"Full","value":"ItLmzJCF8AnEJIgk03B+Hnp6H7farh0R/pAriD55Jfpx1/h5VM7StJbEACuMPO+1yPL4F0JolztcG1Ma4wS1Sw=="},{"keyName":"key2","permissions":"Full","value":"sVCBmSEwOpBbPiI3MNKdBMJKBdrHun8OTUkiyRIkZQWwNbgt2xcfOFn0GluHepOkQ9Mopcjld8Xjxm7MfPD91g=="}]}
 
         '}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json]
-      Date: ['Wed, 15 Feb 2017 21:58:36 GMT']
+      Date: ['Wed, 01 Mar 2017 23:35:01 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-Azure-Storage-Resource-Provider/1.0, Microsoft-HTTPAPI/2.0]
@@ -670,20 +670,20 @@ interactions:
       Connection: [keep-alive]
       Content-Length: ['19']
       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.4
-          msrest_azure/0.4.7 storagemanagementclient/0.31.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
+      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 storagemanagementclient/0.31.0 Azure-SDK-For-Python AZURECLI/TEST/2.0.0+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [e876def8-f3c9-11e6-92c4-74c63bed1137]
+      x-ms-client-request-id: [b17d4e74-fed7-11e6-8937-a0b3ccf7272a]
     method: POST
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_storage_account_scenario/providers/Microsoft.Storage/storageAccounts/dummystorage/regenerateKey?api-version=2016-12-01
   response:
-    body: {string: '{"keys":[{"keyName":"key1","permissions":"Full","value":"l03UHMDSrRKgCV8svPY6KwOJkLebUO4Ga+hTp6OOmbfgGHErym9xC0cqiRv1EFwD1qGl4n6L2meRzgmIIvwDtw=="},{"keyName":"key2","permissions":"Full","value":"bl05+mAzQpLT0w07vniIWTHZfgxJ8M9ywLnk6NmJ0EsWmpa/QBeO9zK7AObh4pOmsIBgeQq7ibjoDYpLBjLxmw=="}]}
+    body: {string: '{"keys":[{"keyName":"key1","permissions":"Full","value":"u0uWulZ6Y6Ang3CrIvE/bT6y3xHip8viRr9RY88vKtv/LPSsYDZdXDOfP1SLswm3aiBzTZarZsbo4ssJqfBJ3g=="},{"keyName":"key2","permissions":"Full","value":"sVCBmSEwOpBbPiI3MNKdBMJKBdrHun8OTUkiyRIkZQWwNbgt2xcfOFn0GluHepOkQ9Mopcjld8Xjxm7MfPD91g=="}]}
 
         '}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json]
-      Date: ['Wed, 15 Feb 2017 21:58:37 GMT']
+      Date: ['Wed, 01 Mar 2017 23:35:03 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-Azure-Storage-Resource-Provider/1.0, Microsoft-HTTPAPI/2.0]
@@ -691,7 +691,7 @@ interactions:
       Transfer-Encoding: [chunked]
       Vary: [Accept-Encoding]
       content-length: ['289']
-      x-ms-ratelimit-remaining-subscription-writes: ['1198']
+      x-ms-ratelimit-remaining-subscription-writes: ['1199']
     status: {code: 200, message: OK}
 - request:
     body: '{"keyName": "key2"}'
@@ -701,20 +701,20 @@ interactions:
       Connection: [keep-alive]
       Content-Length: ['19']
       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.4
-          msrest_azure/0.4.7 storagemanagementclient/0.31.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
+      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 storagemanagementclient/0.31.0 Azure-SDK-For-Python AZURECLI/TEST/2.0.0+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [e8fa5966-f3c9-11e6-9f40-74c63bed1137]
+      x-ms-client-request-id: [b23a6bec-fed7-11e6-a4cf-a0b3ccf7272a]
     method: POST
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_storage_account_scenario/providers/Microsoft.Storage/storageAccounts/dummystorage/regenerateKey?api-version=2016-12-01
   response:
-    body: {string: '{"keys":[{"keyName":"key1","permissions":"Full","value":"l03UHMDSrRKgCV8svPY6KwOJkLebUO4Ga+hTp6OOmbfgGHErym9xC0cqiRv1EFwD1qGl4n6L2meRzgmIIvwDtw=="},{"keyName":"key2","permissions":"Full","value":"YfbqITRrz1Rtt8HMj/hKLxQDho6ZbojNZnjevh8Di8ZmWr4NYsneWY47IdSQTxUFSqrveoyrXwpp+xjNBVDVeA=="}]}
+    body: {string: '{"keys":[{"keyName":"key1","permissions":"Full","value":"u0uWulZ6Y6Ang3CrIvE/bT6y3xHip8viRr9RY88vKtv/LPSsYDZdXDOfP1SLswm3aiBzTZarZsbo4ssJqfBJ3g=="},{"keyName":"key2","permissions":"Full","value":"aZHNVFhuVqvRgW4/6NW++p2F6tQfnTIi25FMnRw3tlL/l3vIzGuG9UuU3dbGsEOJyiZKMj/Zn8gIi2FZo0tUXQ=="}]}
 
         '}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json]
-      Date: ['Wed, 15 Feb 2017 21:58:38 GMT']
+      Date: ['Wed, 01 Mar 2017 23:35:04 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-Azure-Storage-Resource-Provider/1.0, Microsoft-HTTPAPI/2.0]
@@ -731,20 +731,20 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       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.4
-          msrest_azure/0.4.7 storagemanagementclient/0.31.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
+      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 storagemanagementclient/0.31.0 Azure-SDK-For-Python AZURECLI/TEST/2.0.0+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [e971ec5a-f3c9-11e6-98df-74c63bed1137]
+      x-ms-client-request-id: [b2ef2162-fed7-11e6-9a04-a0b3ccf7272a]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_storage_account_scenario/providers/Microsoft.Storage/storageAccounts/dummystorage?api-version=2016-12-01
   response:
-    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_storage_account_scenario/providers/Microsoft.Storage/storageAccounts/vcrstorage733641907300","kind":"Storage","location":"westus","name":"vcrstorage733641907300","properties":{"creationTime":"2017-02-15T21:58:07.7815453Z","primaryEndpoints":{"blob":"https://vcrstorage733641907300.blob.core.windows.net/","file":"https://vcrstorage733641907300.file.core.windows.net/","queue":"https://vcrstorage733641907300.queue.core.windows.net/","table":"https://vcrstorage733641907300.table.core.windows.net/"},"primaryLocation":"westus","provisioningState":"Succeeded","statusOfPrimary":"available"},"sku":{"name":"Standard_LRS","tier":"Standard"},"tags":{},"type":"Microsoft.Storage/storageAccounts"}
+    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_storage_account_scenario/providers/Microsoft.Storage/storageAccounts/vcrstorage000197884384","kind":"Storage","location":"westus","name":"vcrstorage000197884384","properties":{"creationTime":"2017-03-01T23:34:31.1193082Z","primaryEndpoints":{"blob":"https://vcrstorage000197884384.blob.core.windows.net/","file":"https://vcrstorage000197884384.file.core.windows.net/","queue":"https://vcrstorage000197884384.queue.core.windows.net/","table":"https://vcrstorage000197884384.table.core.windows.net/"},"primaryLocation":"westus","provisioningState":"Succeeded","statusOfPrimary":"available"},"sku":{"name":"Standard_LRS","tier":"Standard"},"tags":{},"type":"Microsoft.Storage/storageAccounts"}
 
         '}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json]
-      Date: ['Wed, 15 Feb 2017 21:58:39 GMT']
+      Date: ['Wed, 01 Mar 2017 23:35:05 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-Azure-Storage-Resource-Provider/1.0, Microsoft-HTTPAPI/2.0]
@@ -754,28 +754,27 @@ interactions:
       content-length: ['776']
     status: {code: 200, message: OK}
 - request:
-    body: '{"sku": {"name": "Standard_LRS"}, "kind": "Storage", "tags": {"cat": "",
-      "foo": "bar"}, "location": "westus"}'
+    body: '{"sku": {"name": "Standard_LRS"}, "tags": {"foo": "bar", "cat": ""}}'
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Length: ['109']
+      Content-Length: ['68']
       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.4
-          msrest_azure/0.4.7 storagemanagementclient/0.31.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
+      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 storagemanagementclient/0.31.0 Azure-SDK-For-Python AZURECLI/TEST/2.0.0+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [e9ba9bba-f3c9-11e6-ad5f-74c63bed1137]
-    method: PUT
+      x-ms-client-request-id: [b319532c-fed7-11e6-8eb2-a0b3ccf7272a]
+    method: PATCH
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_storage_account_scenario/providers/Microsoft.Storage/storageAccounts/dummystorage?api-version=2016-12-01
   response:
-    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_storage_account_scenario/providers/Microsoft.Storage/storageAccounts/vcrstorage733641907300","kind":"Storage","location":"westus","name":"vcrstorage733641907300","properties":{"creationTime":"2017-02-15T21:58:07.7815453Z","primaryEndpoints":{"blob":"https://vcrstorage733641907300.blob.core.windows.net/","file":"https://vcrstorage733641907300.file.core.windows.net/","queue":"https://vcrstorage733641907300.queue.core.windows.net/","table":"https://vcrstorage733641907300.table.core.windows.net/"},"primaryLocation":"westus","provisioningState":"Succeeded","statusOfPrimary":"available"},"sku":{"name":"Standard_LRS","tier":"Standard"},"tags":{"cat":"","foo":"bar"},"type":"Microsoft.Storage/storageAccounts"}
+    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_storage_account_scenario/providers/Microsoft.Storage/storageAccounts/vcrstorage000197884384","kind":"Storage","location":"westus","name":"vcrstorage000197884384","properties":{"creationTime":"2017-03-01T23:34:31.1193082Z","primaryEndpoints":{"blob":"https://vcrstorage000197884384.blob.core.windows.net/","file":"https://vcrstorage000197884384.file.core.windows.net/","queue":"https://vcrstorage000197884384.queue.core.windows.net/","table":"https://vcrstorage000197884384.table.core.windows.net/"},"primaryLocation":"westus","provisioningState":"Succeeded","statusOfPrimary":"available"},"sku":{"name":"Standard_LRS","tier":"Standard"},"tags":{"cat":"","foo":"bar"},"type":"Microsoft.Storage/storageAccounts"}
 
         '}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json]
-      Date: ['Wed, 15 Feb 2017 21:58:39 GMT']
+      Date: ['Wed, 01 Mar 2017 23:35:06 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-Azure-Storage-Resource-Provider/1.0, Microsoft-HTTPAPI/2.0]
@@ -783,7 +782,7 @@ interactions:
       Transfer-Encoding: [chunked]
       Vary: [Accept-Encoding]
       content-length: ['796']
-      x-ms-ratelimit-remaining-subscription-writes: ['1198']
+      x-ms-ratelimit-remaining-subscription-writes: ['1199']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -792,20 +791,20 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       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.4
-          msrest_azure/0.4.7 storagemanagementclient/0.31.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
+      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 storagemanagementclient/0.31.0 Azure-SDK-For-Python AZURECLI/TEST/2.0.0+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [ea9f11d8-f3c9-11e6-aff0-74c63bed1137]
+      x-ms-client-request-id: [b4500b98-fed7-11e6-afb5-a0b3ccf7272a]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_storage_account_scenario/providers/Microsoft.Storage/storageAccounts/dummystorage?api-version=2016-12-01
   response:
-    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_storage_account_scenario/providers/Microsoft.Storage/storageAccounts/vcrstorage733641907300","kind":"Storage","location":"westus","name":"vcrstorage733641907300","properties":{"creationTime":"2017-02-15T21:58:07.7815453Z","primaryEndpoints":{"blob":"https://vcrstorage733641907300.blob.core.windows.net/","file":"https://vcrstorage733641907300.file.core.windows.net/","queue":"https://vcrstorage733641907300.queue.core.windows.net/","table":"https://vcrstorage733641907300.table.core.windows.net/"},"primaryLocation":"westus","provisioningState":"Succeeded","statusOfPrimary":"available"},"sku":{"name":"Standard_LRS","tier":"Standard"},"tags":{"cat":"","foo":"bar"},"type":"Microsoft.Storage/storageAccounts"}
+    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_storage_account_scenario/providers/Microsoft.Storage/storageAccounts/vcrstorage000197884384","kind":"Storage","location":"westus","name":"vcrstorage000197884384","properties":{"creationTime":"2017-03-01T23:34:31.1193082Z","primaryEndpoints":{"blob":"https://vcrstorage000197884384.blob.core.windows.net/","file":"https://vcrstorage000197884384.file.core.windows.net/","queue":"https://vcrstorage000197884384.queue.core.windows.net/","table":"https://vcrstorage000197884384.table.core.windows.net/"},"primaryLocation":"westus","provisioningState":"Succeeded","statusOfPrimary":"available"},"sku":{"name":"Standard_LRS","tier":"Standard"},"tags":{"cat":"","foo":"bar"},"type":"Microsoft.Storage/storageAccounts"}
 
         '}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json]
-      Date: ['Wed, 15 Feb 2017 21:58:41 GMT']
+      Date: ['Wed, 01 Mar 2017 23:35:07 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-Azure-Storage-Resource-Provider/1.0, Microsoft-HTTPAPI/2.0]
@@ -815,28 +814,27 @@ interactions:
       content-length: ['796']
     status: {code: 200, message: OK}
 - request:
-    body: '{"sku": {"name": "Standard_GRS"}, "kind": "Storage", "tags": {}, "location":
-      "westus"}'
+    body: '{"sku": {"name": "Standard_GRS"}, "tags": {}}'
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Length: ['86']
+      Content-Length: ['45']
       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.4
-          msrest_azure/0.4.7 storagemanagementclient/0.31.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
+      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 storagemanagementclient/0.31.0 Azure-SDK-For-Python AZURECLI/TEST/2.0.0+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [eae678e6-f3c9-11e6-9c30-74c63bed1137]
-    method: PUT
+      x-ms-client-request-id: [b49a3afa-fed7-11e6-b7e6-a0b3ccf7272a]
+    method: PATCH
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_storage_account_scenario/providers/Microsoft.Storage/storageAccounts/dummystorage?api-version=2016-12-01
   response:
-    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_storage_account_scenario/providers/Microsoft.Storage/storageAccounts/vcrstorage733641907300","kind":"Storage","location":"westus","name":"vcrstorage733641907300","properties":{"creationTime":"2017-02-15T21:58:07.7815453Z","primaryEndpoints":{"blob":"https://vcrstorage733641907300.blob.core.windows.net/","file":"https://vcrstorage733641907300.file.core.windows.net/","queue":"https://vcrstorage733641907300.queue.core.windows.net/","table":"https://vcrstorage733641907300.table.core.windows.net/"},"primaryLocation":"westus","provisioningState":"Succeeded","secondaryLocation":"eastus","statusOfPrimary":"available","statusOfSecondary":"available"},"sku":{"name":"Standard_GRS","tier":"Standard"},"tags":{},"type":"Microsoft.Storage/storageAccounts"}
+    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_storage_account_scenario/providers/Microsoft.Storage/storageAccounts/vcrstorage000197884384","kind":"Storage","location":"westus","name":"vcrstorage000197884384","properties":{"creationTime":"2017-03-01T23:34:31.1193082Z","primaryEndpoints":{"blob":"https://vcrstorage000197884384.blob.core.windows.net/","file":"https://vcrstorage000197884384.file.core.windows.net/","queue":"https://vcrstorage000197884384.queue.core.windows.net/","table":"https://vcrstorage000197884384.table.core.windows.net/"},"primaryLocation":"westus","provisioningState":"Succeeded","secondaryLocation":"eastus","statusOfPrimary":"available","statusOfSecondary":"available"},"sku":{"name":"Standard_GRS","tier":"Standard"},"tags":{},"type":"Microsoft.Storage/storageAccounts"}
 
         '}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json]
-      Date: ['Wed, 15 Feb 2017 21:58:41 GMT']
+      Date: ['Wed, 01 Mar 2017 23:35:09 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-Azure-Storage-Resource-Provider/1.0, Microsoft-HTTPAPI/2.0]
@@ -844,7 +842,7 @@ interactions:
       Transfer-Encoding: [chunked]
       Vary: [Accept-Encoding]
       content-length: ['837']
-      x-ms-ratelimit-remaining-subscription-writes: ['1199']
+      x-ms-ratelimit-remaining-subscription-writes: ['1197']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -853,20 +851,20 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       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.4
-          msrest_azure/0.4.7 storagemanagementclient/0.31.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
+      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 storagemanagementclient/0.31.0 Azure-SDK-For-Python AZURECLI/TEST/2.0.0+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [ebb69412-f3c9-11e6-90d2-74c63bed1137]
+      x-ms-client-request-id: [b5e70440-fed7-11e6-9c11-a0b3ccf7272a]
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_storage_account_scenario/providers/Microsoft.Storage/storageAccounts/dummystorage?api-version=2016-12-01
   response:
-    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_storage_account_scenario/providers/Microsoft.Storage/storageAccounts/vcrstorage733641907300","kind":"Storage","location":"westus","name":"vcrstorage733641907300","properties":{"creationTime":"2017-02-15T21:58:07.7815453Z","primaryEndpoints":{"blob":"https://vcrstorage733641907300.blob.core.windows.net/","file":"https://vcrstorage733641907300.file.core.windows.net/","queue":"https://vcrstorage733641907300.queue.core.windows.net/","table":"https://vcrstorage733641907300.table.core.windows.net/"},"primaryLocation":"westus","provisioningState":"Succeeded","secondaryLocation":"eastus","statusOfPrimary":"available","statusOfSecondary":"available"},"sku":{"name":"Standard_GRS","tier":"Standard"},"tags":{},"type":"Microsoft.Storage/storageAccounts"}
+    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_storage_account_scenario/providers/Microsoft.Storage/storageAccounts/vcrstorage000197884384","kind":"Storage","location":"westus","name":"vcrstorage000197884384","properties":{"creationTime":"2017-03-01T23:34:31.1193082Z","primaryEndpoints":{"blob":"https://vcrstorage000197884384.blob.core.windows.net/","file":"https://vcrstorage000197884384.file.core.windows.net/","queue":"https://vcrstorage000197884384.queue.core.windows.net/","table":"https://vcrstorage000197884384.table.core.windows.net/"},"primaryLocation":"westus","provisioningState":"Succeeded","secondaryLocation":"eastus","statusOfPrimary":"available","statusOfSecondary":"available"},"sku":{"name":"Standard_GRS","tier":"Standard"},"tags":{},"type":"Microsoft.Storage/storageAccounts"}
 
         '}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json]
-      Date: ['Wed, 15 Feb 2017 21:58:42 GMT']
+      Date: ['Wed, 01 Mar 2017 23:35:11 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-Azure-Storage-Resource-Provider/1.0, Microsoft-HTTPAPI/2.0]
@@ -876,28 +874,27 @@ interactions:
       content-length: ['837']
     status: {code: 200, message: OK}
 - request:
-    body: '{"sku": {"name": "Standard_GRS"}, "kind": "Storage", "tags": {"test": "success"},
-      "location": "westus"}'
+    body: '{"sku": {"name": "Standard_GRS"}, "tags": {"test": "success"}}'
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Length: ['103']
+      Content-Length: ['62']
       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.4
-          msrest_azure/0.4.7 storagemanagementclient/0.31.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
+      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 storagemanagementclient/0.31.0 Azure-SDK-For-Python AZURECLI/TEST/2.0.0+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [ec0156a2-f3c9-11e6-accb-74c63bed1137]
-    method: PUT
+      x-ms-client-request-id: [b631db38-fed7-11e6-af1c-a0b3ccf7272a]
+    method: PATCH
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_storage_account_scenario/providers/Microsoft.Storage/storageAccounts/dummystorage?api-version=2016-12-01
   response:
-    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_storage_account_scenario/providers/Microsoft.Storage/storageAccounts/vcrstorage733641907300","kind":"Storage","location":"westus","name":"vcrstorage733641907300","properties":{"creationTime":"2017-02-15T21:58:07.7815453Z","primaryEndpoints":{"blob":"https://vcrstorage733641907300.blob.core.windows.net/","file":"https://vcrstorage733641907300.file.core.windows.net/","queue":"https://vcrstorage733641907300.queue.core.windows.net/","table":"https://vcrstorage733641907300.table.core.windows.net/"},"primaryLocation":"westus","provisioningState":"Succeeded","secondaryLocation":"eastus","statusOfPrimary":"available","statusOfSecondary":"available"},"sku":{"name":"Standard_GRS","tier":"Standard"},"tags":{"test":"success"},"type":"Microsoft.Storage/storageAccounts"}
+    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_storage_account_scenario/providers/Microsoft.Storage/storageAccounts/vcrstorage000197884384","kind":"Storage","location":"westus","name":"vcrstorage000197884384","properties":{"creationTime":"2017-03-01T23:34:31.1193082Z","primaryEndpoints":{"blob":"https://vcrstorage000197884384.blob.core.windows.net/","file":"https://vcrstorage000197884384.file.core.windows.net/","queue":"https://vcrstorage000197884384.queue.core.windows.net/","table":"https://vcrstorage000197884384.table.core.windows.net/"},"primaryLocation":"westus","provisioningState":"Succeeded","secondaryLocation":"eastus","statusOfPrimary":"available","statusOfSecondary":"available"},"sku":{"name":"Standard_GRS","tier":"Standard"},"tags":{"test":"success"},"type":"Microsoft.Storage/storageAccounts"}
 
         '}
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json]
-      Date: ['Wed, 15 Feb 2017 21:58:43 GMT']
+      Date: ['Wed, 01 Mar 2017 23:35:12 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-Azure-Storage-Resource-Provider/1.0, Microsoft-HTTPAPI/2.0]
@@ -905,7 +902,7 @@ interactions:
       Transfer-Encoding: [chunked]
       Vary: [Accept-Encoding]
       content-length: ['853']
-      x-ms-ratelimit-remaining-subscription-writes: ['1198']
+      x-ms-ratelimit-remaining-subscription-writes: ['1199']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -915,10 +912,10 @@ interactions:
       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.4
-          msrest_azure/0.4.7 storagemanagementclient/0.31.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
+      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 storagemanagementclient/0.31.0 Azure-SDK-For-Python AZURECLI/TEST/2.0.0+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [ec90ffe8-f3c9-11e6-8acd-74c63bed1137]
+      x-ms-client-request-id: [b785f78c-fed7-11e6-96c7-a0b3ccf7272a]
     method: DELETE
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_storage_account_scenario/providers/Microsoft.Storage/storageAccounts/dummystorage?api-version=2016-12-01
   response:
@@ -926,25 +923,25 @@ interactions:
     headers:
       Cache-Control: [no-cache]
       Content-Length: ['0']
-      Date: ['Wed, 15 Feb 2017 21:58:45 GMT']
+      Date: ['Wed, 01 Mar 2017 23:35:13 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-Azure-Storage-Resource-Provider/1.0, Microsoft-HTTPAPI/2.0]
       Strict-Transport-Security: [max-age=31536000; includeSubDomains]
-      x-ms-ratelimit-remaining-subscription-writes: ['1198']
+      x-ms-ratelimit-remaining-subscription-writes: ['1197']
     status: {code: 200, message: OK}
 - request:
-    body: '{"name": "vcrstorage733641907300", "type": "Microsoft.Storage/storageAccounts"}'
+    body: '{"name": "vcrstorage000197884384", "type": "Microsoft.Storage/storageAccounts"}'
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Length: ['79']
       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.4
-          msrest_azure/0.4.7 storagemanagementclient/0.31.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
+      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 storagemanagementclient/0.31.0 Azure-SDK-For-Python AZURECLI/TEST/2.0.0+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [ed84472e-f3c9-11e6-b3f4-74c63bed1137]
+      x-ms-client-request-id: [b88a3394-fed7-11e6-b3ef-a0b3ccf7272a]
     method: POST
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Storage/checkNameAvailability?api-version=2016-12-01
   response:
@@ -954,7 +951,7 @@ interactions:
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json]
-      Date: ['Wed, 15 Feb 2017 21:58:46 GMT']
+      Date: ['Wed, 01 Mar 2017 23:35:14 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-Azure-Storage-Resource-Provider/1.0, Microsoft-HTTPAPI/2.0]
@@ -971,10 +968,10 @@ interactions:
       Connection: [keep-alive]
       Content-Length: ['73']
       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.4
-          msrest_azure/0.4.7 storagemanagementclient/0.31.0 Azure-SDK-For-Python AZURECLI/TEST/0.1.1b3+dev]
+      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 storagemanagementclient/0.31.0 Azure-SDK-For-Python AZURECLI/TEST/2.0.0+dev]
       accept-language: [en-US]
-      x-ms-client-request-id: [ee15b978-f3c9-11e6-9fe3-74c63bed1137]
+      x-ms-client-request-id: [b8fa7600-fed7-11e6-8db2-a0b3ccf7272a]
     method: POST
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Storage/checkNameAvailability?api-version=2016-12-01
   response:
@@ -984,7 +981,7 @@ interactions:
     headers:
       Cache-Control: [no-cache]
       Content-Type: [application/json]
-      Date: ['Wed, 15 Feb 2017 21:58:47 GMT']
+      Date: ['Wed, 01 Mar 2017 23:35:15 GMT']
       Expires: ['-1']
       Pragma: [no-cache]
       Server: [Microsoft-Azure-Storage-Resource-Provider/1.0, Microsoft-HTTPAPI/2.0]