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

Servicebus : NetworkruleSet #5361

Merged
merged 6 commits into from
Mar 21, 2019
Merged

Servicebus : NetworkruleSet #5361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ac29d95
Added NetwruleSet to 2017 version
Mar 11, 2019
dba02a7
Merge branch 'master' of https://github.com/Azure/azure-rest-api-spec…
Mar 11, 2019
dc6cc6f
fixed indentation and aded default value to single value enum
Mar 11, 2019
e828e75
fixed default for enum
Mar 11, 2019
530b1bf
updated the URI to networkRuleSets as per ARM guideline
Mar 13, 2019
ba179ab
updated with review comments resolve
Mar 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
103 changes: 103 additions & 0 deletions ...eBus/stable/2017-04-01/examples/NameSpaces/VirtualNetworkRule/SBNetworkRuleSetCreate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
{
"parameters": {
"namespaceName": "sdk-Namespace-6019",
"resourceGroupName": "ResourceGroup",
"api-version": "2017-04-01",
"subscriptionId": "Subscription",
"parameters": {
"properties": {
"defaultAction": "Deny",
"virtualNetworkRules": [
Copy link
Contributor

Choose a reason for hiding this comment

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

virtualNetworkRules [](start = 9, length = 19)

This is taking arrays.. PUT request MUST replace server-side representation of the resource.. should NOT merge.

Copy link
Contributor

Choose a reason for hiding this comment

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

you can consider PATCH support if support for partial updates (additions) are desired.

In reply to: 265808072 [](ancestors = 265808072)

Copy link
Member Author

Choose a reason for hiding this comment

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

yes, its replaces the resource. we are considering the PATCH support in future releases.

{
"subnet": {
"id": "/subscriptions/subscriptionid/resourcegroups/resourcegroupid/providers/Microsoft.Network/virtualNetworks/myvn/subnets/subnet2"
},
"ignoreMissingVnetServiceEndpoint": true
},
{
"subnet": {
"id": "/subscriptions/subscriptionid/resourcegroups/resourcegroupid/providers/Microsoft.Network/virtualNetworks/myvn/subnets/subnet3"
},
"ignoreMissingVnetServiceEndpoint": false
},
{
"subnet": {
"id": "/subscriptions/subscriptionid/resourcegroups/resourcegroupid/providers/Microsoft.Network/virtualNetworks/myvn/subnets/subnet6"
},
"ignoreMissingVnetServiceEndpoint": false
}
],
"ipRules": [
{
"ipMask": "1.1.1.1",
"action": "Allow"
},
{
"ipMask": "1.1.1.2",
"action": "Allow"
},
{
"ipMask": "1.1.1.3",
"action": "Allow"
},
{
"ipMask": "1.1.1.4",
"action": "Allow"
},
{
"ipMask": "1.1.1.5",
"action": "Allow"
}
]
}
}
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/854d368f-1828-428f-8f3c-f2affa9b2f7d/resourceGroups/resourcegroupid/providers/Microsoft.ServiceBus/namespaces/sdk-Namespace-9659/networkrulesets/default",
"name": "default",
"type": "Microsoft.ServiceBus/Namespaces/NetworkRuleSet",
"properties": {
"defaultAction": "Deny",
"virtualNetworkRules": [
{
"subnet": { "id": "/subscriptions/subscriptionid/resourcegroups/resourcegroupid/providers/Microsoft.Network/virtualNetworks/myvn/subnets/subnet2" },
"ignoreMissingVnetServiceEndpoint": true
},
{
"subnet": { "id": "/subscriptions/subscriptionid/resourcegroups/resourcegroupid/providers/Microsoft.Network/virtualNetworks/myvn/subnets/subnet3" },
"ignoreMissingVnetServiceEndpoint": false
},
{
"subnet": { "id": "/subscriptions/subscriptionid/resourcegroups/resourcegroupid/providers/Microsoft.Network/virtualNetworks/myvn/subnets/subnet6" },
"ignoreMissingVnetServiceEndpoint": false
}
],
"ipRules": [
{
"ipMask": "1.1.1.1",
"action": "Allow"
},
{
"ipMask": "1.1.1.2",
"action": "Allow"
},
{
"ipMask": "1.1.1.3",
"action": "Allow"
},
{
"ipMask": "1.1.1.4",
"action": "Allow"
},
{
"ipMask": "1.1.1.5",
"action": "Allow"
}
]
}
}
}
}
}
56 changes: 56 additions & 0 deletions ...viceBus/stable/2017-04-01/examples/NameSpaces/VirtualNetworkRule/SBNetworkRuleSetGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"parameters": {
"namespaceName": "sdk-Namespace-6019",
"resourceGroupName": "ResourceGroup",
"api-version": "2017-04-01",
"subscriptionId": "Subscription"
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/subscriptionid/resourceGroups/resourcegroupid/providers/Microsoft.ServiceBus/namespaces/sdk-Namespace-9659/networkrulesets/default",
"name": "default",
"type": "Microsoft.ServiceBus/Namespaces/NetworkRuleSet",
"properties": {
"defaultAction": "Deny",
"virtualNetworkRules": [
{
"subnet": { "id": "/subscriptions/subscriptionid/resourcegroups/resourcegroupid/providers/Microsoft.Network/virtualNetworks/myvn/subnets/subnet2" },
"ignoreMissingVnetServiceEndpoint": true
},
{
"subnet": { "id": "/subscriptions/subscriptionid/resourcegroups/resourcegroupid/providers/Microsoft.Network/virtualNetworks/myvn/subnets/subnet3" },
"ignoreMissingVnetServiceEndpoint": false
},
{
"subnet": { "id": "/subscriptions/subscriptionid/resourcegroups/resourcegroupid/providers/Microsoft.Network/virtualNetworks/myvn/subnets/subnet6" },
"ignoreMissingVnetServiceEndpoint": false
}
],
"ipRules": [
{
"ipMask": "1.1.1.1",
"action": "Allow"
},
{
"ipMask": "1.1.1.2",
"action": "Allow"
},
{
"ipMask": "1.1.1.3",
"action": "Allow"
},
{
"ipMask": "1.1.1.4",
"action": "Allow"
},
{
"ipMask": "1.1.1.5",
"action": "Allow"
}
]
}
}
}
}
}
183 changes: 182 additions & 1 deletion ...cation/servicebus/resource-manager/Microsoft.ServiceBus/stable/2017-04-01/servicebus.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2983,7 +2983,7 @@
}
},
"default": {
"description": "Eventhub error response describing why the operation failed.",
"description": "ServiceBus error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ErrorResponse"
}
Expand All @@ -2993,6 +2993,97 @@
"nextLinkName": "nextLink"
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceBus/namespaces/{namespaceName}/networkRuleSets/default": {
"put": {
"tags": [
"Namespaces"
],
"x-ms-examples": {
"NameSpaceNetworkRuleSetCreate": {
"$ref": "./examples/NameSpaces/VirtualNetworkRule/SBNetworkRuleSetCreate.json"
}
},
"operationId": "Namespaces_CreateOrUpdateNetworkRuleSet",
"description": "Create or update NetworkRuleSet for a Namespace.",
"parameters": [
{
"$ref": "#/parameters/ResourceGroupNameParameter"
},
{
"$ref": "#/parameters/NamespaceNameParameter"
},
{
"$ref": "#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
},
{
"name": "parameters",
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/NetworkRuleSet"
},
"description": "The Namespace IpFilterRule."
}
],
"responses": {
"200": {
Copy link
Contributor

Choose a reason for hiding this comment

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

200 [](start = 11, length = 3)

Does this complete synchronously ? just double checking.

Copy link
Member Author

Choose a reason for hiding this comment

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

yes.

"description": "Namespace NetworkRuleSet successfully returned.",
"schema": {
"$ref": "#/definitions/NetworkRuleSet"
}
},
"default": {
"description": "ServiceBus error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ErrorResponse"
}
}
}
},
"get": {
"tags": [
"Namespaces"
],
"x-ms-examples": {
"NameSpaceNetworkRuleSetGet": {
"$ref": "./examples/NameSpaces/VirtualNetworkRule/SBNetworkRuleSetGet.json"
}
},
"operationId": "Namespaces_GetNetworkRuleSet",
"description": "Gets NetworkRuleSet for a Namespace.",
"parameters": [
{
"$ref": "#/parameters/ResourceGroupNameParameter"
},
{
"$ref": "#/parameters/NamespaceNameParameter"
},
{
"$ref": "#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
}
],
"responses": {
"200": {
"description": "Namespace NetworkRuleSet successfully returned.",
"schema": {
"$ref": "#/definitions/NetworkRuleSet"
}
},
"default": {
"description": "ServiceBus error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ErrorResponse"
}
}
}
}
}
},
"definitions": {
Expand Down Expand Up @@ -4408,6 +4499,96 @@
}
},
"description": "The result of the List migrationConfigurations operation."
},
"Subnet": {
Copy link
Contributor

@sanjaiganesh sanjaiganesh Mar 14, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

" [](start = 4, length = 1)

"required" properties not specified for the new types #Resolved

Copy link
Member Author

@v-Ajnava v-Ajnava Mar 15, 2019 •
edited by sanjaiganesh
Loading

Choose a reason for hiding this comment

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

added required property #Resolved

"properties": {
"id": {
"type": "string",
"description": "Resource ID of Virtual Network Subnet"
}
},
"required": [
"id"
],
"description": "Properties supplied for Subnet"
},
"NWRuleSetIpRules": {
"x-ms-client-flatten": true,
"properties": {
"ipMask": {
"type": "string",
"description": "IP Mask"
},
"action": {
"type": "string",
"description": "The IP Filter Action",
"enum": [
"Allow"
],
"x-ms-enum": {
"name": "NetworkRuleIPAction",
"modelAsString": true
},
"default": "Allow"
}
},
"description": "Description of NetWorkRuleSet - IpRules resource."
},
"NWRuleSetVirtualNetworkRules": {
"x-ms-client-flatten": true,
"properties": {
"subnet": {
"$ref": "#/definitions/Subnet",
"description": "Subnet properties"
},
"ignoreMissingVnetServiceEndpoint": {
"type": "boolean",
"description": "Value that indicates whether to ignore missing VNet Service Endpoint"
}
},
"description": "Description of VirtualNetworkRules - NetworkRules resource."
},
"NetworkRuleSet": {
"properties": {
"properties": {
"description": "NetworkRuleSet properties",
"x-ms-client-flatten": true,
"properties": {
"defaultAction": {
"type": "string",
"description": "Default Action for Network Rule Set",
"enum": [
"Allow",
"Deny"
],
"x-ms-enum": {
"name": "DefaultAction",
"modelAsString": true
}
},
"virtualNetworkRules": {
"type": "array",
"items": {
"$ref": "#/definitions/NWRuleSetVirtualNetworkRules"
},
"description": "List VirtualNetwork Rules"
},
"ipRules": {
"type": "array",
"items": {
"$ref": "#/definitions/NWRuleSetIpRules"
},
"description": "List of IpRules"
}
}
}
},
"allOf": [
{
"$ref": "#/definitions/Resource"
Copy link
Contributor

@sanjaiganesh sanjaiganesh Mar 14, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

Resource [](start = 33, length = 8)

Is this a proxy or tracked resource ? #Resolved

Copy link
Member Author

@v-Ajnava v-Ajnava Mar 15, 2019 •
edited by sanjaiganesh
Loading

Choose a reason for hiding this comment

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

its a proxy resource. #Resolved

}
],
"description": "Description of NetworkRuleSet resource."
}
},
"parameters": {
Expand Down