Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dev/ccelik/dedicatedhostswagger #6612

Merged
merged 23 commits into from
Jul 17, 2019
Merged

Dev/ccelik/dedicatedhostswagger #6612

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
5f3be89
Update compute.json
celikcigdem Jun 27, 2019
023aaf9
Added DedicatedHostGroup and DedicateHost operations
celikcigdem Jun 27, 2019
c8a2ec7
Fixed dedicated host and group examples
celikcigdem Jun 27, 2019
beed92f
Removed extra comma
celikcigdem Jun 27, 2019
1eecea9
Fixed model validation errors
celikcigdem Jun 27, 2019
ec9b8a5
Added more examples
celikcigdem Jun 27, 2019
5a61139
Modified examples
celikcigdem Jun 27, 2019
b46faa6
fixed PlatformFaultDomain type
celikcigdem Jun 27, 2019
12a9eee
parameter name fixes
celikcigdem Jun 27, 2019
2b0c742
Suppressed errors on DedicatedHostGroupUpdate and DedicatedHostUpdate
celikcigdem Jun 28, 2019
ce385fe
Update compute.json
celikcigdem Jul 12, 2019
08dac49
Update compute.json
celikcigdem Jul 12, 2019
27c16d8
Merge remote-tracking branch 'upstream/master' into dev/ccelik/dedica…
celikcigdem Jul 12, 2019
94b85bb
Merge from upstream/master
celikcigdem Jul 12, 2019
4e21b51
Update compute.json
celikcigdem Jul 12, 2019
e4a48bc
Update GetADedicatedHost.json
celikcigdem Jul 12, 2019
ff70ef5
remove .orig files
celikcigdem Jul 12, 2019
260de18
Delete compute.json.orig
celikcigdem Jul 12, 2019
007443c
Use min max
celikcigdem Jul 13, 2019
eb0d147
attempt to fix model validation
celikcigdem Jul 13, 2019
72a60ae
fix model validation
celikcigdem Jul 13, 2019
124f9aa
Removed availableVCpus
celikcigdem Jul 13, 2019
f6387a4
Update GetADedicatedHost.json
celikcigdem Jul 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 19 additions & 32 deletions specification/compute/resource-manager/Microsoft.Compute/stable/2019-03-01/compute.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -884,7 +884,7 @@
"schema": {
"$ref": "#/definitions/DedicatedHost"
},
"description": "Parameters supplied to the Create Dedicated Host ."
"description": "Parameters supplied to the Create Dedicated Host."
},
{
"$ref": "#/parameters/ApiVersionParameter"
Expand Down Expand Up @@ -5465,6 +5465,9 @@
"description": "A list of references to all dedicated hosts in the dedicated host group."
}
},
"required": [
"platformFaultDomainCount"
],
"description": "Dedicated Host Group Properties."
},
"DedicatedHostGroup": {
Expand All @@ -5478,15 +5481,15 @@
"items": {
"type": "string"
},
"description": "Availability Zone to use for this host group � only single zone is supported. The zone can be assigned only during creation. If not provided, the group supports all zones in the region. If provided, enforce each host in the group is in the same zone."
"description": "Availability Zone to use for this host group � only single zone is supported. The zone can be assigned only during creation. If not provided, the group supports all zones in the region. If provided, enforces each host in the group to be in the same zone."
}
},
"allOf": [
{
"$ref": "#/definitions/Resource"
}
],
"description": "Specifies information about the dedicated host group that the dedicated hosts should be assigned to. <br><br> Currently, a Dedicated host can only be added to Dedicated Host Group at creation time. An existing Dedicated Host cannot be added to a dedicated host group."
"description": "Specifies information about the dedicated host group that the dedicated hosts should be assigned to. <br><br> Currently, a dedicated host can only be added to a dedicated host group at creation time. An existing dedicated host cannot be added to another dedicated host group."
},
"DedicatedHostGroupUpdate": {
"properties": {
Expand All @@ -5499,7 +5502,7 @@
"items": {
"type": "string"
},
"description": "Availability Zone to use for this host group � only single zone is supported. The zone can be assigned only during creation. If not provided, the group supports all zones in the region. If provided, enforce each host in the group is in the same zone."
"description": "Availability Zone to use for this host group � only single zone is supported. The zone can be assigned only during creation. If not provided, the group supports all zones in the region. If provided, enforces each host in the group to be in the same zone."
}
},
"allOf": [
Expand Down Expand Up @@ -5541,21 +5544,6 @@
"modelAsString": false
}
},
"DedicatedHostCapacity": {
"properties": {
"totalCores": {
"type": "number",
"format": "double",
"description": "The total number of cores."
},
"totalVCpus": {
"type": "number",
"format": "double",
"description": "The total number of CPUs."
}
},
"description": "Dedicated host total capacity."
},
"DedicatedHostAllocatableVM": {
"properties": {
"vmSize": {
Expand All @@ -5575,7 +5563,7 @@
"availableVCpus": {
"type": "number",
"format": "double",
"description": "The total number of CPUs."
"description": "The number of virtual CPUs available for new allocations."
},
"allocatableVMs": {
"type": "array",
Expand All @@ -5592,11 +5580,7 @@
"assetId": {
"readOnly": true,
"type": "string",
"description": "Specifies the unique of the dedicated physical machine on which the dedicated host resides."
},
"capacity": {
celikcigdem marked this conversation as resolved.
Show resolved Hide resolved
"$ref": "#/definitions/DedicatedHostCapacity",
"description": "The total capacity of the dedicated host."
"description": "Specifies the unique id of the dedicated physical machine on which the dedicated host resides."
},
"availableCapacity": {
"$ref": "#/definitions/DedicatedHostAvailableCapacity",
Expand All @@ -5617,16 +5601,16 @@
"platformFaultDomain": {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this also required property as platformFaultDomainCount?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not always, only if the platformDomainCount is > 1.

"type": "integer",
"format": "int32",
"description": "Fault domain of the host within a group. Supported values 0,1,2."
"description": "Fault domain of the dedicated host within a dedicated host group. Supported values 0,1,2."
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could also use a min/max to describe the restriction

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the syntax for that?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Found this in the repo

azure-rest-api-specs/specification/analysisservices/resource-manager/Microsoft.AnalysisServices/stable/2017-08-01/analysisservices.json

Lines 962 to 968 in 73cd215

"capacity": {
"type": "integer",
"minimum": 1,
"maximum": 8,
"default": 1,
"description": "The number of instances in the read only query pool."
}

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Although adding that rather than just the description, may be a breaking change

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks! it is not breaking as service always rejected the requests with out of boundary values.

},
"autoReplaceOnFailure": {
"type": "boolean",
"description": "Whether the host should be replaced automatically in case of a failure. The value is defaulted to true when not provided."
"description": "Specifies whether the dedicated host should be replaced automatically in case of a failure. The value is defaulted to 'true' when not provided."
},
"hostId": {
"readOnly": true,
"type": "string",
"description": "A unique id generated and assigned to the dedicated host by the platform."
"description": "A unique id generated and assigned to the dedicated host by the platform. <br><br> Does not change throughout the lifetime of the host."
},
"virtualMachines": {
"type": "array",
Expand All @@ -5644,7 +5628,7 @@
"readOnly": true,
"type": "string",
"format": "date-time",
"description": "The date when the host was first created."
"description": "The date when the host was first provisioned."
},
"provisioningState": {
"readOnly": true,
Expand All @@ -5667,14 +5651,17 @@
},
"sku": {
"$ref": "#/definitions/Sku",
"description": "Sku of the dedicated host for Hardware Generation and VM family, The only name is required to be set. See DedicatedHostSkuTypes for possible set of values."
"description": "SKU of the dedicated host for Hardware Generation and VM family. Only name is required to be set. List Microsoft.Compute SKUs for a list of possible values."
}
},
"allOf": [
{
"$ref": "#/definitions/Resource"
}
],
"required": [
"sku"
],
"description": "Specifies information about the Dedicated host."
},
"DedicatedHostUpdate": {
Expand Down Expand Up @@ -5702,13 +5689,13 @@
},
"nextLink": {
"type": "string",
"description": "The URI to fetch the next page of Dedicated hosts. Call ListNext() with this URI to fetch the next page of Dedicated hosts."
"description": "The URI to fetch the next page of dedicated hosts. Call ListNext() with this URI to fetch the next page of dedicated hosts."
}
},
"required": [
"value"
],
"description": "The List Dedicated Host operation response."
"description": "The list dedicated host operation response."
},
"VirtualMachineSize": {
"properties": {
Expand Down
4 changes: 0 additions & 4 deletions ...pute/resource-manager/Microsoft.Compute/stable/2019-03-01/examples/GetADedicatedHost.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@
"provisioningState": "Succeeded",
"instanceView": {
"assetId": "eb3f58b8-b4e8-4882-b69f-301a01812407",
"capacity": {
"totalCores": 30,
"totalVCpus": 60
},
"availableCapacity": {
"availableVCpus": 40,
"allocatableVMs": [
Expand Down