From 76883a32f2c9aa596a7c0ceefb356637708d6ed3 Mon Sep 17 00:00:00 2001 From: suna Liu Date: Mon, 23 Jul 2018 10:31:51 +0800 Subject: [PATCH] Change 'primary' to 'master' in replication specs --- .../stable/2017-12-01/examples/ReplicasListByServer.json | 8 ++++---- .../2017-12-01/examples/ServerCreateReplicaMode.json | 6 +++--- .../stable/2017-12-01/examples/ServerGet.json | 2 +- .../Microsoft.DBforMySQL/stable/2017-12-01/mysql.json | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/stable/2017-12-01/examples/ReplicasListByServer.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/stable/2017-12-01/examples/ReplicasListByServer.json index 70f132574f33..931fd7889be2 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/stable/2017-12-01/examples/ReplicasListByServer.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/stable/2017-12-01/examples/ReplicasListByServer.json @@ -1,6 +1,6 @@ { "parameters": { - "serverName": "testprimary", + "serverName": "testmaster", "resourceGroupName": "TestGroup", "api-version": "2017-12-01", "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" @@ -36,7 +36,7 @@ "version": "5.6", "earliestRestoreDate": "2018-06-11T23:56:54.3+00:00", "replicationRole": "Replica", - "primaryServerId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/testprimary", + "masterServerId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/testmaster", "replicaCapacity": 0 } }, @@ -67,7 +67,7 @@ "version": "5.6", "earliestRestoreDate": "2018-06-11T23:56:54.3+00:00", "replicationRole": "Replica", - "primaryServerId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/testprimary", + "masterServerId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/testmaster", "replicaCapacity": 0 } }, @@ -98,7 +98,7 @@ "version": "5.6", "earliestRestoreDate": "2018-06-11T23:56:54.3+00:00", "replicationRole": "Replica", - "primaryServerId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/testprimary", + "masterServerId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/servers/testmaster", "replicaCapacity": 0 } } diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/stable/2017-12-01/examples/ServerCreateReplicaMode.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/stable/2017-12-01/examples/ServerCreateReplicaMode.json index 29b45ed52dc7..c9857560febb 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/stable/2017-12-01/examples/ServerCreateReplicaMode.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/stable/2017-12-01/examples/ServerCreateReplicaMode.json @@ -8,7 +8,7 @@ "location": "westus", "properties": { "createMode": "Replica", - "sourceServerId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/PrimaryResourceGroup/providers/Microsoft.DBforMySQL/servers/primaryserver" + "sourceServerId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/MasterResourceGroup/providers/Microsoft.DBforMySQL/servers/masterserver" } } }, @@ -34,7 +34,7 @@ "fullyQualifiedDomainName": "targetserver.mysql.database.azure.com", "earliestRestoreDate": "2018-03-14T18:02:41.577+00:00", "replicationRole": "Replica", - "primaryServerId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/PrimaryResourceGroup/providers/Microsoft.DBforMySQL/servers/primaryserver", + "masterServerId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/MasterResourceGroup/providers/Microsoft.DBforMySQL/servers/masterserver", "replicaCapacity": 0 }, "location": "westus", @@ -67,7 +67,7 @@ "fullyQualifiedDomainName": "targetserver.mysql.database.azure.com", "earliestRestoreDate": "2018-03-14T18:02:41.577+00:00", "replicationRole": "Replica", - "primaryServerId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/PrimaryResourceGroup/providers/Microsoft.DBforMySQL/servers/primaryserver", + "masterServerId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/MasterResourceGroup/providers/Microsoft.DBforMySQL/servers/masterserver", "replicaCapacity": 0 }, "location": "westus", diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/stable/2017-12-01/examples/ServerGet.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/stable/2017-12-01/examples/ServerGet.json index ba4d728b5e99..381f09f4870d 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/stable/2017-12-01/examples/ServerGet.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/stable/2017-12-01/examples/ServerGet.json @@ -27,7 +27,7 @@ "fullyQualifiedDomainName": "mysqltestsvc4.mysql.database.azure.com", "earliestRestoreDate": "2018-03-14T18:02:41.577+00:00", "replicationRole": "None", - "primaryServerId": "", + "masterServerId": "", "replicaCapacity": 5 }, "location": "westus", diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/stable/2017-12-01/mysql.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/stable/2017-12-01/mysql.json index 7cd2c33921d2..3bc599427fd3 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/stable/2017-12-01/mysql.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/stable/2017-12-01/mysql.json @@ -1366,15 +1366,15 @@ "type": "string", "description": "The replication role of the server." }, - "primaryServerId": { + "masterServerId": { "type": "string", - "description": "The primary server id of a relica server." + "description": "The master server id of a relica server." }, "replicaCapacity": { "type": "integer", "format": "int32", "minimum": 0, - "description": "The maximum number of replicas that a primary server can have." + "description": "The maximum number of replicas that a master server can have." } }, "description": "The properties of a server." @@ -1516,7 +1516,7 @@ "properties": { "sourceServerId": { "type": "string", - "description": "The primary server id to create replica from." + "description": "The master server id to create replica from." } }, "required": [