Skip to content

Commit

Permalink
DomainServices: Add missing properties, add examples, and fix linting…
Browse files Browse the repository at this point in the history 
… errors (Azure#4055)

* DomainServices: Add missing properties and fix errors

* Fix CR feedback

* DomainService: Add paging description
  • Loading branch information
@jihochang @sarangan12
jihochang authored and sarangan12 committed Oct 5, 2018
1 parent 0ddb6e2 commit fe93058
Show file tree
Hide file tree
Showing 14 changed files with 917 additions and 18 deletions.
228 changes: 225 additions & 3 deletions ...ation/domainservices/resource-manager/Microsoft.AAD/stable/2017-01-01/domainservices.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@
"Get Operations": {
"$ref": "./examples/GetOperations.json"
}
},
"x-ms-pageable": {
"nextLinkName": "nextLink"
}
}
},
Expand Down Expand Up @@ -83,7 +86,9 @@
"$ref": "./examples/ListDomainServicesBySubscription.json"
}
},
"x-ms-pageable": {}
"x-ms-pageable": {
"nextLinkName": "nextLink"
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.AAD/domainServices": {
Expand Down Expand Up @@ -118,7 +123,9 @@
"$ref": "./examples/ListDomainServicesByResourceGroup.json"
}
},
"x-ms-pageable": {}
"x-ms-pageable": {
"nextLinkName": "nextLink"
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.AAD/domainServices/{domainServiceName}": {
Expand Down Expand Up @@ -343,7 +350,8 @@
},
"location": {
"type": "string",
"description": "Resource location"
"description": "Resource location",
"x-ms-mutability":["read", "create"]
},
"tags": {
"type": "object",
Expand Down Expand Up @@ -385,6 +393,11 @@
"$ref": "#/definitions/DomainService"
},
"description": "the list of domain services."
},
"nextLink": {
"type": "string",
"description": "The continuation token for the next page of results.",
"readOnly": true
}
},
"description": "The response from the List Domain Services operation."
Expand Down Expand Up @@ -414,6 +427,50 @@
"$ref": "#/definitions/LdapsSettings",
"description": "Secure LDAP Settings"
},
"healthLastEvaluated": {
"readOnly": true,
"type": "string",
"format": "date-time",
"description": "Last domain evaluation run DateTime"
},
"healthMonitors": {
"readOnly": true,
"type": "array",
"items": {
"$ref": "#/definitions/HealthMonitor",
"description": "Domain Health Monitors"
},
"description": "List of Domain Health Monitors"
},
"healthAlerts": {
"readOnly": true,
"type": "array",
"items": {
"$ref": "#/definitions/HealthAlert",
"description": "Domain Health Alerts"
},
"description": "List of Domain Health Alerts"
},
"notificationSettings": {
"$ref": "#/definitions/NotificationSettings",
"description": "Notification Settings"
},
"domainSecuritySettings": {
"$ref": "#/definitions/DomainSecuritySettings",
"description": "DomainSecurity Settings"
},
"filteredSync": {
"type": "string",
"enum": [
"Enabled",
"Disabled"
],
"description": "Enabled or Disabled flag to turn on Group-based filtered sync",
"x-ms-enum": {
"name": "filteredSync",
"modelAsString": true
}
},
"domainControllerIpAddress": {
"readOnly": true,
"type": "array",
Expand Down Expand Up @@ -441,6 +498,26 @@
"ldapsSettings": {
"$ref": "#/definitions/LdapsSettings",
"description": "Secure LDAP Settings"
},
"notificationSettings": {
"$ref": "#/definitions/NotificationSettings",
"description": "Notification Settings"
},
"domainSecuritySettings": {
"$ref": "#/definitions/DomainSecuritySettings",
"description": "DomainSecurity Settings"
},
"filteredSync": {
"type": "string",
"enum": [
"Enabled",
"Disabled"
],
"description": "Enabled or Disabled flag to turn on Group-based filtered sync",
"x-ms-enum": {
"name": "filteredSync",
"modelAsString": true
}
}
}
},
Expand Down Expand Up @@ -502,6 +579,146 @@
}
}
},
"HealthMonitor": {
"description": "Health Monitor Description",
"properties": {
"id": {
"readOnly": true,
"type": "string",
"description": "Health Monitor Id"
},
"name": {
"readOnly": true,
"type": "string",
"description": "Health Monitor Name"
},
"details": {
"readOnly": true,
"type": "string",
"description": "Health Monitor Details"
}
}
},
"HealthAlert": {
"description": "Health Alert Description",
"properties": {
"id": {
"readOnly": true,
"type": "string",
"description": "Health Alert Id"
},
"name": {
"readOnly": true,
"type": "string",
"description": "Health Alert Name"
},
"issue": {
"readOnly": true,
"type": "string",
"description": "Health Alert Issue"
},
"severity": {
"readOnly": true,
"type": "string",
"description": "Health Alert Severity"
},
"raised": {
"readOnly": true,
"type": "string",
"format": "date-time",
"description": "Health Alert Raised DateTime"
},
"lastDetected": {
"readOnly": true,
"type": "string",
"format": "date-time",
"description": "Health Alert Last Detected DateTime"
},
"resolutionUri": {
"readOnly": true,
"type": "string",
"description": "Health Alert TSG Link"
}
}
},
"NotificationSettings": {
"description": "Settings for notification",
"properties": {
"notifyGlobalAdmins": {
"type": "string",
"enum": [
"Enabled",
"Disabled"
],
"description": "Should global admins be notified",
"x-ms-enum": {
"name": "notifyGlobalAdmins",
"modelAsString": true
}
},
"notifyDcAdmins": {
"type": "string",
"enum": [
"Enabled",
"Disabled"
],
"description": "Should domain controller admins be notified",
"x-ms-enum": {
"name": "notifyDcAdmins",
"modelAsString": true
}
},
"additionalRecipients": {
"type": "array",
"items": {
"type": "string",
"description": "Email address for additional recipient"
},
"description": "The list of additional recipients"
}
}
},
"DomainSecuritySettings": {
"description": "Domain Security Settings",
"properties": {
"ntlmV1": {
"type": "string",
"enum": [
"Enabled",
"Disabled"
],
"description": "A flag to determine whether or not NtlmV1 is enabled or disabled.",
"x-ms-enum": {
"name": "NtlmV1",
"modelAsString": true
}
},
"tlsV1": {
"type": "string",
"enum": [
"Enabled",
"Disabled"
],
"description": "A flag to determine whether or not TlsV1 is enabled or disabled.",
"x-ms-enum": {
"name": "TlsV1",
"modelAsString": true
}
},
"syncNtlmPasswords": {
"type": "string",
"enum": [
"Enabled",
"Disabled"
],
"description": "A flag to determine whether or not SyncNtlmPasswords is enabled or disabled.",
"x-ms-enum": {
"name": "SyncNtlmPasswords",
"modelAsString": true
}
}
}
},
"OperationEntityListResult": {
"description": "The list of domain service operation response.",
"type": "object",
Expand All @@ -512,6 +729,11 @@
"items": {
"$ref": "#/definitions/OperationEntity"
}
},
"nextLink": {
"type": "string",
"description": "The continuation token for the next page of results.",
"readOnly": true
}
}
},
Expand Down
72 changes: 71 additions & 1 deletion ...rvices/resource-manager/Microsoft.AAD/stable/2017-01-01/examples/CreateDomainService.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,24 @@
"location": "westus",
"properties": {
"domainName": "zdomain.zforest.com",
"subnetId": "/subscriptions/1639790a-76a2-4ac4-98d9-8562f5dfcb4d/resourceGroups/Default-Networking/providers/Microsoft.ClassicNetwork/virtualNetworks/DCIaasTmpWusNet/subnets/Subnet-1"
"subnetId": "/subscriptions/1639790a-76a2-4ac4-98d9-8562f5dfcb4d/resourceGroups/Default-Networking/providers/Microsoft.ClassicNetwork/virtualNetworks/DCIaasTmpWusNet/subnets/Subnet-1",
"domainSecuritySettings": {
"ntlmV1": "Enabled",
"tlsV1": "Disabled",
"syncNtlmPasswords": "Enabled"
},
"notificationSettings": {
"notifyGlobalAdmins": "Enabled",
"notifyDcAdmins": "Enabled",
"additionalRecipients": [ "jicha@microsoft.com", "caalmont@microsoft.com" ]
},
"filteredSync": "Enabled",
"ldapsSettings": {
"ldaps": "Enabled",
"pfxCertificate": "MIIDPDCCAiSgAwIBAgIQQUI9P6tq2p9OFIJa7DLNvTANBgkqhkiG9w0BAQsFADAgMR4w...",
"pfxCertificatePassword": "Password01",
"externalAccess": "Enabled"
}
}
},
"responses": {
Expand All @@ -24,6 +41,25 @@
"domainName": "zdomain.zforest.com",
"vnetSiteId": "99083198-a39c-469f-972d-59017e7f078c",
"subnetId": "/subscriptions/1639790a-76a2-4ac4-98d9-8562f5dfcb4d/resourceGroups/Default-Networking/providers/Microsoft.ClassicNetwork/virtualNetworks/DCIaasTmpWusNet/subnets/Subnet-1",
"ldapsSettings": {
"ldaps": "Enabled",
"publicCertificate": "MIIDPDCCAiSgAwIBAgIQQUI9P6tq2p9OFIJa7DLNvTANBgkqhkiG9w0BAQsFADAgMR4w...",
"certificateThumbprint": "9154A390F0C387D679E0DD040701745CDFED67F3",
"certificateNotAfter": "2018-02-15T21:43:21Z",
"externalAccess": "Enabled",
"externalAccessIpAddress": "13.64.148.151"
},
"domainSecuritySettings": {
"ntlmV1": "Enabled",
"tlsV1": "Disabled",
"syncNtlmPasswords": "Enabled"
},
"notificationSettings": {
"notifyGlobalAdmins": "Enabled",
"notifyDcAdmins": "Enabled",
"additionalRecipients": [ "jicha@microsoft.com", "caalmont@microsoft.com" ]
},
"filteredSync": "Enabled",
"domainControllerIpAddress": [
"10.0.0.5",
"10.0.0.8"
Expand All @@ -46,6 +82,25 @@
"domainName": "zdomain.zforest.com",
"vnetSiteId": "99083198-a39c-469f-972d-59017e7f078c",
"subnetId": "/subscriptions/1639790a-76a2-4ac4-98d9-8562f5dfcb4d/resourceGroups/Default-Networking/providers/Microsoft.ClassicNetwork/virtualNetworks/DCIaasTmpWusNet/subnets/Subnet-1",
"ldapsSettings": {
"ldaps": "Enabled",
"publicCertificate": "MIIDPDCCAiSgAwIBAgIQQUI9P6tq2p9OFIJa7DLNvTANBgkqhkiG9w0BAQsFADAgMR4w...",
"certificateThumbprint": "9154A390F0C387D679E0DD040701745CDFED67F3",
"certificateNotAfter": "2018-02-15T21:43:21Z",
"externalAccess": "Enabled",
"externalAccessIpAddress": "13.64.148.151"
},
"domainSecuritySettings": {
"ntlmV1": "Enabled",
"tlsV1": "Disabled",
"syncNtlmPasswords": "Enabled"
},
"notificationSettings": {
"notifyGlobalAdmins": "Enabled",
"notifyDcAdmins": "Enabled",
"additionalRecipients": [ "jicha@microsoft.com", "caalmont@microsoft.com" ]
},
"filteredSync": "Enabled",
"domainControllerIpAddress": [
"10.0.0.5",
"10.0.0.8"
Expand All @@ -66,6 +121,21 @@
"properties": {
"domainName": "zdomain.zforest.com",
"subnetId": "/subscriptions/1639790a-76a2-4ac4-98d9-8562f5dfcb4d/resourceGroups/Default-Networking/providers/Microsoft.ClassicNetwork/virtualNetworks/DCIaasTmpWusNet/subnets/Subnet-1",
"ldapsSettings": {
"ldaps": "Enabled",
"externalAccess": "Enabled"
},
"domainSecuritySettings": {
"ntlmV1": "Enabled",
"tlsV1": "Disabled",
"syncNtlmPasswords": "Enabled"
},
"notificationSettings": {
"notifyGlobalAdmins": "Enabled",
"notifyDcAdmins": "Enabled",
"additionalRecipients": [ "jicha@microsoft.com", "caalmont@microsoft.com" ]
},
"filteredSync": "Enabled",
"provisioningState": "Accepted"
}
}
Expand Down
Loading

0 comments on commit fe93058

Please sign in to comment.