Skip to content

Commit

Permalink
Swagger changes (#3857)
Browse files Browse the repository at this point in the history
* Relocated readOnly property

* Readded provisioning state to interfaceEndpoint.json

* Updated networkInterface.json

* Updated serviceEndpointPolicy.json

* Update virtualNetworkTap.json

* Fix semantic issue

* Multiple changes

* More example fixes

* Dummy commit

* Fixed duplicate
  • Loading branch information
wdehrich authored and dsgouda committed Sep 11, 2018
1 parent 40cca9d commit da22208
Show file tree
Hide file tree
Showing 20 changed files with 117 additions and 39 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
"id" : "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/interfaceEndpoints/testIe",
"location" : "eastus",
"properties" : {
"provisioningState" : "Succeeded",
"fqdn": "uniqueIdentifier.fqdn.windows.net",
"provisioningState": "Succeded",
"owner": "User",
"endpointService": {
"id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Provider/resourceType/resourceName"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"api-version": "2018-08-01",
"subscriptionId" : "subId",
"resourceGroupName": "rg1",
"networkInterfaceName": "testIe"
"interfaceEndpointName": "testIe"
},
"responses" : {
"200" : { },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"api-version": "2018-08-01",
"subscriptionId" : "subId",
"resourceGroupName" : "rg1",
"virtualNetworkName" : "testIe"
"interfaceEndpointName" : "testIe"
},
"responses" : {
"200" : {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
"properties": {
"virtualNetworkTap": {
"id": "/subscriptions/subid/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworkTaps/testvtap"
}
},
"provisioningState": "Succeded"
}
}
},
Expand All @@ -36,7 +37,8 @@
"properties": {
"virtualNetworkTap": {
"id": "/subscriptions/subid/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworkTaps/testvtap"
}
},
"provisioningState": "Succeded"
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
"properties": {
"virtualNetworkTap": {
"id": "/subscriptions/subid/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworkTaps/testvtap"
}
},
"provisioningState": "Succeded"
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
"properties": {
"virtualNetworkTap": {
"id": "/subscriptions/subid/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworkTaps/testvtap"
}
},
"provisioningState": "Succeded"
}
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@
"location": "westus",
"properties":
{
"serviceEndpointPolicyDefinitions": [ ]
"serviceEndpointPolicyDefinitions": [ ],
"subnets": [ ],
"provisioningState": "Succeeded",
"resourceGuid": "6A7C139D-8B8D-499B-B7CB-4F3F02A8A44F"
}
}
},
Expand All @@ -27,7 +30,10 @@
"location": "westus",
"properties":
{
"serviceEndpointPolicyDefinitions": []
"serviceEndpointPolicyDefinitions": [],
"subnets": [ ],
"provisioningState": "Succeeded",
"resourceGuid": "6A7C139D-8B8D-499B-B7CB-4F3F02A8A44F"
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,10 @@
]
}
}
]
],
"subnets": [ ],
"provisioningState": "Succeeded",
"resourceGuid": "6A7C139D-8B8D-499B-B7CB-4F3F02A8A44F"
}
}
},
Expand All @@ -70,7 +73,10 @@
]
}
}
]
],
"subnets": [ ],
"provisioningState": "Succeeded",
"resourceGuid": "6A7C139D-8B8D-499B-B7CB-4F3F02A8A44F"
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@
]
}
}
]
],
"subnets": [ ],
"provisioningState": "Succeeded",
"resourceGuid": "6A7C139D-8B8D-499B-B7CB-4F3F02A8A44F"
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@
]
}
}
]
],
"subnets": [ ],
"provisioningState": "Succeeded",
"resourceGuid": "6A7C139D-8B8D-499B-B7CB-4F3F02A8A44F"
}
},
{
Expand All @@ -49,7 +52,10 @@
]
}
}
]
],
"subnets": [ ],
"provisioningState": "Succeeded",
"resourceGuid": "6A7C139D-8B8D-499B-B7CB-4F3F02A8A44F"
}
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@
]
}
}
]
],
"subnets": [ ],
"provisioningState": "Succeeded",
"resourceGuid": "6A7C139D-8B8D-499B-B7CB-4F3F02A8A44F"
}
},
{
Expand All @@ -50,7 +53,10 @@
]
}
}
]
],
"subnets": [ ],
"provisioningState": "Succeeded",
"resourceGuid": "6A7C139D-8B8D-499B-B7CB-4F3F02A8A44F"
}
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkInterfaces/testNetworkInterface/ipConfigurations/testIPConfig1"
},
"destinationPort": 4789,
"provisioningState": "Succeded",
"resourceGuid": "6A7C139D-8B8D-499B-B7CB-4F3F02A8A44F",
"networkInterfaceTapConfigurations": [
{
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkInterfaces/testNetworkInterface2/tapConfigurations/testtapConfiguration"
Expand All @@ -46,6 +48,8 @@
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkInterfaces/testNetworkInterface/ipConfigurations/testIPConfig1"
},
"destinationPort": 4789,
"provisioningState": "Succeded",
"resourceGuid": "6A7C139D-8B8D-499B-B7CB-4F3F02A8A44F",
"networkInterfaceTapConfigurations": [
{
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkInterfaces/testNetworkInterface2/tapConfigurations/testtapConfiguration"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkInterfaces/testNetworkInterface/ipConfigurations/testIPConfig1"
},
"destinationPort": 4789,
"provisioningState": "Succeded",
"resourceGuid": "6A7C139D-8B8D-499B-B7CB-4F3F02A8A44F",
"networkInterfaceTapConfigurations": [
{
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkInterfaces/testNetworkInterface2/tapConfigurations/testtapConfiguration"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkInterfaces/testNetworkInterface/ipConfigurations/testIPConfig1"
},
"destinationPort": 4789,
"provisioningState": "Succeded",
"resourceGuid": "6A7C139D-8B8D-499B-B7CB-4F3F02A8A44F",
"networkInterfaceTapConfigurations": [
{
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkInterfaces/testNetworkInterface2/tapConfigurations/testtapConfiguration"
Expand All @@ -37,6 +39,8 @@
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkInterfaces/testNetworkInterface/ipConfigurations/testIPConfig1"
},
"destinationPort": 4789,
"provisioningState": "Succeded",
"resourceGuid": "6A7C139D-8B8D-499B-B7CB-4F3F02A8A44F",
"networkInterfaceTapConfigurations": [
{
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkInterfaces/testNetworkInterface3/tapConfigurations/testtapConfiguration"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkInterfaces/testNetworkInterface/ipConfigurations/testIPConfig1"
},
"destinationPort": 4789,
"provisioningState": "Succeded",
"resourceGuid": "6A7C139D-8B8D-499B-B7CB-4F3F02A8A44F",
"networkInterfaceTapConfigurations": [
{
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkInterfaces/testNetworkInterface2/tapConfigurations/testtapConfiguration"
Expand All @@ -36,6 +38,8 @@
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkInterfaces/testNetworkInterface/ipConfigurations/testIPConfig1"
},
"destinationPort": 4789,
"provisioningState": "Succeded",
"resourceGuid": "6A7C139D-8B8D-499B-B7CB-4F3F02A8A44F",
"networkInterfaceTapConfigurations": [
{
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkInterfaces/testNetworkInterface3/tapConfigurations/testtapConfiguration"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkInterfaces/testNetworkInterface/ipConfigurations/testIPConfig1"
},
"destinationPort": 4789,
"provisioningState": "Succeded",
"networkInterfaceTapConfigurations": [
{
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkInterfaces/testNetworkInterface2/tapConfigurations/testtapConfiguration"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,11 @@
"type": "string",
"readOnly": true,
"description": "A read-only property that identifies who created this interface endpoint."
},
"provisioningState": {
"readOnly": true,
"type": "string",
"description": "The provisioning state of the interface endpoint. Possible values are: 'Updating', 'Deleting', and 'Failed'."
}
},
"description": "Properties of the interface endpoint."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -779,8 +779,13 @@
"virtualNetworkTap": {
"$ref": "./virtualNetworkTap.json#/definitions/VirtualNetworkTap",
"description": "The reference of the Virtual Network Tap resource."
},
"provisioningState": {
"readOnly": true,
"type": "string",
"description": "The provisioning state of the network interface tap configuration. Possible values are: 'Updating', 'Deleting', and 'Failed'."
}
},
},
"description": "Properties of Virtual Network Tap configuration."
},
"NetworkInterfaceIPConfigurationPropertiesFormat": {
Expand Down Expand Up @@ -932,6 +937,7 @@
"description": "The reference of the NetworkSecurityGroup resource."
},
"interfaceEndpoint": {
"readOnly": true,
"$ref": "./interfaceEndpoint.json#/definitions/InterfaceEndpoint",
"description": "A reference to the interface endpoint to which the network interface is linked."
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,7 @@
"description": "A list of service resources."
},
"provisioningState": {
"readOnly" : true,
"type": "string",
"description": "The provisioning state of the service end point policy definition. Possible values are: 'Updating', 'Deleting', and 'Failed'."
}
Expand Down Expand Up @@ -584,12 +585,22 @@
},
"description": "A collection of service endpoint policy definitions of the service endpoint policy."
},
"subnets": {
"readOnly": true,
"type": "array",
"items": {
"$ref": "./virtualNetwork.json#/definitions/Subnet"
},
"description": "A collection of references to subnets."
},
"resourceGuid": {
"type": "string",
"readOnly": true,
"description": "The resource GUID property of the service endpoint policy resource."
},
"provisioningState": {
"type": "string",
"readOnly": true,
"description": "The provisioning state of the service endpoint policy. Possible values are: 'Updating', 'Deleting', and 'Failed'."
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -320,30 +320,40 @@
"description": "Virtual Network Tap resource"
},
"VirtualNetworkTapPropertiesFormat": {
"properties": {
"networkInterfaceTapConfigurations": {
"type": "array",
"items": {
"$ref": "./networkInterface.json#/definitions/NetworkInterfaceTapConfiguration",
"description": "The reference of the Network Interface."
},
"readOnly": true,
"description": "Specifies the list of resource IDs for the network interface IP configuration that needs to be tapped."
},
"destinationNetworkInterfaceIPConfiguration": {
"$ref": "./networkInterface.json#/definitions/NetworkInterfaceIPConfiguration",
"description": "The reference to the private IP Address of the collector nic that will receive the tap"
},
"destinationLoadBalancerFrontEndIPConfiguration": {
"$ref": "./loadBalancer.json#/definitions/FrontendIPConfiguration",
"description": "The reference to the private IP address on the internal Load Balancer that will receive the tap"
"description": "Virtual Network Tap properties.",
"properties": {
"networkInterfaceTapConfigurations": {
"readOnly": true,
"type": "array",
"items": {
"$ref": "./networkInterface.json#/definitions/NetworkInterfaceTapConfiguration",
"description": "The reference of the Network Interface."
},
"destinationPort": {
"type": "integer",
"description": "The VXLAN destination port that will receive the tapped traffic."
}
"description": "Specifies the list of resource IDs for the network interface IP configuration that needs to be tapped."
},
"resourceGuid": {
"type": "string",
"readOnly": true,
"description": "The resourceGuid property of the virtual network tap."
},
"provisioningState": {
"readOnly": true,
"type": "string",
"description": "The provisioning state of the virtual network tap. Possible values are: 'Updating', 'Deleting', and 'Failed'."
},
"description": "Virtual Network Tap properties."
"destinationNetworkInterfaceIPConfiguration": {
"$ref": "./networkInterface.json#/definitions/NetworkInterfaceIPConfiguration",
"description": "The reference to the private IP Address of the collector nic that will receive the tap"
},
"destinationLoadBalancerFrontEndIPConfiguration": {
"$ref": "./loadBalancer.json#/definitions/FrontendIPConfiguration",
"description": "The reference to the private IP address on the internal Load Balancer that will receive the tap"
},
"destinationPort": {
"type": "integer",
"description": "The VXLAN destination port that will receive the tapped traffic."
}
}
},
"VirtualNetworkTapListResult": {
"properties": {
Expand Down

0 comments on commit da22208

Please sign in to comment.