From 7aed78d202f7fbcb74842f1673c080e53bb78352 Mon Sep 17 00:00:00 2001 From: 00Kai0 Date: Mon, 27 Jul 2020 16:00:02 +0800 Subject: [PATCH 1/4] add track2 config --- .../2019-07-01/examples/RedisCacheCreate.json | 5 +- .../RedisCacheFirewallRuleCreate.json | 12 ++--- .../examples/RedisCacheForceReboot.json | 6 +-- .../examples/RedisCacheOperations_List.json | 8 ++++ .../preview/2019-07-01/redis.json | 5 ++ .../redis/resource-manager/readme.cli.md | 48 +++++++++++++++++++ .../redis/resource-manager/readme.md | 16 ++++++- 7 files changed, 84 insertions(+), 16 deletions(-) create mode 100644 specification/redis/resource-manager/Microsoft.Cache/preview/2019-07-01/examples/RedisCacheOperations_List.json create mode 100644 specification/redis/resource-manager/readme.cli.md diff --git a/specification/redis/resource-manager/Microsoft.Cache/preview/2019-07-01/examples/RedisCacheCreate.json b/specification/redis/resource-manager/Microsoft.Cache/preview/2019-07-01/examples/RedisCacheCreate.json index 6dd7ce792529..72e37d8df823 100644 --- a/specification/redis/resource-manager/Microsoft.Cache/preview/2019-07-01/examples/RedisCacheCreate.json +++ b/specification/redis/resource-manager/Microsoft.Cache/preview/2019-07-01/examples/RedisCacheCreate.json @@ -17,12 +17,11 @@ }, "enableNonSslPort": true, "shardCount": 2, - "replicasPerMaster": 2, "redisConfiguration": { "maxmemory-policy": "allkeys-lru" }, "subnetId": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/virtualNetworks/network1/subnets/subnet1", - "staticIP": "192.168.0.5", + "staticIP": "10.0.0.5", "minimumTlsVersion": "1.2" } } @@ -51,7 +50,6 @@ "capacity": 1 }, "enableNonSslPort": false, - "replicasPerMaster": 2, "redisConfiguration": { "maxmemory-policy": "allkeys-lru" }, @@ -123,7 +121,6 @@ "capacity": 1 }, "enableNonSslPort": false, - "replicasPerMaster": 2, "redisConfiguration": { "maxclients": "1000", "maxmemory-reserved": "50", diff --git a/specification/redis/resource-manager/Microsoft.Cache/preview/2019-07-01/examples/RedisCacheFirewallRuleCreate.json b/specification/redis/resource-manager/Microsoft.Cache/preview/2019-07-01/examples/RedisCacheFirewallRuleCreate.json index 9fe3832d8a20..b92e8ff9b3be 100644 --- a/specification/redis/resource-manager/Microsoft.Cache/preview/2019-07-01/examples/RedisCacheFirewallRuleCreate.json +++ b/specification/redis/resource-manager/Microsoft.Cache/preview/2019-07-01/examples/RedisCacheFirewallRuleCreate.json @@ -7,8 +7,8 @@ "subscriptionId": "subid", "parameters": { "properties": { - "startIP": "192.168.1.1", - "endIP": "192.168.1.4" + "startIP": "10.0.1.1", + "endIP": "10.0.1.4" } } }, @@ -19,8 +19,8 @@ "name": "cache1/rule1", "type": "Microsoft.Cache/Redis/firewallRules", "properties": { - "startIP": "192.168.1.1", - "endIP": "192.168.1.4" + "startIP": "10.0.1.1", + "endIP": "10.0.1.4" } } }, @@ -30,8 +30,8 @@ "name": "cache1/rule1", "type": "Microsoft.Cache/Redis/firewallRules", "properties": { - "startIP": "192.168.1.1", - "endIP": "192.168.1.4" + "startIP": "10.0.1.1", + "endIP": "10.0.1.4" } } } diff --git a/specification/redis/resource-manager/Microsoft.Cache/preview/2019-07-01/examples/RedisCacheForceReboot.json b/specification/redis/resource-manager/Microsoft.Cache/preview/2019-07-01/examples/RedisCacheForceReboot.json index 8012f8ae115c..e0d664658354 100644 --- a/specification/redis/resource-manager/Microsoft.Cache/preview/2019-07-01/examples/RedisCacheForceReboot.json +++ b/specification/redis/resource-manager/Microsoft.Cache/preview/2019-07-01/examples/RedisCacheForceReboot.json @@ -6,11 +6,7 @@ "subscriptionId": "subid", "parameters": { "shardId": 0, - "rebootType": "AllNodes", - "ports": [ - 13000, - 15001 - ] + "rebootType": "AllNodes" } }, "responses": { diff --git a/specification/redis/resource-manager/Microsoft.Cache/preview/2019-07-01/examples/RedisCacheOperations_List.json b/specification/redis/resource-manager/Microsoft.Cache/preview/2019-07-01/examples/RedisCacheOperations_List.json new file mode 100644 index 000000000000..e085143cdfc4 --- /dev/null +++ b/specification/redis/resource-manager/Microsoft.Cache/preview/2019-07-01/examples/RedisCacheOperations_List.json @@ -0,0 +1,8 @@ +{ + "parameters": { + "api-version": "2018-03-01" + }, + "responses": { + "200": {} + } +} \ No newline at end of file diff --git a/specification/redis/resource-manager/Microsoft.Cache/preview/2019-07-01/redis.json b/specification/redis/resource-manager/Microsoft.Cache/preview/2019-07-01/redis.json index fc67ab980b18..fd7c5800ef5b 100644 --- a/specification/redis/resource-manager/Microsoft.Cache/preview/2019-07-01/redis.json +++ b/specification/redis/resource-manager/Microsoft.Cache/preview/2019-07-01/redis.json @@ -41,6 +41,11 @@ ], "description": "Lists all of the available REST API operations of the Microsoft.Cache provider.", "operationId": "Operations_List", + "x-ms-examples": { + "Operations_List": { + "$ref": "./examples/RedisCacheOperations_List.json" + } + }, "parameters": [ { "$ref": "#/parameters/ApiVersionParameter" diff --git a/specification/redis/resource-manager/readme.cli.md b/specification/redis/resource-manager/readme.cli.md new file mode 100644 index 000000000000..308f24c6abc2 --- /dev/null +++ b/specification/redis/resource-manager/readme.cli.md @@ -0,0 +1,48 @@ +## CLI + +These settings don't need to apply `--cli` on the command line. + +``` yaml +cli: + cli-name: redis + package-name: azure-mgmt-redis + namespace: azure.mgmt.redis + test-scenario: + - name: /Redis/put/RedisCacheCreate + - name: /PatchSchedules/put/RedisCachePatchSchedulesCreateOrUpdate + disabled: true + - name: /FirewallRules/put/RedisCacheFirewallRuleCreate + - name: /LinkedServer/put/LinkedServer_Create + disabled: true + - name: /LinkedServer/get/LinkedServer_Get + disabled: true + - name: /FirewallRules/get/RedisCacheFirewallRuleGet + - name: /PatchSchedules/get/RedisCachePatchSchedulesGet + disabled: true + - name: /Redis/get/RedisCacheGet + disabled: true + - name: /PatchSchedules/get/RedisCachePatchSchedulesList + - name: /FirewallRules/get/RedisCacheFirewallRulesList + - name: /LinkedServer/get/LinkedServer_List + - name: /Redis/get/RedisCacheGet + disabled: true + - name: /Redis/get/RedisCacheListByResourceGroup + - name: /Redis/get/RedisCacheList + - name: /Operations/get/Operations_List + - name: /Redis/post/RedisCacheRegenerateKey + - name: /Redis/post/RedisCacheForceReboot + - name: /Redis/post/RedisCacheListKeys + - name: /Redis/post/RedisCacheImport + disabled: true + - name: /Redis/post/RedisCacheExport + disabled: true + - name: /Redis/patch/RedisCacheUpdate + - name: /Redis/post/RedisCacheList + - name: /LinkedServer/delete/LinkedServerDelete + disabled: true + - name: /FirewallRules/delete/RedisCacheFirewallRuleDelete + - name: /PatchSchedules/delete/RedisCachePatchSchedulesDelete + disabled: true + - name: /Redis/delete/RedisCacheDelete + +``` \ No newline at end of file diff --git a/specification/redis/resource-manager/readme.md b/specification/redis/resource-manager/readme.md index 5b8a8e1ac5b5..15e69c4bfa70 100644 --- a/specification/redis/resource-manager/readme.md +++ b/specification/redis/resource-manager/readme.md @@ -127,7 +127,7 @@ These settings apply only when `--python` is specified on the command line. Please also specify `--python-sdks-folder=`. Use `--python-mode=update` if you already have a setup.py and just want to update the code itself. -``` yaml $(python) +``` yaml !$(track2) python-mode: create python: azure-arm: true @@ -139,13 +139,27 @@ python: clear-output-folder: true ``` +``` yaml $(track2) +python-mode: update +azure-arm: true +license-header: MICROSOFT_MIT_NO_VERSION +namespace: azure.mgmt.redis +package-name: azure-mgmt-redis +package-version: 5.0.0 +clear-output-folder: true +``` + ``` yaml $(python) && $(python-mode) == 'update' +no-namespace-folders: true +output-folder: $(python-sdks-folder)/redis/azure-mgmt-redis/azure/mgmt/redis python: no-namespace-folders: true output-folder: $(python-sdks-folder)/redis/azure-mgmt-redis/azure/mgmt/redis ``` ``` yaml $(python) && $(python-mode) == 'create' +basic-setup-py: true +output-folder: $(python-sdks-folder)/redis/azure-mgmt-redis python: basic-setup-py: true output-folder: $(python-sdks-folder)/redis/azure-mgmt-redis From daf64db69c1acb86368b951200d75eb3ab321716 Mon Sep 17 00:00:00 2001 From: 00Kai0 Date: Tue, 28 Jul 2020 10:44:57 +0800 Subject: [PATCH 2/4] keep python this field --- specification/redis/resource-manager/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/redis/resource-manager/readme.md b/specification/redis/resource-manager/readme.md index 15e69c4bfa70..ce7541603150 100644 --- a/specification/redis/resource-manager/readme.md +++ b/specification/redis/resource-manager/readme.md @@ -127,7 +127,7 @@ These settings apply only when `--python` is specified on the command line. Please also specify `--python-sdks-folder=`. Use `--python-mode=update` if you already have a setup.py and just want to update the code itself. -``` yaml !$(track2) +``` yaml $(python) && !$(track2) python-mode: create python: azure-arm: true @@ -139,7 +139,7 @@ python: clear-output-folder: true ``` -``` yaml $(track2) +``` yaml $(python) && $(track2) python-mode: update azure-arm: true license-header: MICROSOFT_MIT_NO_VERSION From fec4a2f1f86e611939ea607de982931fa06afd96 Mon Sep 17 00:00:00 2001 From: 00Kai0 Date: Tue, 28 Jul 2020 11:27:28 +0800 Subject: [PATCH 3/4] fix example --- .../examples/RedisCacheOperations_List.json | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/specification/redis/resource-manager/Microsoft.Cache/preview/2019-07-01/examples/RedisCacheOperations_List.json b/specification/redis/resource-manager/Microsoft.Cache/preview/2019-07-01/examples/RedisCacheOperations_List.json index e085143cdfc4..c80c8f8c8746 100644 --- a/specification/redis/resource-manager/Microsoft.Cache/preview/2019-07-01/examples/RedisCacheOperations_List.json +++ b/specification/redis/resource-manager/Microsoft.Cache/preview/2019-07-01/examples/RedisCacheOperations_List.json @@ -3,6 +3,19 @@ "api-version": "2018-03-01" }, "responses": { - "200": {} + "200": { + "body": { + "value": [ + { + "name": "Microsoft.Cache/CheckNameAvailability", + "display": { + "operation": "Check Name Availability", + "provider": "Azure Cache", + "resource": "Redis" + } + } + ] + } + } } } \ No newline at end of file From 0c2625b6c42253d07022f44fe4f0740640b971ab Mon Sep 17 00:00:00 2001 From: Changlong Liu Date: Wed, 29 Jul 2020 10:16:19 +0800 Subject: [PATCH 4/4] add endline --- .../preview/2019-07-01/examples/RedisCacheOperations_List.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/redis/resource-manager/Microsoft.Cache/preview/2019-07-01/examples/RedisCacheOperations_List.json b/specification/redis/resource-manager/Microsoft.Cache/preview/2019-07-01/examples/RedisCacheOperations_List.json index c80c8f8c8746..25108e5da276 100644 --- a/specification/redis/resource-manager/Microsoft.Cache/preview/2019-07-01/examples/RedisCacheOperations_List.json +++ b/specification/redis/resource-manager/Microsoft.Cache/preview/2019-07-01/examples/RedisCacheOperations_List.json @@ -18,4 +18,4 @@ } } } -} \ No newline at end of file +}