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

Merging the ManagedNetworkFabric changes in RPSaaSMaster into main #24254

Merged
merged 6 commits into from
Jun 9, 2023
Merged

Merging the ManagedNetworkFabric changes in RPSaaSMaster into main #24254

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
d3c11ba
Merging the RPSaaSMaster PRs into main
Mohana-Krishna-Nali Jun 1, 2023
203d3e0
updating swagger-to-sdk in readme.md
Mohana-Krishna-Nali Jun 1, 2023
78040eb
Minor changes - to resolve the dotnet and python sdk issues
Mohana-Krishna-Nali Jun 5, 2023
e1f4906
minor change to resolve the dotnet sdk issue
Mohana-Krishna-Nali Jun 5, 2023
e362567
solved sdk issue having incompatible type for optionB description.
Mohana-Krishna-Nali Jun 5, 2023
eba3bef
Resolving the Duplicated model name with non-identical definitions is…
Mohana-Krishna-Nali Jun 6, 2023
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
479 changes: 479 additions & 0 deletions ...urce-manager/Microsoft.ManagedNetworkFabric/preview/2023-02-01-preview/IpCommunities.json
View file
Open in desktop

Large diffs are not rendered by default.

650 changes: 0 additions & 650 deletions ...e-manager/Microsoft.ManagedNetworkFabric/preview/2023-02-01-preview/IpCommunityLists.json
View file
Open in desktop

This file was deleted.

260 changes: 125 additions & 135 deletions ...iew/2023-02-01-preview/IpPrefixLists.json → ...-02-01-preview/IpExtendedCommunities.json
View file
Open in desktop

Large diffs are not rendered by default.

499 changes: 499 additions & 0 deletions ...esource-manager/Microsoft.ManagedNetworkFabric/preview/2023-02-01-preview/IpPrefixes.json
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions ...manager/Microsoft.ManagedNetworkFabric/preview/2023-02-01-preview/L3IsolationDomains.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2327,7 +2327,7 @@
},
"optionAProperties": {
"description": "option A properties object",
"$ref": "#/definitions/OptionAProperties"
"$ref": "#/definitions/Layer3OptionAProperties"
},
"importRoutePolicyId": {
"type": "string",
Expand Down Expand Up @@ -2656,7 +2656,7 @@
"properties": {},
"allOf": [
{
"$ref": "#/definitions/OptionAProperties"
"$ref": "#/definitions/Layer3OptionAProperties"
}
],
"required": [
Expand Down Expand Up @@ -2750,23 +2750,23 @@
"properties": {
"primaryIpv4Prefix": {
"type": "string",
"description": "IPv4 Address Prefix of CE-PE interconnect links. Default value is 172.23.1.0/31. The values can be specified at the time of creation or can be updated afterwards. Any update to the values post-provisioning may disrupt traffic. The 1st and 3rd IPs are to be configured on CE1 and CE2 for Option B interfaces. The 2nd and 4th IPs are to be configured on PE1 and PE2 for Option B interfaces."
"description": "IPv4 Address Prefix of CE-PE interconnect links. Example: 172.31.0.0/31. The values can be specified at the time of creation or can be updated afterwards. Any update to the values post-provisioning may disrupt traffic. The 1st and 3rd IPs are to be configured on CE1 and CE2 for Option B interfaces. The 2nd and 4th IPs are to be configured on PE1 and PE2 for Option B interfaces."
},
"primaryIpv6Prefix": {
"type": "string",
"description": "IPv6 Address Prefix of CE-PE interconnect links. Default value is 3FFE:FFFF:0:CD30::a1/126. The values can be specified at the time of creation or can be updated afterwards. Any update to the values post-provisioning may disrupt traffic. The 1st and 3rd IPs are to be configured on CE1 and CE2 for Option B interfaces. The 2nd and 4th IPs are to be configured on PE1 and PE2 for Option B interfaces."
"description": "IPv6 Address Prefix of CE-PE interconnect links. Example: 3FFE:FFFF:0:CD30::a0/126. The values can be specified at the time of creation or can be updated afterwards. Any update to the values post-provisioning may disrupt traffic. The 1st and 3rd IPs are to be configured on CE1 and CE2 for Option B interfaces. The 2nd and 4th IPs are to be configured on PE1 and PE2 for Option B interfaces."
},
"secondaryIpv4Prefix": {
"type": "string",
"description": "Secondary IPv4 Address Prefix of CE-PE interconnect links. Default value is 172.23.1.2/31. The values can be specified at the time of creation or can be updated afterwards. Any update to the values post-provisioning may disrupt traffic. The 1st and 3rd IPs are to be configured on CE1 and CE2 for Option B interfaces. The 2nd and 4th IPs are to be configured on PE1 and PE2 for Option B interfaces."
"description": "Secondary IPv4 Address Prefix of CE-PE interconnect links. Example: 172.31.0.20/31. The values can be specified at the time of creation or can be updated afterwards. Any update to the values post-provisioning may disrupt traffic. The 1st and 3rd IPs are to be configured on CE1 and CE2 for Option B interfaces. The 2nd and 4th IPs are to be configured on PE1 and PE2 for Option B interfaces."
},
"secondaryIpv6Prefix": {
"type": "string",
"description": "Secondary IPv6 Address Prefix of CE-PE interconnect links. Default value is 3FFE:FFFF:0:CD30::a1/126. The values can be specified at the time of creation or can be updated afterwards. Any update to the values post-provisioning may disrupt traffic. The 1st and 3rd IPs are to be configured on CE1 and CE2 for Option B interfaces. The 2nd and 4th IPs are to be configured on PE1 and PE2 for Option B interfaces."
"description": "Secondary IPv6 Address Prefix of CE-PE interconnect links. Example: 3FFE:FFFF:0:CD30::a4/126. The values can be specified at the time of creation or can be updated afterwards. Any update to the values post-provisioning may disrupt traffic. The 1st and 3rd IPs are to be configured on CE1 and CE2 for Option B interfaces. The 2nd and 4th IPs are to be configured on PE1 and PE2 for Option B interfaces."
}
}
},
"OptionAProperties": {
"Layer3OptionAProperties": {
"type": "object",
"description": "Peering optionA properties",
"properties": {
Expand Down
41 changes: 24 additions & 17 deletions ...rce-manager/Microsoft.ManagedNetworkFabric/preview/2023-02-01-preview/NetworkFabrics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -836,17 +836,15 @@
},
"ipv4Prefix": {
"type": "string",
"description": "IPv4Prefix for Management Network. Default value : 10.1.0.0/19.",
"description": "IPv4Prefix for Management Network. Example: 10.1.0.0/19.",
"x-ms-mutability": [
"create",
"read"
],
"default": "10.1.0.0/19"
]
},
"ipv6Prefix": {
"type": "string",
"description": "IPv6Prefix for Management Network. Default value 3FFE:FFFF:0:CD40::/59.",
"default": "3FFE:FFFF:0:CD40::/59",
"description": "IPv6Prefix for Management Network. Example: 3FFE:FFFF:0:CD40::/59.",
"x-ms-mutability": [
"create",
"read"
Expand Down Expand Up @@ -931,7 +929,7 @@
}
},
"required": [
"optionBProperties"
"peeringOption"
]
},
"workloadVpnConfiguration": {
Expand Down Expand Up @@ -960,7 +958,7 @@
}
},
"required": [
"optionBProperties"
"peeringOption"
]
}
}
Expand Down Expand Up @@ -1098,6 +1096,19 @@
"type": "object",
"description": "Configuration used to setup CE-PE connectivity.",
"properties": {
"nniType": {
"type": "string",
"description": "Type of NNI used. Example: CE | NPB",
"default": "CE",
"enum": [
"CE",
"NPB"
],
"x-ms-enum": {
"modelAsString": true,
"name": "nniType"
}
},
"administrativeState": {
"description": "Gets the administrativeState of the resource. Example -Enabled/Disabled",
"$ref": "./common.json#/definitions/EnabledDisabledState"
Expand Down Expand Up @@ -1169,7 +1180,7 @@
"format": "int32",
"minimum": 501,
"maximum": 4095,
"description": "Vlan Id.Example : 501"
"description": "Vlan identifier. Example : 501"
},
"peerASN": {
"type": "integer",
Expand Down Expand Up @@ -1205,7 +1216,7 @@
},
"OptionBProperties": {
"type": "object",
"description": "Option B configuration to be used for management vpn.",
"description": "Option B configuration.",
"properties": {
"importRouteTargets": {
"type": "array",
Expand Down Expand Up @@ -1307,23 +1318,19 @@
"properties": {
"primaryIpv4Prefix": {
"type": "string",
"description": "IPv4 Address Prefix of CE-PE interconnect links. Default value is 172.31.0.0/31. The values can be specified at the time of creation or can be updated afterwards. Any update to the values post-provisioning may disrupt traffic. The 1st and 3rd IPs are to be configured on CE1 and CE2 for Option B interfaces. The 2nd and 4th IPs are to be configured on PE1 and PE2 for Option B interfaces.",
"default": "172.31.0.0/31"
"description": "IPv4 Address Prefix of CE-PE interconnect links. Example: 172.31.0.0/31. The values can be specified at the time of creation or can be updated afterwards. Any update to the values post-provisioning may disrupt traffic. The 1st and 3rd IPs are to be configured on CE1 and CE2 for Option B interfaces. The 2nd and 4th IPs are to be configured on PE1 and PE2 for Option B interfaces."
},
"primaryIpv6Prefix": {
"type": "string",
"description": "IPv6 Address Prefix of CE-PE interconnect links. Default value is 3FFE:FFFF:0:CD30::a0/126. The values can be specified at the time of creation or can be updated afterwards. Any update to the values post-provisioning may disrupt traffic. The 1st and 3rd IPs are to be configured on CE1 and CE2 for Option B interfaces. The 2nd and 4th IPs are to be configured on PE1 and PE2 for Option B interfaces.",
"default": "3FFE:FFFF:0:CD30::a0/126"
"description": "IPv6 Address Prefix of CE-PE interconnect links. Example: 3FFE:FFFF:0:CD30::a0/126. The values can be specified at the time of creation or can be updated afterwards. Any update to the values post-provisioning may disrupt traffic. The 1st and 3rd IPs are to be configured on CE1 and CE2 for Option B interfaces. The 2nd and 4th IPs are to be configured on PE1 and PE2 for Option B interfaces."
},
"secondaryIpv4Prefix": {
"type": "string",
"description": "Secondary IPv4 Address Prefix of CE-PE interconnect links. Default value is 172.31.0.20/31. The values can be specified at the time of creation or can be updated afterwards. Any update to the values post-provisioning may disrupt traffic. The 1st and 3rd IPs are to be configured on CE1 and CE2 for Option B interfaces. The 2nd and 4th IPs are to be configured on PE1 and PE2 for Option B interfaces.",
"default": "172.31.0.20/31"
"description": "Secondary IPv4 Address Prefix of CE-PE interconnect links. Example: 172.31.0.20/31. The values can be specified at the time of creation or can be updated afterwards. Any update to the values post-provisioning may disrupt traffic. The 1st and 3rd IPs are to be configured on CE1 and CE2 for Option B interfaces. The 2nd and 4th IPs are to be configured on PE1 and PE2 for Option B interfaces."
},
"secondaryIpv6Prefix": {
"type": "string",
"description": "Secondary IPv6 Address Prefix of CE-PE interconnect links. Default value is 3FFE:FFFF:0:CD30::a4/126. The values can be specified at the time of creation or can be updated afterwards. Any update to the values post-provisioning may disrupt traffic. The 1st and 3rd IPs are to be configured on CE1 and CE2 for Option B interfaces. The 2nd and 4th IPs are to be configured on PE1 and PE2 for Option B interfaces.",
"default": "3FFE:FFFF:0:CD30::a4/126"
"description": "Secondary IPv6 Address Prefix of CE-PE interconnect links. Example: 3FFE:FFFF:0:CD30::a4/126. The values can be specified at the time of creation or can be updated afterwards. Any update to the values post-provisioning may disrupt traffic. The 1st and 3rd IPs are to be configured on CE1 and CE2 for Option B interfaces. The 2nd and 4th IPs are to be configured on PE1 and PE2 for Option B interfaces."
}
}
}
Expand Down
Loading