Skip to content

Commit

Permalink
Add Redis track2 config (Azure#10261)
Browse files Browse the repository at this point in the history
* add track2 config

* keep python this field

* fix example

* add endline

Co-authored-by: Changlong Liu <changlong.liu@microsoft.com>
  • Loading branch information
2 people authored and giromm2ms committed Dec 20, 2020
1 parent caf01db commit ea11e26
Show file tree
Hide file tree
Showing 7 changed files with 97 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
Expand Down Expand Up @@ -51,7 +50,6 @@
"capacity": 1
},
"enableNonSslPort": false,
"replicasPerMaster": 2,
"redisConfiguration": {
"maxmemory-policy": "allkeys-lru"
},
Expand Down Expand Up @@ -123,7 +121,6 @@
"capacity": 1
},
"enableNonSslPort": false,
"replicasPerMaster": 2,
"redisConfiguration": {
"maxclients": "1000",
"maxmemory-reserved": "50",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
},
Expand All @@ -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"
}
}
},
Expand All @@ -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"
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,7 @@
"subscriptionId": "subid",
"parameters": {
"shardId": 0,
"rebootType": "AllNodes",
"ports": [
13000,
15001
]
"rebootType": "AllNodes"
}
},
"responses": {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"parameters": {
"api-version": "2018-03-01"
},
"responses": {
"200": {
"body": {
"value": [
{
"name": "Microsoft.Cache/CheckNameAvailability",
"display": {
"operation": "Check Name Availability",
"provider": "Azure Cache",
"resource": "Redis"
}
}
]
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
48 changes: 48 additions & 0 deletions specification/redis/resource-manager/readme.cli.md
Original file line number Diff line number Diff line change
@@ -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

```
16 changes: 15 additions & 1 deletion specification/redis/resource-manager/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ These settings apply only when `--python` is specified on the command line.
Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.
Use `--python-mode=update` if you already have a setup.py and just want to update the code itself.

``` yaml $(python)
``` yaml $(python) && !$(track2)
python-mode: create
python:
azure-arm: true
Expand All @@ -150,13 +150,27 @@ python:
clear-output-folder: true
```

``` yaml $(python) && $(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
Expand Down

0 comments on commit ea11e26

Please sign in to comment.