From 35488599f11439407654fef5dfd0ceddf71ea115 Mon Sep 17 00:00:00 2001
From: Yishi Wang <yishiwang@microsoft.com>
Date: Fri, 15 Apr 2022 15:56:38 +0800
Subject: [PATCH] [Storage] `az storage entity`: Support specifying `EdmType`
 for `--entity` (#22060)

* `az storage entity`: Support `EdmType` for `--entity`

* fix azure_stack
---
 .../storage/_params_azure_stack.py            |   3 +-
 .../command_modules/storage/_validators.py    |  15 +-
 .../test_storage_table_main_scenario.yaml     | 423 +++++++++---------
 .../latest/test_storage_table_scenarios.py    |  11 +-
 4 files changed, 230 insertions(+), 222 deletions(-)

diff --git a/src/azure-cli/azure/cli/command_modules/storage/_params_azure_stack.py b/src/azure-cli/azure/cli/command_modules/storage/_params_azure_stack.py
index 6ee8592160d..07b06396c31 100644
--- a/src/azure-cli/azure/cli/command_modules/storage/_params_azure_stack.py
+++ b/src/azure-cli/azure/cli/command_modules/storage/_params_azure_stack.py
@@ -10,7 +10,7 @@
 from azure.cli.core.local_context import LocalContextAttribute, LocalContextAction, ALL
 
 from ._validators import (get_datetime_type, validate_metadata, get_permission_validator, get_permission_help_string,
-                          resource_type_type, services_type, validate_entity, validate_select, validate_blob_type,
+                          resource_type_type, services_type, validate_select, validate_blob_type,
                           validate_included_datasets, validate_custom_domain, validate_container_public_access,
                           validate_table_payload_format, add_progress_callback, process_resource_group,
                           storage_account_key_options, process_file_download_namespace, process_metric_update_namespace,
@@ -19,6 +19,7 @@
                           validate_azcopy_remove_arguments, as_user_validator, parse_storage_account,
                           validator_delete_retention_days, validate_delete_retention_days,
                           validate_fs_public_access)
+from ._validators_azure_stack import validate_entity
 
 
 def load_arguments(self, _):  # pylint: disable=too-many-locals, too-many-statements, too-many-lines
diff --git a/src/azure-cli/azure/cli/command_modules/storage/_validators.py b/src/azure-cli/azure/cli/command_modules/storage/_validators.py
index cd877fb8c9b..6ea0afc76eb 100644
--- a/src/azure-cli/azure/cli/command_modules/storage/_validators.py
+++ b/src/azure-cli/azure/cli/command_modules/storage/_validators.py
@@ -676,6 +676,7 @@ def validate_entity(namespace):
     """ Converts a list of key value pairs into a dictionary. Ensures that required
     RowKey and PartitionKey are converted to the correct case and included. """
     values = dict(x.split('=', 1) for x in namespace.entity)
+    edm_types = {}
     keys = values.keys()
     for key in list(keys):
         if key.lower() == 'rowkey':
@@ -686,6 +687,12 @@ def validate_entity(namespace):
             val = values[key]
             del values[key]
             values['PartitionKey'] = val
+        elif key.endswith('@odata.type'):
+            val = values[key]
+            del values[key]
+            real_key = key[0: key.index('@odata.type')]
+            edm_types[real_key] = val
+
     keys = values.keys()
     missing_keys = 'RowKey ' if 'RowKey' not in keys else ''
     missing_keys = '{}PartitionKey'.format(missing_keys) \
@@ -708,8 +715,12 @@ def try_cast(to_type):
 
         return try_cast(int) or try_cast(float) or val
 
-    # ensure numbers are converted from strings so querying will work correctly
-    values = {key: cast_val(key, val) for key, val in values.items()}
+    for key, val in values.items():
+        if edm_types.get(key, None):
+            values[key] = (val, edm_types[key])
+        else:
+            # ensure numbers are converted from strings so querying will work correctly
+            values[key] = cast_val(key, val)
     namespace.entity = values
 
 
diff --git a/src/azure-cli/azure/cli/command_modules/storage/tests/latest/recordings/test_storage_table_main_scenario.yaml b/src/azure-cli/azure/cli/command_modules/storage/tests/latest/recordings/test_storage_table_main_scenario.yaml
index 905992678e8..515eb47604d 100644
--- a/src/azure-cli/azure/cli/command_modules/storage/tests/latest/recordings/test_storage_table_main_scenario.yaml
+++ b/src/azure-cli/azure/cli/command_modules/storage/tests/latest/recordings/test_storage_table_main_scenario.yaml
@@ -15,12 +15,12 @@ interactions:
       ParameterSetName:
       - -n -g --query -o
       User-Agent:
-      - AZURECLI/2.35.0 azsdk-python-azure-mgmt-storage/20.0.0 Python/3.9.6 (Windows-10-10.0.19044-SP0)
+      - AZURECLI/2.35.0 azsdk-python-azure-mgmt-storage/20.0.0 Python/3.7.9 (Windows-10-10.0.22000-SP0)
     method: POST
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Storage/storageAccounts/clitest000002/listKeys?api-version=2021-09-01&$expand=kerb
   response:
     body:
-      string: '{"keys":[{"creationTime":"2022-04-11T14:17:15.2329553Z","keyName":"key1","value":"veryFakedStorageAccountKey==","permissions":"FULL"},{"creationTime":"2022-04-11T14:17:15.2329553Z","keyName":"key2","value":"veryFakedStorageAccountKey==","permissions":"FULL"}]}'
+      string: '{"keys":[{"creationTime":"2022-04-14T06:35:35.3008030Z","keyName":"key1","value":"veryFakedStorageAccountKey==","permissions":"FULL"},{"creationTime":"2022-04-14T06:35:35.3008030Z","keyName":"key2","value":"veryFakedStorageAccountKey==","permissions":"FULL"}]}'
     headers:
       cache-control:
       - no-cache
@@ -29,7 +29,7 @@ interactions:
       content-type:
       - application/json
       date:
-      - Mon, 11 Apr 2022 14:17:35 GMT
+      - Thu, 14 Apr 2022 06:35:55 GMT
       expires:
       - '-1'
       pragma:
@@ -45,7 +45,7 @@ interactions:
       x-content-type-options:
       - nosniff
       x-ms-ratelimit-remaining-subscription-resource-requests:
-      - '11996'
+      - '11999'
     status:
       code: 200
       message: OK
@@ -67,13 +67,13 @@ interactions:
       DataServiceVersion:
       - '3.0'
       Date:
-      - Mon, 11 Apr 2022 14:17:36 GMT
+      - Thu, 14 Apr 2022 06:35:58 GMT
       ParameterSetName:
       - -n --fail-on-exist --account-name --account-key
       User-Agent:
-      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.9.6 (Windows-10-10.0.19044-SP0)
+      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.7.9 (Windows-10-10.0.22000-SP0)
       x-ms-date:
-      - Mon, 11 Apr 2022 14:17:36 GMT
+      - Thu, 14 Apr 2022 06:35:58 GMT
       x-ms-version:
       - '2019-02-02'
     method: POST
@@ -87,7 +87,7 @@ interactions:
       content-type:
       - application/json;odata=minimalmetadata;streaming=true;charset=utf-8
       date:
-      - Mon, 11 Apr 2022 14:17:36 GMT
+      - Thu, 14 Apr 2022 06:35:57 GMT
       location:
       - https://clitest000002.table.core.windows.net/Tables('table000003')
       server:
@@ -115,13 +115,13 @@ interactions:
       DataServiceVersion:
       - '3.0'
       Date:
-      - Mon, 11 Apr 2022 14:17:38 GMT
+      - Thu, 14 Apr 2022 06:36:00 GMT
       ParameterSetName:
       - -n --account-name --account-key
       User-Agent:
-      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.9.6 (Windows-10-10.0.19044-SP0)
+      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.7.9 (Windows-10-10.0.22000-SP0)
       x-ms-date:
-      - Mon, 11 Apr 2022 14:17:38 GMT
+      - Thu, 14 Apr 2022 06:36:00 GMT
       x-ms-version:
       - '2019-02-02'
     method: GET
@@ -135,7 +135,7 @@ interactions:
       content-type:
       - application/json;odata=minimalmetadata;streaming=true;charset=utf-8
       date:
-      - Mon, 11 Apr 2022 14:17:38 GMT
+      - Thu, 14 Apr 2022 06:35:59 GMT
       server:
       - Windows-Azure-Table/1.0 Microsoft-HTTPAPI/2.0
       transfer-encoding:
@@ -161,13 +161,13 @@ interactions:
       DataServiceVersion:
       - '3.0'
       Date:
-      - Mon, 11 Apr 2022 14:17:39 GMT
+      - Thu, 14 Apr 2022 06:36:01 GMT
       ParameterSetName:
       - --query --account-name --account-key
       User-Agent:
-      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.9.6 (Windows-10-10.0.19044-SP0)
+      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.7.9 (Windows-10-10.0.22000-SP0)
       x-ms-date:
-      - Mon, 11 Apr 2022 14:17:39 GMT
+      - Thu, 14 Apr 2022 06:36:01 GMT
       x-ms-version:
       - '2019-02-02'
     method: GET
@@ -181,7 +181,7 @@ interactions:
       content-type:
       - application/json;odata=minimalmetadata;streaming=true;charset=utf-8
       date:
-      - Mon, 11 Apr 2022 14:17:39 GMT
+      - Thu, 14 Apr 2022 06:36:00 GMT
       server:
       - Windows-Azure-Table/1.0 Microsoft-HTTPAPI/2.0
       transfer-encoding:
@@ -195,10 +195,9 @@ interactions:
       message: OK
 - request:
     body: '{"name": "test", "name@odata.type": "Edm.String", "value": "something",
-      "value@odata.type": "Edm.String", "binaryProperty": "AAECAwQF", "binaryProperty@odata.type":
-      "Edm.Binary", "binaryProperty@odata.type@odata.type": "Edm.String", "RowKey":
-      "001", "RowKey@odata.type": "Edm.String", "PartitionKey": "001", "PartitionKey@odata.type":
-      "Edm.String"}'
+      "value@odata.type": "Edm.String", "sizeInBytes": "86222504922", "sizeInBytes@odata.type":
+      "Edm.Int64", "RowKey": "001", "RowKey@odata.type": "Edm.String", "PartitionKey":
+      "001", "PartitionKey@odata.type": "Edm.String"}'
     headers:
       Accept:
       - application/json
@@ -209,19 +208,19 @@ interactions:
       Connection:
       - keep-alive
       Content-Length:
-      - '348'
+      - '290'
       Content-Type:
       - application/json
       DataServiceVersion:
       - '3.0'
       Date:
-      - Mon, 11 Apr 2022 14:17:40 GMT
+      - Thu, 14 Apr 2022 06:36:03 GMT
       ParameterSetName:
       - -t -e --account-name --account-key
       User-Agent:
-      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.9.6 (Windows-10-10.0.19044-SP0)
+      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.7.9 (Windows-10-10.0.22000-SP0)
       x-ms-date:
-      - Mon, 11 Apr 2022 14:17:40 GMT
+      - Thu, 14 Apr 2022 06:36:03 GMT
       x-ms-version:
       - '2019-02-02'
     method: PATCH
@@ -235,9 +234,9 @@ interactions:
       content-length:
       - '0'
       date:
-      - Mon, 11 Apr 2022 14:17:40 GMT
+      - Thu, 14 Apr 2022 06:36:02 GMT
       etag:
-      - W/"datetime'2022-04-11T14%3A17%3A41.053314Z'"
+      - W/"datetime'2022-04-14T06%3A36%3A02.7963899Z'"
       server:
       - Windows-Azure-Table/1.0 Microsoft-HTTPAPI/2.0
       x-content-type-options:
@@ -261,29 +260,29 @@ interactions:
       DataServiceVersion:
       - '3.0'
       Date:
-      - Mon, 11 Apr 2022 14:17:41 GMT
+      - Thu, 14 Apr 2022 06:36:04 GMT
       ParameterSetName:
       - -t --row-key --partition-key --account-name --account-key
       User-Agent:
-      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.9.6 (Windows-10-10.0.19044-SP0)
+      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.7.9 (Windows-10-10.0.22000-SP0)
       x-ms-date:
-      - Mon, 11 Apr 2022 14:17:41 GMT
+      - Thu, 14 Apr 2022 06:36:04 GMT
       x-ms-version:
       - '2019-02-02'
     method: GET
     uri: https://clitest000002.table.core.windows.net/table000003(PartitionKey='001',RowKey='001')
   response:
     body:
-      string: '{"odata.metadata":"https://clitest000002.table.core.windows.net/$metadata#table000003/@Element","odata.etag":"W/\"datetime''2022-04-11T14%3A17%3A41.053314Z''\"","PartitionKey":"001","RowKey":"001","Timestamp":"2022-04-11T14:17:41.053314Z","binaryProperty@odata.type":"Edm.Binary","binaryProperty":"AAECAwQF","name":"test","value":"something"}'
+      string: '{"odata.metadata":"https://clitest000002.table.core.windows.net/$metadata#table000003/@Element","odata.etag":"W/\"datetime''2022-04-14T06%3A36%3A02.7963899Z''\"","PartitionKey":"001","RowKey":"001","Timestamp":"2022-04-14T06:36:02.7963899Z","name":"test","sizeInBytes@odata.type":"Edm.Int64","sizeInBytes":"86222504922","value":"something"}'
     headers:
       cache-control:
       - no-cache
       content-type:
       - application/json;odata=minimalmetadata;streaming=true;charset=utf-8
       date:
-      - Mon, 11 Apr 2022 14:17:41 GMT
+      - Thu, 14 Apr 2022 06:36:03 GMT
       etag:
-      - W/"datetime'2022-04-11T14%3A17%3A41.053314Z'"
+      - W/"datetime'2022-04-14T06%3A36%3A02.7963899Z'"
       server:
       - Windows-Azure-Table/1.0 Microsoft-HTTPAPI/2.0
       transfer-encoding:
@@ -309,29 +308,29 @@ interactions:
       DataServiceVersion:
       - '3.0'
       Date:
-      - Mon, 11 Apr 2022 14:17:42 GMT
+      - Thu, 14 Apr 2022 06:36:05 GMT
       ParameterSetName:
       - -t --row-key --partition-key --select --account-name --account-key
       User-Agent:
-      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.9.6 (Windows-10-10.0.19044-SP0)
+      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.7.9 (Windows-10-10.0.22000-SP0)
       x-ms-date:
-      - Mon, 11 Apr 2022 14:17:42 GMT
+      - Thu, 14 Apr 2022 06:36:05 GMT
       x-ms-version:
       - '2019-02-02'
     method: GET
     uri: https://clitest000002.table.core.windows.net/table000003(PartitionKey='001',RowKey='001')?$select=name
   response:
     body:
-      string: '{"odata.metadata":"https://clitest000002.table.core.windows.net/$metadata#table000003/@Element&$select=name","odata.etag":"W/\"datetime''2022-04-11T14%3A17%3A41.053314Z''\"","name":"test"}'
+      string: '{"odata.metadata":"https://clitest000002.table.core.windows.net/$metadata#table000003/@Element&$select=name","odata.etag":"W/\"datetime''2022-04-14T06%3A36%3A02.7963899Z''\"","name":"test"}'
     headers:
       cache-control:
       - no-cache
       content-type:
       - application/json;odata=minimalmetadata;streaming=true;charset=utf-8
       date:
-      - Mon, 11 Apr 2022 14:17:42 GMT
+      - Thu, 14 Apr 2022 06:36:05 GMT
       etag:
-      - W/"datetime'2022-04-11T14%3A17%3A41.053314Z'"
+      - W/"datetime'2022-04-14T06%3A36%3A02.7963899Z'"
       server:
       - Windows-Azure-Table/1.0 Microsoft-HTTPAPI/2.0
       transfer-encoding:
@@ -363,15 +362,15 @@ interactions:
       DataServiceVersion:
       - '3.0'
       Date:
-      - Mon, 11 Apr 2022 14:17:43 GMT
+      - Thu, 14 Apr 2022 06:36:07 GMT
       If-Match:
       - '*'
       ParameterSetName:
       - -t -e --account-name --account-key
       User-Agent:
-      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.9.6 (Windows-10-10.0.19044-SP0)
+      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.7.9 (Windows-10-10.0.22000-SP0)
       x-ms-date:
-      - Mon, 11 Apr 2022 14:17:43 GMT
+      - Thu, 14 Apr 2022 06:36:07 GMT
       x-ms-version:
       - '2019-02-02'
     method: PATCH
@@ -385,9 +384,9 @@ interactions:
       content-length:
       - '0'
       date:
-      - Mon, 11 Apr 2022 14:17:43 GMT
+      - Thu, 14 Apr 2022 06:36:06 GMT
       etag:
-      - W/"datetime'2022-04-11T14%3A17%3A44.448367Z'"
+      - W/"datetime'2022-04-14T06%3A36%3A07.1948603Z'"
       server:
       - Windows-Azure-Table/1.0 Microsoft-HTTPAPI/2.0
       x-content-type-options:
@@ -411,29 +410,29 @@ interactions:
       DataServiceVersion:
       - '3.0'
       Date:
-      - Mon, 11 Apr 2022 14:17:45 GMT
+      - Thu, 14 Apr 2022 06:36:08 GMT
       ParameterSetName:
       - -t --row-key --partition-key --account-name --account-key
       User-Agent:
-      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.9.6 (Windows-10-10.0.19044-SP0)
+      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.7.9 (Windows-10-10.0.22000-SP0)
       x-ms-date:
-      - Mon, 11 Apr 2022 14:17:45 GMT
+      - Thu, 14 Apr 2022 06:36:08 GMT
       x-ms-version:
       - '2019-02-02'
     method: GET
     uri: https://clitest000002.table.core.windows.net/table000003(PartitionKey='001',RowKey='001')
   response:
     body:
-      string: '{"odata.metadata":"https://clitest000002.table.core.windows.net/$metadata#table000003/@Element","odata.etag":"W/\"datetime''2022-04-11T14%3A17%3A44.448367Z''\"","PartitionKey":"001","RowKey":"001","Timestamp":"2022-04-11T14:17:44.448367Z","binaryProperty@odata.type":"Edm.Binary","binaryProperty":"AAECAwQF","name":"test","value":"newval"}'
+      string: '{"odata.metadata":"https://clitest000002.table.core.windows.net/$metadata#table000003/@Element","odata.etag":"W/\"datetime''2022-04-14T06%3A36%3A07.1948603Z''\"","PartitionKey":"001","RowKey":"001","Timestamp":"2022-04-14T06:36:07.1948603Z","name":"test","sizeInBytes@odata.type":"Edm.Int64","sizeInBytes":"86222504922","value":"newval"}'
     headers:
       cache-control:
       - no-cache
       content-type:
       - application/json;odata=minimalmetadata;streaming=true;charset=utf-8
       date:
-      - Mon, 11 Apr 2022 14:17:45 GMT
+      - Thu, 14 Apr 2022 06:36:07 GMT
       etag:
-      - W/"datetime'2022-04-11T14%3A17%3A44.448367Z'"
+      - W/"datetime'2022-04-14T06%3A36%3A07.1948603Z'"
       server:
       - Windows-Azure-Table/1.0 Microsoft-HTTPAPI/2.0
       transfer-encoding:
@@ -464,15 +463,15 @@ interactions:
       DataServiceVersion:
       - '3.0'
       Date:
-      - Mon, 11 Apr 2022 14:17:46 GMT
+      - Thu, 14 Apr 2022 06:36:10 GMT
       If-Match:
       - '*'
       ParameterSetName:
       - -t -e --account-name --account-key
       User-Agent:
-      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.9.6 (Windows-10-10.0.19044-SP0)
+      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.7.9 (Windows-10-10.0.22000-SP0)
       x-ms-date:
-      - Mon, 11 Apr 2022 14:17:46 GMT
+      - Thu, 14 Apr 2022 06:36:10 GMT
       x-ms-version:
       - '2019-02-02'
     method: PUT
@@ -486,9 +485,9 @@ interactions:
       content-length:
       - '0'
       date:
-      - Mon, 11 Apr 2022 14:17:46 GMT
+      - Thu, 14 Apr 2022 06:36:09 GMT
       etag:
-      - W/"datetime'2022-04-11T14%3A17%3A46.7200649Z'"
+      - W/"datetime'2022-04-14T06%3A36%3A09.862326Z'"
       server:
       - Windows-Azure-Table/1.0 Microsoft-HTTPAPI/2.0
       x-content-type-options:
@@ -512,29 +511,29 @@ interactions:
       DataServiceVersion:
       - '3.0'
       Date:
-      - Mon, 11 Apr 2022 14:17:47 GMT
+      - Thu, 14 Apr 2022 06:36:11 GMT
       ParameterSetName:
       - -t --row-key --partition-key --account-name --account-key
       User-Agent:
-      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.9.6 (Windows-10-10.0.19044-SP0)
+      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.7.9 (Windows-10-10.0.22000-SP0)
       x-ms-date:
-      - Mon, 11 Apr 2022 14:17:47 GMT
+      - Thu, 14 Apr 2022 06:36:11 GMT
       x-ms-version:
       - '2019-02-02'
     method: GET
     uri: https://clitest000002.table.core.windows.net/table000003(PartitionKey='001',RowKey='001')
   response:
     body:
-      string: '{"odata.metadata":"https://clitest000002.table.core.windows.net/$metadata#table000003/@Element","odata.etag":"W/\"datetime''2022-04-11T14%3A17%3A46.7200649Z''\"","PartitionKey":"001","RowKey":"001","Timestamp":"2022-04-11T14:17:46.7200649Z","cat":"hat"}'
+      string: '{"odata.metadata":"https://clitest000002.table.core.windows.net/$metadata#table000003/@Element","odata.etag":"W/\"datetime''2022-04-14T06%3A36%3A09.862326Z''\"","PartitionKey":"001","RowKey":"001","Timestamp":"2022-04-14T06:36:09.862326Z","cat":"hat"}'
     headers:
       cache-control:
       - no-cache
       content-type:
       - application/json;odata=minimalmetadata;streaming=true;charset=utf-8
       date:
-      - Mon, 11 Apr 2022 14:17:47 GMT
+      - Thu, 14 Apr 2022 06:36:11 GMT
       etag:
-      - W/"datetime'2022-04-11T14%3A17%3A46.7200649Z'"
+      - W/"datetime'2022-04-14T06%3A36%3A09.862326Z'"
       server:
       - Windows-Azure-Table/1.0 Microsoft-HTTPAPI/2.0
       transfer-encoding:
@@ -562,15 +561,15 @@ interactions:
       DataServiceVersion:
       - '3.0'
       Date:
-      - Mon, 11 Apr 2022 14:17:48 GMT
+      - Thu, 14 Apr 2022 06:36:12 GMT
       If-Match:
       - '*'
       ParameterSetName:
       - -t --row-key --partition-key --account-name --account-key
       User-Agent:
-      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.9.6 (Windows-10-10.0.19044-SP0)
+      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.7.9 (Windows-10-10.0.22000-SP0)
       x-ms-date:
-      - Mon, 11 Apr 2022 14:17:48 GMT
+      - Thu, 14 Apr 2022 06:36:12 GMT
       x-ms-version:
       - '2019-02-02'
     method: DELETE
@@ -584,7 +583,7 @@ interactions:
       content-length:
       - '0'
       date:
-      - Mon, 11 Apr 2022 14:17:48 GMT
+      - Thu, 14 Apr 2022 06:36:12 GMT
       server:
       - Windows-Azure-Table/1.0 Microsoft-HTTPAPI/2.0
       x-content-type-options:
@@ -608,13 +607,13 @@ interactions:
       DataServiceVersion:
       - '3.0'
       Date:
-      - Mon, 11 Apr 2022 14:17:49 GMT
+      - Thu, 14 Apr 2022 06:36:15 GMT
       ParameterSetName:
       - -t --row-key --partition-key --account-name --account-key
       User-Agent:
-      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.9.6 (Windows-10-10.0.19044-SP0)
+      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.7.9 (Windows-10-10.0.22000-SP0)
       x-ms-date:
-      - Mon, 11 Apr 2022 14:17:49 GMT
+      - Thu, 14 Apr 2022 06:36:15 GMT
       x-ms-version:
       - '2019-02-02'
     method: GET
@@ -622,14 +621,14 @@ interactions:
   response:
     body:
       string: '{"odata.error":{"code":"ResourceNotFound","message":{"lang":"en-US","value":"The
-        specified resource does not exist.\nRequestId:6599ff71-c002-0056-30ae-4dcc5e000000\nTime:2022-04-11T14:17:50.1553813Z"}}}'
+        specified resource does not exist.\nRequestId:9aefb611-1002-0007-61c9-4f1410000000\nTime:2022-04-14T06:36:14.7033533Z"}}}'
     headers:
       cache-control:
       - no-cache
       content-type:
       - application/json;odata=minimalmetadata;streaming=true;charset=utf-8
       date:
-      - Mon, 11 Apr 2022 14:17:49 GMT
+      - Thu, 14 Apr 2022 06:36:13 GMT
       server:
       - Windows-Azure-Table/1.0 Microsoft-HTTPAPI/2.0
       transfer-encoding:
@@ -643,10 +642,8 @@ interactions:
       message: Not Found
 - request:
     body: '{"name": "test", "name@odata.type": "Edm.String", "value": "something",
-      "value@odata.type": "Edm.String", "binaryProperty": "AAECAwQF", "binaryProperty@odata.type":
-      "Edm.Binary", "binaryProperty@odata.type@odata.type": "Edm.String", "RowKey":
-      "001", "RowKey@odata.type": "Edm.String", "PartitionKey": "001", "PartitionKey@odata.type":
-      "Edm.String"}'
+      "value@odata.type": "Edm.String", "RowKey": "001", "RowKey@odata.type": "Edm.String",
+      "PartitionKey": "001", "PartitionKey@odata.type": "Edm.String"}'
     headers:
       Accept:
       - application/json
@@ -657,19 +654,19 @@ interactions:
       Connection:
       - keep-alive
       Content-Length:
-      - '348'
+      - '221'
       Content-Type:
       - application/json
       DataServiceVersion:
       - '3.0'
       Date:
-      - Mon, 11 Apr 2022 14:17:50 GMT
+      - Thu, 14 Apr 2022 06:36:16 GMT
       ParameterSetName:
       - -t -e --account-name --account-key
       User-Agent:
-      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.9.6 (Windows-10-10.0.19044-SP0)
+      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.7.9 (Windows-10-10.0.22000-SP0)
       x-ms-date:
-      - Mon, 11 Apr 2022 14:17:50 GMT
+      - Thu, 14 Apr 2022 06:36:16 GMT
       x-ms-version:
       - '2019-02-02'
     method: PATCH
@@ -683,9 +680,9 @@ interactions:
       content-length:
       - '0'
       date:
-      - Mon, 11 Apr 2022 14:17:50 GMT
+      - Thu, 14 Apr 2022 06:36:15 GMT
       etag:
-      - W/"datetime'2022-04-11T14%3A17%3A51.3104321Z'"
+      - W/"datetime'2022-04-14T06%3A36%3A16.0327779Z'"
       server:
       - Windows-Azure-Table/1.0 Microsoft-HTTPAPI/2.0
       x-content-type-options:
@@ -715,13 +712,13 @@ interactions:
       DataServiceVersion:
       - '3.0'
       Date:
-      - Mon, 11 Apr 2022 14:17:51 GMT
+      - Thu, 14 Apr 2022 06:36:17 GMT
       ParameterSetName:
       - -t -e --account-name --account-key
       User-Agent:
-      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.9.6 (Windows-10-10.0.19044-SP0)
+      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.7.9 (Windows-10-10.0.22000-SP0)
       x-ms-date:
-      - Mon, 11 Apr 2022 14:17:51 GMT
+      - Thu, 14 Apr 2022 06:36:17 GMT
       x-ms-version:
       - '2019-02-02'
     method: PATCH
@@ -735,9 +732,9 @@ interactions:
       content-length:
       - '0'
       date:
-      - Mon, 11 Apr 2022 14:17:52 GMT
+      - Thu, 14 Apr 2022 06:36:17 GMT
       etag:
-      - W/"datetime'2022-04-11T14%3A17%3A52.4277921Z'"
+      - W/"datetime'2022-04-14T06%3A36%3A17.4429673Z'"
       server:
       - Windows-Azure-Table/1.0 Microsoft-HTTPAPI/2.0
       x-content-type-options:
@@ -761,27 +758,27 @@ interactions:
       DataServiceVersion:
       - '3.0'
       Date:
-      - Mon, 11 Apr 2022 14:17:53 GMT
+      - Thu, 14 Apr 2022 06:36:19 GMT
       ParameterSetName:
       - -t --num-results --account-name --account-key
       User-Agent:
-      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.9.6 (Windows-10-10.0.19044-SP0)
+      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.7.9 (Windows-10-10.0.22000-SP0)
       x-ms-date:
-      - Mon, 11 Apr 2022 14:17:53 GMT
+      - Thu, 14 Apr 2022 06:36:19 GMT
       x-ms-version:
       - '2019-02-02'
     method: GET
     uri: https://clitest000002.table.core.windows.net/table000003()?$top=1
   response:
     body:
-      string: '{"odata.metadata":"https://clitest000002.table.core.windows.net/$metadata#table000003","value":[{"odata.etag":"W/\"datetime''2022-04-11T14%3A17%3A51.3104321Z''\"","PartitionKey":"001","RowKey":"001","Timestamp":"2022-04-11T14:17:51.3104321Z","binaryProperty@odata.type":"Edm.Binary","binaryProperty":"AAECAwQF","name":"test","value":"something"}]}'
+      string: '{"odata.metadata":"https://clitest000002.table.core.windows.net/$metadata#table000003","value":[{"odata.etag":"W/\"datetime''2022-04-14T06%3A36%3A16.0327779Z''\"","PartitionKey":"001","RowKey":"001","Timestamp":"2022-04-14T06:36:16.0327779Z","name":"test","value":"something"}]}'
     headers:
       cache-control:
       - no-cache
       content-type:
       - application/json;odata=minimalmetadata;streaming=true;charset=utf-8
       date:
-      - Mon, 11 Apr 2022 14:17:53 GMT
+      - Thu, 14 Apr 2022 06:36:18 GMT
       server:
       - Windows-Azure-Table/1.0 Microsoft-HTTPAPI/2.0
       transfer-encoding:
@@ -811,27 +808,27 @@ interactions:
       DataServiceVersion:
       - '3.0'
       Date:
-      - Mon, 11 Apr 2022 14:17:54 GMT
+      - Thu, 14 Apr 2022 06:36:20 GMT
       ParameterSetName:
       - -t --marker --account-name --account-key
       User-Agent:
-      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.9.6 (Windows-10-10.0.19044-SP0)
+      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.7.9 (Windows-10-10.0.22000-SP0)
       x-ms-date:
-      - Mon, 11 Apr 2022 14:17:54 GMT
+      - Thu, 14 Apr 2022 06:36:20 GMT
       x-ms-version:
       - '2019-02-02'
     method: GET
     uri: https://clitest000002.table.core.windows.net/table000003()?NextPartitionKey=1%214%21MDAy&NextRowKey=1%214%21MDAy
   response:
     body:
-      string: '{"odata.metadata":"https://clitest000002.table.core.windows.net/$metadata#table000003","value":[{"odata.etag":"W/\"datetime''2022-04-11T14%3A17%3A52.4277921Z''\"","PartitionKey":"002","RowKey":"002","Timestamp":"2022-04-11T14:17:52.4277921Z","name":"test2","value":"something2"}]}'
+      string: '{"odata.metadata":"https://clitest000002.table.core.windows.net/$metadata#table000003","value":[{"odata.etag":"W/\"datetime''2022-04-14T06%3A36%3A17.4429673Z''\"","PartitionKey":"002","RowKey":"002","Timestamp":"2022-04-14T06:36:17.4429673Z","name":"test2","value":"something2"}]}'
     headers:
       cache-control:
       - no-cache
       content-type:
       - application/json;odata=minimalmetadata;streaming=true;charset=utf-8
       date:
-      - Mon, 11 Apr 2022 14:17:53 GMT
+      - Thu, 14 Apr 2022 06:36:19 GMT
       server:
       - Windows-Azure-Table/1.0 Microsoft-HTTPAPI/2.0
       transfer-encoding:
@@ -855,13 +852,13 @@ interactions:
       Connection:
       - keep-alive
       Date:
-      - Mon, 11 Apr 2022 14:17:55 GMT
+      - Thu, 14 Apr 2022 06:36:21 GMT
       ParameterSetName:
       - -t --account-name --account-key
       User-Agent:
-      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.9.6 (Windows-10-10.0.19044-SP0)
+      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.7.9 (Windows-10-10.0.22000-SP0)
       x-ms-date:
-      - Mon, 11 Apr 2022 14:17:55 GMT
+      - Thu, 14 Apr 2022 06:36:21 GMT
       x-ms-version:
       - '2019-02-02'
     method: GET
@@ -874,7 +871,7 @@ interactions:
       content-type:
       - application/xml
       date:
-      - Mon, 11 Apr 2022 14:17:55 GMT
+      - Thu, 14 Apr 2022 06:36:21 GMT
       server:
       - Windows-Azure-Table/1.0 Microsoft-HTTPAPI/2.0
       transfer-encoding:
@@ -896,13 +893,13 @@ interactions:
       Connection:
       - keep-alive
       Date:
-      - Mon, 11 Apr 2022 14:17:56 GMT
+      - Thu, 14 Apr 2022 06:36:23 GMT
       ParameterSetName:
       - -t -n --permission --account-name --account-key
       User-Agent:
-      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.9.6 (Windows-10-10.0.19044-SP0)
+      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.7.9 (Windows-10-10.0.22000-SP0)
       x-ms-date:
-      - Mon, 11 Apr 2022 14:17:56 GMT
+      - Thu, 14 Apr 2022 06:36:23 GMT
       x-ms-version:
       - '2019-02-02'
     method: GET
@@ -915,7 +912,7 @@ interactions:
       content-type:
       - application/xml
       date:
-      - Mon, 11 Apr 2022 14:17:56 GMT
+      - Thu, 14 Apr 2022 06:36:22 GMT
       server:
       - Windows-Azure-Table/1.0 Microsoft-HTTPAPI/2.0
       transfer-encoding:
@@ -928,7 +925,7 @@ interactions:
 - request:
     body: '<?xml version=''1.0'' encoding=''utf-8''?>
 
-      <SignedIdentifiers><SignedIdentifier><Id>test1</Id><AccessPolicy><Start>2022-04-11T14:17:57Z</Start><Expiry>9999-12-31T23:59:59Z</Expiry><Permission>a</Permission></AccessPolicy></SignedIdentifier></SignedIdentifiers>'
+      <SignedIdentifiers><SignedIdentifier><Id>test1</Id><AccessPolicy><Start>2022-04-14T06:36:24Z</Start><Expiry>9999-12-31T23:59:59Z</Expiry><Permission>a</Permission></AccessPolicy></SignedIdentifier></SignedIdentifiers>'
     headers:
       Accept:
       - application/xml
@@ -943,13 +940,13 @@ interactions:
       Content-Type:
       - application/xml
       Date:
-      - Mon, 11 Apr 2022 14:17:57 GMT
+      - Thu, 14 Apr 2022 06:36:24 GMT
       ParameterSetName:
       - -t -n --permission --account-name --account-key
       User-Agent:
-      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.9.6 (Windows-10-10.0.19044-SP0)
+      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.7.9 (Windows-10-10.0.22000-SP0)
       x-ms-date:
-      - Mon, 11 Apr 2022 14:17:57 GMT
+      - Thu, 14 Apr 2022 06:36:24 GMT
       x-ms-version:
       - '2019-02-02'
     method: PUT
@@ -961,7 +958,7 @@ interactions:
       content-length:
       - '0'
       date:
-      - Mon, 11 Apr 2022 14:17:57 GMT
+      - Thu, 14 Apr 2022 06:36:22 GMT
       server:
       - Windows-Azure-Table/1.0 Microsoft-HTTPAPI/2.0
       x-ms-version:
@@ -981,25 +978,25 @@ interactions:
       Connection:
       - keep-alive
       Date:
-      - Mon, 11 Apr 2022 14:17:58 GMT
+      - Thu, 14 Apr 2022 06:36:25 GMT
       ParameterSetName:
       - -t -n --start --account-name --account-key
       User-Agent:
-      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.9.6 (Windows-10-10.0.19044-SP0)
+      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.7.9 (Windows-10-10.0.22000-SP0)
       x-ms-date:
-      - Mon, 11 Apr 2022 14:17:58 GMT
+      - Thu, 14 Apr 2022 06:36:25 GMT
       x-ms-version:
       - '2019-02-02'
     method: GET
     uri: https://clitest000002.table.core.windows.net/table000003?comp=acl
   response:
     body:
-      string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><SignedIdentifiers><SignedIdentifier><Id>test1</Id><AccessPolicy><Start>2022-04-11T14:17:57.0000000Z</Start><Expiry>9999-12-31T23:59:59.0000000Z</Expiry><Permission>a</Permission></AccessPolicy></SignedIdentifier></SignedIdentifiers>"
+      string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><SignedIdentifiers><SignedIdentifier><Id>test1</Id><AccessPolicy><Start>2022-04-14T06:36:24.0000000Z</Start><Expiry>9999-12-31T23:59:59.0000000Z</Expiry><Permission>a</Permission></AccessPolicy></SignedIdentifier></SignedIdentifiers>"
     headers:
       content-type:
       - application/xml
       date:
-      - Mon, 11 Apr 2022 14:17:57 GMT
+      - Thu, 14 Apr 2022 06:36:24 GMT
       server:
       - Windows-Azure-Table/1.0 Microsoft-HTTPAPI/2.0
       transfer-encoding:
@@ -1012,7 +1009,7 @@ interactions:
 - request:
     body: '<?xml version=''1.0'' encoding=''utf-8''?>
 
-      <SignedIdentifiers><SignedIdentifier><Id>test1</Id><AccessPolicy><Start>2022-04-11T14:17:57Z</Start><Expiry>9999-12-31T23:59:59Z</Expiry><Permission>a</Permission></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test2</Id><AccessPolicy><Start>2016-01-01T00:00Z</Start><Expiry>9999-12-31T23:59:59Z</Expiry><Permission
+      <SignedIdentifiers><SignedIdentifier><Id>test1</Id><AccessPolicy><Start>2022-04-14T06:36:24Z</Start><Expiry>9999-12-31T23:59:59Z</Expiry><Permission>a</Permission></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test2</Id><AccessPolicy><Start>2016-01-01T00:00Z</Start><Expiry>9999-12-31T23:59:59Z</Expiry><Permission
       /></AccessPolicy></SignedIdentifier></SignedIdentifiers>'
     headers:
       Accept:
@@ -1028,13 +1025,13 @@ interactions:
       Content-Type:
       - application/xml
       Date:
-      - Mon, 11 Apr 2022 14:17:59 GMT
+      - Thu, 14 Apr 2022 06:36:26 GMT
       ParameterSetName:
       - -t -n --start --account-name --account-key
       User-Agent:
-      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.9.6 (Windows-10-10.0.19044-SP0)
+      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.7.9 (Windows-10-10.0.22000-SP0)
       x-ms-date:
-      - Mon, 11 Apr 2022 14:17:59 GMT
+      - Thu, 14 Apr 2022 06:36:26 GMT
       x-ms-version:
       - '2019-02-02'
     method: PUT
@@ -1046,7 +1043,7 @@ interactions:
       content-length:
       - '0'
       date:
-      - Mon, 11 Apr 2022 14:17:57 GMT
+      - Thu, 14 Apr 2022 06:36:24 GMT
       server:
       - Windows-Azure-Table/1.0 Microsoft-HTTPAPI/2.0
       x-ms-version:
@@ -1066,25 +1063,25 @@ interactions:
       Connection:
       - keep-alive
       Date:
-      - Mon, 11 Apr 2022 14:17:59 GMT
+      - Thu, 14 Apr 2022 06:36:26 GMT
       ParameterSetName:
       - -t -n --expiry --account-name --account-key
       User-Agent:
-      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.9.6 (Windows-10-10.0.19044-SP0)
+      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.7.9 (Windows-10-10.0.22000-SP0)
       x-ms-date:
-      - Mon, 11 Apr 2022 14:17:59 GMT
+      - Thu, 14 Apr 2022 06:36:26 GMT
       x-ms-version:
       - '2019-02-02'
     method: GET
     uri: https://clitest000002.table.core.windows.net/table000003?comp=acl
   response:
     body:
-      string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><SignedIdentifiers><SignedIdentifier><Id>test1</Id><AccessPolicy><Start>2022-04-11T14:17:57.0000000Z</Start><Expiry>9999-12-31T23:59:59.0000000Z</Expiry><Permission>a</Permission></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test2</Id><AccessPolicy><Start>2016-01-01T00:00:00.0000000Z</Start><Expiry>9999-12-31T23:59:59.0000000Z</Expiry></AccessPolicy></SignedIdentifier></SignedIdentifiers>"
+      string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><SignedIdentifiers><SignedIdentifier><Id>test1</Id><AccessPolicy><Start>2022-04-14T06:36:24.0000000Z</Start><Expiry>9999-12-31T23:59:59.0000000Z</Expiry><Permission>a</Permission></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test2</Id><AccessPolicy><Start>2016-01-01T00:00:00.0000000Z</Start><Expiry>9999-12-31T23:59:59.0000000Z</Expiry></AccessPolicy></SignedIdentifier></SignedIdentifiers>"
     headers:
       content-type:
       - application/xml
       date:
-      - Mon, 11 Apr 2022 14:17:59 GMT
+      - Thu, 14 Apr 2022 06:36:26 GMT
       server:
       - Windows-Azure-Table/1.0 Microsoft-HTTPAPI/2.0
       transfer-encoding:
@@ -1097,8 +1094,8 @@ interactions:
 - request:
     body: '<?xml version=''1.0'' encoding=''utf-8''?>
 
-      <SignedIdentifiers><SignedIdentifier><Id>test1</Id><AccessPolicy><Start>2022-04-11T14:17:57Z</Start><Expiry>9999-12-31T23:59:59Z</Expiry><Permission>a</Permission></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test2</Id><AccessPolicy><Start>2016-01-01T00:00:00Z</Start><Expiry>9999-12-31T23:59:59Z</Expiry><Permission
-      /></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test3</Id><AccessPolicy><Start>2022-04-11T14:18:00Z</Start><Expiry>2018-01-01T00:00Z</Expiry><Permission
+      <SignedIdentifiers><SignedIdentifier><Id>test1</Id><AccessPolicy><Start>2022-04-14T06:36:24Z</Start><Expiry>9999-12-31T23:59:59Z</Expiry><Permission>a</Permission></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test2</Id><AccessPolicy><Start>2016-01-01T00:00:00Z</Start><Expiry>9999-12-31T23:59:59Z</Expiry><Permission
+      /></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test3</Id><AccessPolicy><Start>2022-04-14T06:36:28Z</Start><Expiry>2018-01-01T00:00Z</Expiry><Permission
       /></AccessPolicy></SignedIdentifier></SignedIdentifiers>'
     headers:
       Accept:
@@ -1114,13 +1111,13 @@ interactions:
       Content-Type:
       - application/xml
       Date:
-      - Mon, 11 Apr 2022 14:18:00 GMT
+      - Thu, 14 Apr 2022 06:36:28 GMT
       ParameterSetName:
       - -t -n --expiry --account-name --account-key
       User-Agent:
-      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.9.6 (Windows-10-10.0.19044-SP0)
+      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.7.9 (Windows-10-10.0.22000-SP0)
       x-ms-date:
-      - Mon, 11 Apr 2022 14:18:00 GMT
+      - Thu, 14 Apr 2022 06:36:28 GMT
       x-ms-version:
       - '2019-02-02'
     method: PUT
@@ -1132,7 +1129,7 @@ interactions:
       content-length:
       - '0'
       date:
-      - Mon, 11 Apr 2022 14:17:59 GMT
+      - Thu, 14 Apr 2022 06:36:26 GMT
       server:
       - Windows-Azure-Table/1.0 Microsoft-HTTPAPI/2.0
       x-ms-version:
@@ -1152,25 +1149,25 @@ interactions:
       Connection:
       - keep-alive
       Date:
-      - Mon, 11 Apr 2022 14:18:00 GMT
+      - Thu, 14 Apr 2022 06:36:28 GMT
       ParameterSetName:
       - -t -n --permission --start --expiry --account-name --account-key
       User-Agent:
-      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.9.6 (Windows-10-10.0.19044-SP0)
+      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.7.9 (Windows-10-10.0.22000-SP0)
       x-ms-date:
-      - Mon, 11 Apr 2022 14:18:00 GMT
+      - Thu, 14 Apr 2022 06:36:28 GMT
       x-ms-version:
       - '2019-02-02'
     method: GET
     uri: https://clitest000002.table.core.windows.net/table000003?comp=acl
   response:
     body:
-      string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><SignedIdentifiers><SignedIdentifier><Id>test1</Id><AccessPolicy><Start>2022-04-11T14:17:57.0000000Z</Start><Expiry>9999-12-31T23:59:59.0000000Z</Expiry><Permission>a</Permission></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test2</Id><AccessPolicy><Start>2016-01-01T00:00:00.0000000Z</Start><Expiry>9999-12-31T23:59:59.0000000Z</Expiry></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test3</Id><AccessPolicy><Start>2022-04-11T14:18:00.0000000Z</Start><Expiry>2018-01-01T00:00:00.0000000Z</Expiry></AccessPolicy></SignedIdentifier></SignedIdentifiers>"
+      string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><SignedIdentifiers><SignedIdentifier><Id>test1</Id><AccessPolicy><Start>2022-04-14T06:36:24.0000000Z</Start><Expiry>9999-12-31T23:59:59.0000000Z</Expiry><Permission>a</Permission></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test2</Id><AccessPolicy><Start>2016-01-01T00:00:00.0000000Z</Start><Expiry>9999-12-31T23:59:59.0000000Z</Expiry></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test3</Id><AccessPolicy><Start>2022-04-14T06:36:28.0000000Z</Start><Expiry>2018-01-01T00:00:00.0000000Z</Expiry></AccessPolicy></SignedIdentifier></SignedIdentifiers>"
     headers:
       content-type:
       - application/xml
       date:
-      - Mon, 11 Apr 2022 14:18:00 GMT
+      - Thu, 14 Apr 2022 06:36:27 GMT
       server:
       - Windows-Azure-Table/1.0 Microsoft-HTTPAPI/2.0
       transfer-encoding:
@@ -1183,8 +1180,8 @@ interactions:
 - request:
     body: '<?xml version=''1.0'' encoding=''utf-8''?>
 
-      <SignedIdentifiers><SignedIdentifier><Id>test1</Id><AccessPolicy><Start>2022-04-11T14:17:57Z</Start><Expiry>9999-12-31T23:59:59Z</Expiry><Permission>a</Permission></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test2</Id><AccessPolicy><Start>2016-01-01T00:00:00Z</Start><Expiry>9999-12-31T23:59:59Z</Expiry><Permission
-      /></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test3</Id><AccessPolicy><Start>2022-04-11T14:18:00Z</Start><Expiry>2018-01-01T00:00:00Z</Expiry><Permission
+      <SignedIdentifiers><SignedIdentifier><Id>test1</Id><AccessPolicy><Start>2022-04-14T06:36:24Z</Start><Expiry>9999-12-31T23:59:59Z</Expiry><Permission>a</Permission></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test2</Id><AccessPolicy><Start>2016-01-01T00:00:00Z</Start><Expiry>9999-12-31T23:59:59Z</Expiry><Permission
+      /></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test3</Id><AccessPolicy><Start>2022-04-14T06:36:28Z</Start><Expiry>2018-01-01T00:00:00Z</Expiry><Permission
       /></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test4</Id><AccessPolicy><Start>2016-01-01T00:00Z</Start><Expiry>2016-05-01T00:00Z</Expiry><Permission>raud</Permission></AccessPolicy></SignedIdentifier></SignedIdentifiers>'
     headers:
       Accept:
@@ -1200,13 +1197,13 @@ interactions:
       Content-Type:
       - application/xml
       Date:
-      - Mon, 11 Apr 2022 14:18:01 GMT
+      - Thu, 14 Apr 2022 06:36:30 GMT
       ParameterSetName:
       - -t -n --permission --start --expiry --account-name --account-key
       User-Agent:
-      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.9.6 (Windows-10-10.0.19044-SP0)
+      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.7.9 (Windows-10-10.0.22000-SP0)
       x-ms-date:
-      - Mon, 11 Apr 2022 14:18:01 GMT
+      - Thu, 14 Apr 2022 06:36:30 GMT
       x-ms-version:
       - '2019-02-02'
     method: PUT
@@ -1218,7 +1215,7 @@ interactions:
       content-length:
       - '0'
       date:
-      - Mon, 11 Apr 2022 14:18:00 GMT
+      - Thu, 14 Apr 2022 06:36:28 GMT
       server:
       - Windows-Azure-Table/1.0 Microsoft-HTTPAPI/2.0
       x-ms-version:
@@ -1238,25 +1235,25 @@ interactions:
       Connection:
       - keep-alive
       Date:
-      - Mon, 11 Apr 2022 14:18:02 GMT
+      - Thu, 14 Apr 2022 06:36:30 GMT
       ParameterSetName:
       - -t --account-name --account-key
       User-Agent:
-      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.9.6 (Windows-10-10.0.19044-SP0)
+      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.7.9 (Windows-10-10.0.22000-SP0)
       x-ms-date:
-      - Mon, 11 Apr 2022 14:18:02 GMT
+      - Thu, 14 Apr 2022 06:36:30 GMT
       x-ms-version:
       - '2019-02-02'
     method: GET
     uri: https://clitest000002.table.core.windows.net/table000003?comp=acl
   response:
     body:
-      string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><SignedIdentifiers><SignedIdentifier><Id>test1</Id><AccessPolicy><Start>2022-04-11T14:17:57.0000000Z</Start><Expiry>9999-12-31T23:59:59.0000000Z</Expiry><Permission>a</Permission></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test2</Id><AccessPolicy><Start>2016-01-01T00:00:00.0000000Z</Start><Expiry>9999-12-31T23:59:59.0000000Z</Expiry></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test3</Id><AccessPolicy><Start>2022-04-11T14:18:00.0000000Z</Start><Expiry>2018-01-01T00:00:00.0000000Z</Expiry></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test4</Id><AccessPolicy><Start>2016-01-01T00:00:00.0000000Z</Start><Expiry>2016-05-01T00:00:00.0000000Z</Expiry><Permission>raud</Permission></AccessPolicy></SignedIdentifier></SignedIdentifiers>"
+      string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><SignedIdentifiers><SignedIdentifier><Id>test1</Id><AccessPolicy><Start>2022-04-14T06:36:24.0000000Z</Start><Expiry>9999-12-31T23:59:59.0000000Z</Expiry><Permission>a</Permission></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test2</Id><AccessPolicy><Start>2016-01-01T00:00:00.0000000Z</Start><Expiry>9999-12-31T23:59:59.0000000Z</Expiry></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test3</Id><AccessPolicy><Start>2022-04-14T06:36:28.0000000Z</Start><Expiry>2018-01-01T00:00:00.0000000Z</Expiry></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test4</Id><AccessPolicy><Start>2016-01-01T00:00:00.0000000Z</Start><Expiry>2016-05-01T00:00:00.0000000Z</Expiry><Permission>raud</Permission></AccessPolicy></SignedIdentifier></SignedIdentifiers>"
     headers:
       content-type:
       - application/xml
       date:
-      - Mon, 11 Apr 2022 14:18:02 GMT
+      - Thu, 14 Apr 2022 06:36:29 GMT
       server:
       - Windows-Azure-Table/1.0 Microsoft-HTTPAPI/2.0
       transfer-encoding:
@@ -1278,25 +1275,25 @@ interactions:
       Connection:
       - keep-alive
       Date:
-      - Mon, 11 Apr 2022 14:18:03 GMT
+      - Thu, 14 Apr 2022 06:36:31 GMT
       ParameterSetName:
       - -t -n --account-name --account-key
       User-Agent:
-      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.9.6 (Windows-10-10.0.19044-SP0)
+      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.7.9 (Windows-10-10.0.22000-SP0)
       x-ms-date:
-      - Mon, 11 Apr 2022 14:18:03 GMT
+      - Thu, 14 Apr 2022 06:36:31 GMT
       x-ms-version:
       - '2019-02-02'
     method: GET
     uri: https://clitest000002.table.core.windows.net/table000003?comp=acl
   response:
     body:
-      string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><SignedIdentifiers><SignedIdentifier><Id>test1</Id><AccessPolicy><Start>2022-04-11T14:17:57.0000000Z</Start><Expiry>9999-12-31T23:59:59.0000000Z</Expiry><Permission>a</Permission></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test2</Id><AccessPolicy><Start>2016-01-01T00:00:00.0000000Z</Start><Expiry>9999-12-31T23:59:59.0000000Z</Expiry></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test3</Id><AccessPolicy><Start>2022-04-11T14:18:00.0000000Z</Start><Expiry>2018-01-01T00:00:00.0000000Z</Expiry></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test4</Id><AccessPolicy><Start>2016-01-01T00:00:00.0000000Z</Start><Expiry>2016-05-01T00:00:00.0000000Z</Expiry><Permission>raud</Permission></AccessPolicy></SignedIdentifier></SignedIdentifiers>"
+      string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><SignedIdentifiers><SignedIdentifier><Id>test1</Id><AccessPolicy><Start>2022-04-14T06:36:24.0000000Z</Start><Expiry>9999-12-31T23:59:59.0000000Z</Expiry><Permission>a</Permission></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test2</Id><AccessPolicy><Start>2016-01-01T00:00:00.0000000Z</Start><Expiry>9999-12-31T23:59:59.0000000Z</Expiry></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test3</Id><AccessPolicy><Start>2022-04-14T06:36:28.0000000Z</Start><Expiry>2018-01-01T00:00:00.0000000Z</Expiry></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test4</Id><AccessPolicy><Start>2016-01-01T00:00:00.0000000Z</Start><Expiry>2016-05-01T00:00:00.0000000Z</Expiry><Permission>raud</Permission></AccessPolicy></SignedIdentifier></SignedIdentifiers>"
     headers:
       content-type:
       - application/xml
       date:
-      - Mon, 11 Apr 2022 14:18:03 GMT
+      - Thu, 14 Apr 2022 06:36:31 GMT
       server:
       - Windows-Azure-Table/1.0 Microsoft-HTTPAPI/2.0
       transfer-encoding:
@@ -1318,25 +1315,25 @@ interactions:
       Connection:
       - keep-alive
       Date:
-      - Mon, 11 Apr 2022 14:18:04 GMT
+      - Thu, 14 Apr 2022 06:36:33 GMT
       ParameterSetName:
       - -t -n --account-name --account-key
       User-Agent:
-      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.9.6 (Windows-10-10.0.19044-SP0)
+      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.7.9 (Windows-10-10.0.22000-SP0)
       x-ms-date:
-      - Mon, 11 Apr 2022 14:18:04 GMT
+      - Thu, 14 Apr 2022 06:36:33 GMT
       x-ms-version:
       - '2019-02-02'
     method: GET
     uri: https://clitest000002.table.core.windows.net/table000003?comp=acl
   response:
     body:
-      string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><SignedIdentifiers><SignedIdentifier><Id>test1</Id><AccessPolicy><Start>2022-04-11T14:17:57.0000000Z</Start><Expiry>9999-12-31T23:59:59.0000000Z</Expiry><Permission>a</Permission></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test2</Id><AccessPolicy><Start>2016-01-01T00:00:00.0000000Z</Start><Expiry>9999-12-31T23:59:59.0000000Z</Expiry></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test3</Id><AccessPolicy><Start>2022-04-11T14:18:00.0000000Z</Start><Expiry>2018-01-01T00:00:00.0000000Z</Expiry></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test4</Id><AccessPolicy><Start>2016-01-01T00:00:00.0000000Z</Start><Expiry>2016-05-01T00:00:00.0000000Z</Expiry><Permission>raud</Permission></AccessPolicy></SignedIdentifier></SignedIdentifiers>"
+      string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><SignedIdentifiers><SignedIdentifier><Id>test1</Id><AccessPolicy><Start>2022-04-14T06:36:24.0000000Z</Start><Expiry>9999-12-31T23:59:59.0000000Z</Expiry><Permission>a</Permission></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test2</Id><AccessPolicy><Start>2016-01-01T00:00:00.0000000Z</Start><Expiry>9999-12-31T23:59:59.0000000Z</Expiry></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test3</Id><AccessPolicy><Start>2022-04-14T06:36:28.0000000Z</Start><Expiry>2018-01-01T00:00:00.0000000Z</Expiry></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test4</Id><AccessPolicy><Start>2016-01-01T00:00:00.0000000Z</Start><Expiry>2016-05-01T00:00:00.0000000Z</Expiry><Permission>raud</Permission></AccessPolicy></SignedIdentifier></SignedIdentifiers>"
     headers:
       content-type:
       - application/xml
       date:
-      - Mon, 11 Apr 2022 14:18:04 GMT
+      - Thu, 14 Apr 2022 06:36:33 GMT
       server:
       - Windows-Azure-Table/1.0 Microsoft-HTTPAPI/2.0
       transfer-encoding:
@@ -1358,25 +1355,25 @@ interactions:
       Connection:
       - keep-alive
       Date:
-      - Mon, 11 Apr 2022 14:18:05 GMT
+      - Thu, 14 Apr 2022 06:36:34 GMT
       ParameterSetName:
       - -t -n --account-name --account-key
       User-Agent:
-      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.9.6 (Windows-10-10.0.19044-SP0)
+      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.7.9 (Windows-10-10.0.22000-SP0)
       x-ms-date:
-      - Mon, 11 Apr 2022 14:18:05 GMT
+      - Thu, 14 Apr 2022 06:36:34 GMT
       x-ms-version:
       - '2019-02-02'
     method: GET
     uri: https://clitest000002.table.core.windows.net/table000003?comp=acl
   response:
     body:
-      string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><SignedIdentifiers><SignedIdentifier><Id>test1</Id><AccessPolicy><Start>2022-04-11T14:17:57.0000000Z</Start><Expiry>9999-12-31T23:59:59.0000000Z</Expiry><Permission>a</Permission></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test2</Id><AccessPolicy><Start>2016-01-01T00:00:00.0000000Z</Start><Expiry>9999-12-31T23:59:59.0000000Z</Expiry></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test3</Id><AccessPolicy><Start>2022-04-11T14:18:00.0000000Z</Start><Expiry>2018-01-01T00:00:00.0000000Z</Expiry></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test4</Id><AccessPolicy><Start>2016-01-01T00:00:00.0000000Z</Start><Expiry>2016-05-01T00:00:00.0000000Z</Expiry><Permission>raud</Permission></AccessPolicy></SignedIdentifier></SignedIdentifiers>"
+      string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><SignedIdentifiers><SignedIdentifier><Id>test1</Id><AccessPolicy><Start>2022-04-14T06:36:24.0000000Z</Start><Expiry>9999-12-31T23:59:59.0000000Z</Expiry><Permission>a</Permission></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test2</Id><AccessPolicy><Start>2016-01-01T00:00:00.0000000Z</Start><Expiry>9999-12-31T23:59:59.0000000Z</Expiry></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test3</Id><AccessPolicy><Start>2022-04-14T06:36:28.0000000Z</Start><Expiry>2018-01-01T00:00:00.0000000Z</Expiry></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test4</Id><AccessPolicy><Start>2016-01-01T00:00:00.0000000Z</Start><Expiry>2016-05-01T00:00:00.0000000Z</Expiry><Permission>raud</Permission></AccessPolicy></SignedIdentifier></SignedIdentifiers>"
     headers:
       content-type:
       - application/xml
       date:
-      - Mon, 11 Apr 2022 14:18:05 GMT
+      - Thu, 14 Apr 2022 06:36:33 GMT
       server:
       - Windows-Azure-Table/1.0 Microsoft-HTTPAPI/2.0
       transfer-encoding:
@@ -1398,25 +1395,25 @@ interactions:
       Connection:
       - keep-alive
       Date:
-      - Mon, 11 Apr 2022 14:18:06 GMT
+      - Thu, 14 Apr 2022 06:36:36 GMT
       ParameterSetName:
       - -t -n --account-name --account-key
       User-Agent:
-      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.9.6 (Windows-10-10.0.19044-SP0)
+      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.7.9 (Windows-10-10.0.22000-SP0)
       x-ms-date:
-      - Mon, 11 Apr 2022 14:18:06 GMT
+      - Thu, 14 Apr 2022 06:36:36 GMT
       x-ms-version:
       - '2019-02-02'
     method: GET
     uri: https://clitest000002.table.core.windows.net/table000003?comp=acl
   response:
     body:
-      string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><SignedIdentifiers><SignedIdentifier><Id>test1</Id><AccessPolicy><Start>2022-04-11T14:17:57.0000000Z</Start><Expiry>9999-12-31T23:59:59.0000000Z</Expiry><Permission>a</Permission></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test2</Id><AccessPolicy><Start>2016-01-01T00:00:00.0000000Z</Start><Expiry>9999-12-31T23:59:59.0000000Z</Expiry></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test3</Id><AccessPolicy><Start>2022-04-11T14:18:00.0000000Z</Start><Expiry>2018-01-01T00:00:00.0000000Z</Expiry></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test4</Id><AccessPolicy><Start>2016-01-01T00:00:00.0000000Z</Start><Expiry>2016-05-01T00:00:00.0000000Z</Expiry><Permission>raud</Permission></AccessPolicy></SignedIdentifier></SignedIdentifiers>"
+      string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><SignedIdentifiers><SignedIdentifier><Id>test1</Id><AccessPolicy><Start>2022-04-14T06:36:24.0000000Z</Start><Expiry>9999-12-31T23:59:59.0000000Z</Expiry><Permission>a</Permission></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test2</Id><AccessPolicy><Start>2016-01-01T00:00:00.0000000Z</Start><Expiry>9999-12-31T23:59:59.0000000Z</Expiry></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test3</Id><AccessPolicy><Start>2022-04-14T06:36:28.0000000Z</Start><Expiry>2018-01-01T00:00:00.0000000Z</Expiry></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test4</Id><AccessPolicy><Start>2016-01-01T00:00:00.0000000Z</Start><Expiry>2016-05-01T00:00:00.0000000Z</Expiry><Permission>raud</Permission></AccessPolicy></SignedIdentifier></SignedIdentifiers>"
     headers:
       content-type:
       - application/xml
       date:
-      - Mon, 11 Apr 2022 14:18:06 GMT
+      - Thu, 14 Apr 2022 06:36:35 GMT
       server:
       - Windows-Azure-Table/1.0 Microsoft-HTTPAPI/2.0
       transfer-encoding:
@@ -1438,25 +1435,25 @@ interactions:
       Connection:
       - keep-alive
       Date:
-      - Mon, 11 Apr 2022 14:18:07 GMT
+      - Thu, 14 Apr 2022 06:36:37 GMT
       ParameterSetName:
       - -t -n --permission --account-name --account-key
       User-Agent:
-      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.9.6 (Windows-10-10.0.19044-SP0)
+      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.7.9 (Windows-10-10.0.22000-SP0)
       x-ms-date:
-      - Mon, 11 Apr 2022 14:18:07 GMT
+      - Thu, 14 Apr 2022 06:36:37 GMT
       x-ms-version:
       - '2019-02-02'
     method: GET
     uri: https://clitest000002.table.core.windows.net/table000003?comp=acl
   response:
     body:
-      string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><SignedIdentifiers><SignedIdentifier><Id>test1</Id><AccessPolicy><Start>2022-04-11T14:17:57.0000000Z</Start><Expiry>9999-12-31T23:59:59.0000000Z</Expiry><Permission>a</Permission></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test2</Id><AccessPolicy><Start>2016-01-01T00:00:00.0000000Z</Start><Expiry>9999-12-31T23:59:59.0000000Z</Expiry></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test3</Id><AccessPolicy><Start>2022-04-11T14:18:00.0000000Z</Start><Expiry>2018-01-01T00:00:00.0000000Z</Expiry></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test4</Id><AccessPolicy><Start>2016-01-01T00:00:00.0000000Z</Start><Expiry>2016-05-01T00:00:00.0000000Z</Expiry><Permission>raud</Permission></AccessPolicy></SignedIdentifier></SignedIdentifiers>"
+      string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><SignedIdentifiers><SignedIdentifier><Id>test1</Id><AccessPolicy><Start>2022-04-14T06:36:24.0000000Z</Start><Expiry>9999-12-31T23:59:59.0000000Z</Expiry><Permission>a</Permission></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test2</Id><AccessPolicy><Start>2016-01-01T00:00:00.0000000Z</Start><Expiry>9999-12-31T23:59:59.0000000Z</Expiry></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test3</Id><AccessPolicy><Start>2022-04-14T06:36:28.0000000Z</Start><Expiry>2018-01-01T00:00:00.0000000Z</Expiry></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test4</Id><AccessPolicy><Start>2016-01-01T00:00:00.0000000Z</Start><Expiry>2016-05-01T00:00:00.0000000Z</Expiry><Permission>raud</Permission></AccessPolicy></SignedIdentifier></SignedIdentifiers>"
     headers:
       content-type:
       - application/xml
       date:
-      - Mon, 11 Apr 2022 14:18:07 GMT
+      - Thu, 14 Apr 2022 06:36:36 GMT
       server:
       - Windows-Azure-Table/1.0 Microsoft-HTTPAPI/2.0
       transfer-encoding:
@@ -1469,8 +1466,8 @@ interactions:
 - request:
     body: '<?xml version=''1.0'' encoding=''utf-8''?>
 
-      <SignedIdentifiers><SignedIdentifier><Id>test1</Id><AccessPolicy><Start>2022-04-11T14:17:57Z</Start><Expiry>9999-12-31T23:59:59Z</Expiry><Permission>au</Permission></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test2</Id><AccessPolicy><Start>2016-01-01T00:00:00Z</Start><Expiry>9999-12-31T23:59:59Z</Expiry><Permission
-      /></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test3</Id><AccessPolicy><Start>2022-04-11T14:18:00Z</Start><Expiry>2018-01-01T00:00:00Z</Expiry><Permission
+      <SignedIdentifiers><SignedIdentifier><Id>test1</Id><AccessPolicy><Start>2022-04-14T06:36:24Z</Start><Expiry>9999-12-31T23:59:59Z</Expiry><Permission>au</Permission></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test2</Id><AccessPolicy><Start>2016-01-01T00:00:00Z</Start><Expiry>9999-12-31T23:59:59Z</Expiry><Permission
+      /></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test3</Id><AccessPolicy><Start>2022-04-14T06:36:28Z</Start><Expiry>2018-01-01T00:00:00Z</Expiry><Permission
       /></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test4</Id><AccessPolicy><Start>2016-01-01T00:00:00Z</Start><Expiry>2016-05-01T00:00:00Z</Expiry><Permission>raud</Permission></AccessPolicy></SignedIdentifier></SignedIdentifiers>'
     headers:
       Accept:
@@ -1486,13 +1483,13 @@ interactions:
       Content-Type:
       - application/xml
       Date:
-      - Mon, 11 Apr 2022 14:18:08 GMT
+      - Thu, 14 Apr 2022 06:36:38 GMT
       ParameterSetName:
       - -t -n --permission --account-name --account-key
       User-Agent:
-      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.9.6 (Windows-10-10.0.19044-SP0)
+      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.7.9 (Windows-10-10.0.22000-SP0)
       x-ms-date:
-      - Mon, 11 Apr 2022 14:18:08 GMT
+      - Thu, 14 Apr 2022 06:36:38 GMT
       x-ms-version:
       - '2019-02-02'
     method: PUT
@@ -1504,7 +1501,7 @@ interactions:
       content-length:
       - '0'
       date:
-      - Mon, 11 Apr 2022 14:18:07 GMT
+      - Thu, 14 Apr 2022 06:36:37 GMT
       server:
       - Windows-Azure-Table/1.0 Microsoft-HTTPAPI/2.0
       x-ms-version:
@@ -1524,25 +1521,25 @@ interactions:
       Connection:
       - keep-alive
       Date:
-      - Mon, 11 Apr 2022 14:18:09 GMT
+      - Thu, 14 Apr 2022 06:36:39 GMT
       ParameterSetName:
       - -t -n --account-name --account-key
       User-Agent:
-      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.9.6 (Windows-10-10.0.19044-SP0)
+      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.7.9 (Windows-10-10.0.22000-SP0)
       x-ms-date:
-      - Mon, 11 Apr 2022 14:18:09 GMT
+      - Thu, 14 Apr 2022 06:36:39 GMT
       x-ms-version:
       - '2019-02-02'
     method: GET
     uri: https://clitest000002.table.core.windows.net/table000003?comp=acl
   response:
     body:
-      string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><SignedIdentifiers><SignedIdentifier><Id>test1</Id><AccessPolicy><Start>2022-04-11T14:17:57.0000000Z</Start><Expiry>9999-12-31T23:59:59.0000000Z</Expiry><Permission>au</Permission></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test2</Id><AccessPolicy><Start>2016-01-01T00:00:00.0000000Z</Start><Expiry>9999-12-31T23:59:59.0000000Z</Expiry></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test3</Id><AccessPolicy><Start>2022-04-11T14:18:00.0000000Z</Start><Expiry>2018-01-01T00:00:00.0000000Z</Expiry></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test4</Id><AccessPolicy><Start>2016-01-01T00:00:00.0000000Z</Start><Expiry>2016-05-01T00:00:00.0000000Z</Expiry><Permission>raud</Permission></AccessPolicy></SignedIdentifier></SignedIdentifiers>"
+      string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><SignedIdentifiers><SignedIdentifier><Id>test1</Id><AccessPolicy><Start>2022-04-14T06:36:24.0000000Z</Start><Expiry>9999-12-31T23:59:59.0000000Z</Expiry><Permission>au</Permission></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test2</Id><AccessPolicy><Start>2016-01-01T00:00:00.0000000Z</Start><Expiry>9999-12-31T23:59:59.0000000Z</Expiry></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test3</Id><AccessPolicy><Start>2022-04-14T06:36:28.0000000Z</Start><Expiry>2018-01-01T00:00:00.0000000Z</Expiry></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test4</Id><AccessPolicy><Start>2016-01-01T00:00:00.0000000Z</Start><Expiry>2016-05-01T00:00:00.0000000Z</Expiry><Permission>raud</Permission></AccessPolicy></SignedIdentifier></SignedIdentifiers>"
     headers:
       content-type:
       - application/xml
       date:
-      - Mon, 11 Apr 2022 14:18:09 GMT
+      - Thu, 14 Apr 2022 06:36:38 GMT
       server:
       - Windows-Azure-Table/1.0 Microsoft-HTTPAPI/2.0
       transfer-encoding:
@@ -1564,25 +1561,25 @@ interactions:
       Connection:
       - keep-alive
       Date:
-      - Mon, 11 Apr 2022 14:18:10 GMT
+      - Thu, 14 Apr 2022 06:36:40 GMT
       ParameterSetName:
       - -t -n --account-name --account-key
       User-Agent:
-      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.9.6 (Windows-10-10.0.19044-SP0)
+      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.7.9 (Windows-10-10.0.22000-SP0)
       x-ms-date:
-      - Mon, 11 Apr 2022 14:18:10 GMT
+      - Thu, 14 Apr 2022 06:36:40 GMT
       x-ms-version:
       - '2019-02-02'
     method: GET
     uri: https://clitest000002.table.core.windows.net/table000003?comp=acl
   response:
     body:
-      string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><SignedIdentifiers><SignedIdentifier><Id>test1</Id><AccessPolicy><Start>2022-04-11T14:17:57.0000000Z</Start><Expiry>9999-12-31T23:59:59.0000000Z</Expiry><Permission>au</Permission></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test2</Id><AccessPolicy><Start>2016-01-01T00:00:00.0000000Z</Start><Expiry>9999-12-31T23:59:59.0000000Z</Expiry></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test3</Id><AccessPolicy><Start>2022-04-11T14:18:00.0000000Z</Start><Expiry>2018-01-01T00:00:00.0000000Z</Expiry></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test4</Id><AccessPolicy><Start>2016-01-01T00:00:00.0000000Z</Start><Expiry>2016-05-01T00:00:00.0000000Z</Expiry><Permission>raud</Permission></AccessPolicy></SignedIdentifier></SignedIdentifiers>"
+      string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><SignedIdentifiers><SignedIdentifier><Id>test1</Id><AccessPolicy><Start>2022-04-14T06:36:24.0000000Z</Start><Expiry>9999-12-31T23:59:59.0000000Z</Expiry><Permission>au</Permission></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test2</Id><AccessPolicy><Start>2016-01-01T00:00:00.0000000Z</Start><Expiry>9999-12-31T23:59:59.0000000Z</Expiry></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test3</Id><AccessPolicy><Start>2022-04-14T06:36:28.0000000Z</Start><Expiry>2018-01-01T00:00:00.0000000Z</Expiry></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test4</Id><AccessPolicy><Start>2016-01-01T00:00:00.0000000Z</Start><Expiry>2016-05-01T00:00:00.0000000Z</Expiry><Permission>raud</Permission></AccessPolicy></SignedIdentifier></SignedIdentifiers>"
     headers:
       content-type:
       - application/xml
       date:
-      - Mon, 11 Apr 2022 14:18:10 GMT
+      - Thu, 14 Apr 2022 06:36:39 GMT
       server:
       - Windows-Azure-Table/1.0 Microsoft-HTTPAPI/2.0
       transfer-encoding:
@@ -1596,7 +1593,7 @@ interactions:
     body: '<?xml version=''1.0'' encoding=''utf-8''?>
 
       <SignedIdentifiers><SignedIdentifier><Id>test2</Id><AccessPolicy><Start>2016-01-01T00:00:00Z</Start><Expiry>9999-12-31T23:59:59Z</Expiry><Permission
-      /></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test3</Id><AccessPolicy><Start>2022-04-11T14:18:00Z</Start><Expiry>2018-01-01T00:00:00Z</Expiry><Permission
+      /></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test3</Id><AccessPolicy><Start>2022-04-14T06:36:28Z</Start><Expiry>2018-01-01T00:00:00Z</Expiry><Permission
       /></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test4</Id><AccessPolicy><Start>2016-01-01T00:00:00Z</Start><Expiry>2016-05-01T00:00:00Z</Expiry><Permission>raud</Permission></AccessPolicy></SignedIdentifier></SignedIdentifiers>'
     headers:
       Accept:
@@ -1612,13 +1609,13 @@ interactions:
       Content-Type:
       - application/xml
       Date:
-      - Mon, 11 Apr 2022 14:18:11 GMT
+      - Thu, 14 Apr 2022 06:36:41 GMT
       ParameterSetName:
       - -t -n --account-name --account-key
       User-Agent:
-      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.9.6 (Windows-10-10.0.19044-SP0)
+      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.7.9 (Windows-10-10.0.22000-SP0)
       x-ms-date:
-      - Mon, 11 Apr 2022 14:18:11 GMT
+      - Thu, 14 Apr 2022 06:36:41 GMT
       x-ms-version:
       - '2019-02-02'
     method: PUT
@@ -1630,7 +1627,7 @@ interactions:
       content-length:
       - '0'
       date:
-      - Mon, 11 Apr 2022 14:18:11 GMT
+      - Thu, 14 Apr 2022 06:36:40 GMT
       server:
       - Windows-Azure-Table/1.0 Microsoft-HTTPAPI/2.0
       x-ms-version:
@@ -1650,25 +1647,25 @@ interactions:
       Connection:
       - keep-alive
       Date:
-      - Mon, 11 Apr 2022 14:18:11 GMT
+      - Thu, 14 Apr 2022 06:36:42 GMT
       ParameterSetName:
       - -t --account-name --account-key
       User-Agent:
-      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.9.6 (Windows-10-10.0.19044-SP0)
+      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.7.9 (Windows-10-10.0.22000-SP0)
       x-ms-date:
-      - Mon, 11 Apr 2022 14:18:11 GMT
+      - Thu, 14 Apr 2022 06:36:42 GMT
       x-ms-version:
       - '2019-02-02'
     method: GET
     uri: https://clitest000002.table.core.windows.net/table000003?comp=acl
   response:
     body:
-      string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><SignedIdentifiers><SignedIdentifier><Id>test2</Id><AccessPolicy><Start>2016-01-01T00:00:00.0000000Z</Start><Expiry>9999-12-31T23:59:59.0000000Z</Expiry></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test3</Id><AccessPolicy><Start>2022-04-11T14:18:00.0000000Z</Start><Expiry>2018-01-01T00:00:00.0000000Z</Expiry></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test4</Id><AccessPolicy><Start>2016-01-01T00:00:00.0000000Z</Start><Expiry>2016-05-01T00:00:00.0000000Z</Expiry><Permission>raud</Permission></AccessPolicy></SignedIdentifier></SignedIdentifiers>"
+      string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><SignedIdentifiers><SignedIdentifier><Id>test2</Id><AccessPolicy><Start>2016-01-01T00:00:00.0000000Z</Start><Expiry>9999-12-31T23:59:59.0000000Z</Expiry></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test3</Id><AccessPolicy><Start>2022-04-14T06:36:28.0000000Z</Start><Expiry>2018-01-01T00:00:00.0000000Z</Expiry></AccessPolicy></SignedIdentifier><SignedIdentifier><Id>test4</Id><AccessPolicy><Start>2016-01-01T00:00:00.0000000Z</Start><Expiry>2016-05-01T00:00:00.0000000Z</Expiry><Permission>raud</Permission></AccessPolicy></SignedIdentifier></SignedIdentifiers>"
     headers:
       content-type:
       - application/xml
       date:
-      - Mon, 11 Apr 2022 14:18:12 GMT
+      - Thu, 14 Apr 2022 06:36:40 GMT
       server:
       - Windows-Azure-Table/1.0 Microsoft-HTTPAPI/2.0
       transfer-encoding:
@@ -1692,13 +1689,13 @@ interactions:
       DataServiceVersion:
       - '3.0'
       Date:
-      - Mon, 11 Apr 2022 14:18:13 GMT
+      - Thu, 14 Apr 2022 06:36:43 GMT
       ParameterSetName:
       - --name --fail-not-exist --account-name --account-key
       User-Agent:
-      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.9.6 (Windows-10-10.0.19044-SP0)
+      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.7.9 (Windows-10-10.0.22000-SP0)
       x-ms-date:
-      - Mon, 11 Apr 2022 14:18:13 GMT
+      - Thu, 14 Apr 2022 06:36:43 GMT
       x-ms-version:
       - '2019-02-02'
     method: GET
@@ -1712,7 +1709,7 @@ interactions:
       content-type:
       - application/json;odata=minimalmetadata;streaming=true;charset=utf-8
       date:
-      - Mon, 11 Apr 2022 14:18:12 GMT
+      - Thu, 14 Apr 2022 06:36:42 GMT
       server:
       - Windows-Azure-Table/1.0 Microsoft-HTTPAPI/2.0
       transfer-encoding:
@@ -1738,13 +1735,13 @@ interactions:
       Content-Length:
       - '0'
       Date:
-      - Mon, 11 Apr 2022 14:18:14 GMT
+      - Thu, 14 Apr 2022 06:36:44 GMT
       ParameterSetName:
       - --name --fail-not-exist --account-name --account-key
       User-Agent:
-      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.9.6 (Windows-10-10.0.19044-SP0)
+      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.7.9 (Windows-10-10.0.22000-SP0)
       x-ms-date:
-      - Mon, 11 Apr 2022 14:18:14 GMT
+      - Thu, 14 Apr 2022 06:36:44 GMT
       x-ms-version:
       - '2019-02-02'
     method: DELETE
@@ -1758,7 +1755,7 @@ interactions:
       content-length:
       - '0'
       date:
-      - Mon, 11 Apr 2022 14:18:12 GMT
+      - Thu, 14 Apr 2022 06:36:42 GMT
       server:
       - Windows-Azure-Table/1.0 Microsoft-HTTPAPI/2.0
       x-content-type-options:
@@ -1782,13 +1779,13 @@ interactions:
       DataServiceVersion:
       - '3.0'
       Date:
-      - Mon, 11 Apr 2022 14:18:14 GMT
+      - Thu, 14 Apr 2022 06:36:45 GMT
       ParameterSetName:
       - -n --account-name --account-key
       User-Agent:
-      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.9.6 (Windows-10-10.0.19044-SP0)
+      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.7.9 (Windows-10-10.0.22000-SP0)
       x-ms-date:
-      - Mon, 11 Apr 2022 14:18:14 GMT
+      - Thu, 14 Apr 2022 06:36:45 GMT
       x-ms-version:
       - '2019-02-02'
     method: GET
@@ -1802,7 +1799,7 @@ interactions:
       content-type:
       - application/json;odata=minimalmetadata;streaming=true;charset=utf-8
       date:
-      - Mon, 11 Apr 2022 14:18:14 GMT
+      - Thu, 14 Apr 2022 06:36:43 GMT
       server:
       - Windows-Azure-Table/1.0 Microsoft-HTTPAPI/2.0
       transfer-encoding:
@@ -1826,26 +1823,26 @@ interactions:
       Connection:
       - keep-alive
       Date:
-      - Mon, 11 Apr 2022 14:23:15 GMT
+      - Thu, 14 Apr 2022 06:41:46 GMT
       ParameterSetName:
       - --account-name --account-key
       User-Agent:
-      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.9.6 (Windows-10-10.0.19044-SP0)
+      - AZURECLI/2.35.0 azsdk-python-data-tables/12.2.0 Python/3.7.9 (Windows-10-10.0.22000-SP0)
       x-ms-date:
-      - Mon, 11 Apr 2022 14:23:15 GMT
+      - Thu, 14 Apr 2022 06:41:46 GMT
       x-ms-version:
       - '2019-02-02'
     method: GET
     uri: https://clitest000002-secondary.table.core.windows.net/?restype=service&comp=stats
   response:
     body:
-      string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><StorageServiceStats><GeoReplication><Status>live</Status><LastSyncTime>Mon,
-        11 Apr 2022 14:20:06 GMT</LastSyncTime></GeoReplication></StorageServiceStats>"
+      string: "\uFEFF<?xml version=\"1.0\" encoding=\"utf-8\"?><StorageServiceStats><GeoReplication><Status>live</Status><LastSyncTime>Thu,
+        14 Apr 2022 06:39:21 GMT</LastSyncTime></GeoReplication></StorageServiceStats>"
     headers:
       content-type:
       - application/xml
       date:
-      - Mon, 11 Apr 2022 14:23:16 GMT
+      - Thu, 14 Apr 2022 06:41:46 GMT
       server:
       - Windows-Azure-Table/1.0 Microsoft-HTTPAPI/2.0
       transfer-encoding:
diff --git a/src/azure-cli/azure/cli/command_modules/storage/tests/latest/test_storage_table_scenarios.py b/src/azure-cli/azure/cli/command_modules/storage/tests/latest/test_storage_table_scenarios.py
index 27965295819..bcaacf9f961 100644
--- a/src/azure-cli/azure/cli/command_modules/storage/tests/latest/test_storage_table_scenarios.py
+++ b/src/azure-cli/azure/cli/command_modules/storage/tests/latest/test_storage_table_scenarios.py
@@ -49,13 +49,13 @@ def test_storage_table_main_scenario(self, resource_group, storage_account):
     def verify_entity_operations(self, account_info, table_name):
         self.storage_cmd(
             'storage entity insert -t {} -e rowkey=001 partitionkey=001 name=test value=something '
-            'binaryProperty=AAECAwQF binaryProperty@odata.type=Edm.Binary',
+            'sizeInBytes=86222504922 sizeInBytes@odata.type=Edm.Int64',
             account_info, table_name)
         self.storage_cmd('storage entity show -t {} --row-key 001 --partition-key 001',
                          account_info, table_name) \
             .assert_with_checks(JMESPathCheck('name', 'test'),
                                 JMESPathCheck('value', 'something'),
-                                JMESPathCheck('binaryProperty', 'AAECAwQF'))
+                                JMESPathCheck('sizeInBytes.value', '86222504922'))
         self.storage_cmd(
             'storage entity show -t {} --row-key 001 --partition-key 001 --select name',
             account_info, table_name).assert_with_checks(JMESPathCheck('name', 'test'),
@@ -67,21 +67,20 @@ def verify_entity_operations(self, account_info, table_name):
                          account_info, table_name) \
             .assert_with_checks(JMESPathCheck('name', 'test'),
                                 JMESPathCheck('value', 'newval'),
-                                JMESPathCheck('binaryProperty', 'AAECAwQF'))
+                                JMESPathCheck('sizeInBytes.value', '86222504922'))
 
         self.storage_cmd('storage entity replace -t {} -e rowkey=001 partitionkey=001 cat=hat',
                          account_info, table_name)
         self.storage_cmd('storage entity show -t {} --row-key 001 --partition-key 001',
                          account_info, table_name) \
             .assert_with_checks(JMESPathCheck('cat', 'hat'), JMESPathCheck('name', None),
-                                JMESPathCheck('value', None), JMESPathCheck('binaryProperty', None))
+                                JMESPathCheck('value', None), JMESPathCheck('sizeInBytes', None))
 
         self.storage_cmd('storage entity delete -t {} --row-key 001 --partition-key 001',
                          account_info, table_name)
         self.storage_cmd_negative('storage entity show -t {} --row-key 001 --partition-key 001',
                                   account_info, table_name)
-        self.storage_cmd('storage entity insert -t {} -e rowkey=001 partitionkey=001 name=test value=something '
-                         'binaryProperty=AAECAwQF binaryProperty@odata.type=Edm.Binary',
+        self.storage_cmd('storage entity insert -t {} -e rowkey=001 partitionkey=001 name=test value=something',
                          account_info, table_name)
         self.storage_cmd('storage entity insert -t {} -e rowkey=002 partitionkey=002 name=test2 value=something2',
                          account_info, table_name)