Skip to content

Commit cf7d994

Browse files
Mohana-Krishna-NaliMohana-Krishna-Nali
authored
Merging the ManagedNetworkFabric changes in RPSaaSMaster into main (#24254)
* Merging the RPSaaSMaster PRs into main 1. https://github.com/Azure/azure-rest-api-specs-pr/pull/11537 2. https://github.com/Azure/azure-rest-api-specs-pr/pull/11749 3. https://github.com/Azure/azure-rest-api-specs-pr/pull/12117 * updating swagger-to-sdk in readme.md * Minor changes - to resolve the dotnet and python sdk issues * minor change to resolve the dotnet sdk issue * solved sdk issue having incompatible type for optionB description. * Resolving the Duplicated model name with non-identical definitions issue.
1 parent 1cc9472 commit cf7d994

File tree

53 files changed

+2728
-1360
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+2728
-1360
lines changed

‎specification/managednetworkfabric/resource-manager/Microsoft.ManagedNetworkFabric/preview/2023-02-01-preview/IpCommunities.json

Lines changed: 479 additions & 0 deletions
Large diffs are not rendered by default.

‎specification/managednetworkfabric/resource-manager/Microsoft.ManagedNetworkFabric/preview/2023-02-01-preview/IpCommunityLists.json

Lines changed: 0 additions & 650 deletions
This file was deleted.

‎specification/managednetworkfabric/resource-manager/Microsoft.ManagedNetworkFabric/preview/2023-02-01-preview/IpPrefixLists.json renamed to ‎specification/managednetworkfabric/resource-manager/Microsoft.ManagedNetworkFabric/preview/2023-02-01-preview/IpExtendedCommunities.json

Lines changed: 125 additions & 135 deletions
Large diffs are not rendered by default.

‎specification/managednetworkfabric/resource-manager/Microsoft.ManagedNetworkFabric/preview/2023-02-01-preview/IpPrefixes.json

Lines changed: 499 additions & 0 deletions
Large diffs are not rendered by default.

‎specification/managednetworkfabric/resource-manager/Microsoft.ManagedNetworkFabric/preview/2023-02-01-preview/L3IsolationDomains.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2327,7 +2327,7 @@
23272327
},
23282328
"optionAProperties": {
23292329
"description": "option A properties object",
2330-
"$ref": "#/definitions/OptionAProperties"
2330+
"$ref": "#/definitions/Layer3OptionAProperties"
23312331
},
23322332
"importRoutePolicyId": {
23332333
"type": "string",
@@ -2656,7 +2656,7 @@
26562656
"properties": {},
26572657
"allOf": [
26582658
{
2659-
"$ref": "#/definitions/OptionAProperties"
2659+
"$ref": "#/definitions/Layer3OptionAProperties"
26602660
}
26612661
],
26622662
"required": [
@@ -2750,23 +2750,23 @@
27502750
"properties": {
27512751
"primaryIpv4Prefix": {
27522752
"type": "string",
2753-
"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."
2753+
"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."
27542754
},
27552755
"primaryIpv6Prefix": {
27562756
"type": "string",
2757-
"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."
2757+
"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."
27582758
},
27592759
"secondaryIpv4Prefix": {
27602760
"type": "string",
2761-
"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."
2761+
"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."
27622762
},
27632763
"secondaryIpv6Prefix": {
27642764
"type": "string",
2765-
"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."
2765+
"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."
27662766
}
27672767
}
27682768
},
2769-
"OptionAProperties": {
2769+
"Layer3OptionAProperties": {
27702770
"type": "object",
27712771
"description": "Peering optionA properties",
27722772
"properties": {

‎specification/managednetworkfabric/resource-manager/Microsoft.ManagedNetworkFabric/preview/2023-02-01-preview/NetworkFabrics.json

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -836,17 +836,15 @@
836836
},
837837
"ipv4Prefix": {
838838
"type": "string",
839-
"description": "IPv4Prefix for Management Network. Default value : 10.1.0.0/19.",
839+
"description": "IPv4Prefix for Management Network. Example: 10.1.0.0/19.",
840840
"x-ms-mutability": [
841841
"create",
842842
"read"
843-
],
844-
"default": "10.1.0.0/19"
843+
]
845844
},
846845
"ipv6Prefix": {
847846
"type": "string",
848-
"description": "IPv6Prefix for Management Network. Default value 3FFE:FFFF:0:CD40::/59.",
849-
"default": "3FFE:FFFF:0:CD40::/59",
847+
"description": "IPv6Prefix for Management Network. Example: 3FFE:FFFF:0:CD40::/59.",
850848
"x-ms-mutability": [
851849
"create",
852850
"read"
@@ -931,7 +929,7 @@
931929
}
932930
},
933931
"required": [
934-
"optionBProperties"
932+
"peeringOption"
935933
]
936934
},
937935
"workloadVpnConfiguration": {
@@ -960,7 +958,7 @@
960958
}
961959
},
962960
"required": [
963-
"optionBProperties"
961+
"peeringOption"
964962
]
965963
}
966964
}
@@ -1098,6 +1096,19 @@
10981096
"type": "object",
10991097
"description": "Configuration used to setup CE-PE connectivity.",
11001098
"properties": {
1099+
"nniType": {
1100+
"type": "string",
1101+
"description": "Type of NNI used. Example: CE | NPB",
1102+
"default": "CE",
1103+
"enum": [
1104+
"CE",
1105+
"NPB"
1106+
],
1107+
"x-ms-enum": {
1108+
"modelAsString": true,
1109+
"name": "nniType"
1110+
}
1111+
},
11011112
"administrativeState": {
11021113
"description": "Gets the administrativeState of the resource. Example -Enabled/Disabled",
11031114
"$ref": "./common.json#/definitions/EnabledDisabledState"
@@ -1169,7 +1180,7 @@
11691180
"format": "int32",
11701181
"minimum": 501,
11711182
"maximum": 4095,
1172-
"description": "Vlan Id.Example : 501"
1183+
"description": "Vlan identifier. Example : 501"
11731184
},
11741185
"peerASN": {
11751186
"type": "integer",
@@ -1205,7 +1216,7 @@
12051216
},
12061217
"OptionBProperties": {
12071218
"type": "object",
1208-
"description": "Option B configuration to be used for management vpn.",
1219+
"description": "Option B configuration.",
12091220
"properties": {
12101221
"importRouteTargets": {
12111222
"type": "array",
@@ -1307,23 +1318,19 @@
13071318
"properties": {
13081319
"primaryIpv4Prefix": {
13091320
"type": "string",
1310-
"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.",
1311-
"default": "172.31.0.0/31"
1321+
"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."
13121322
},
13131323
"primaryIpv6Prefix": {
13141324
"type": "string",
1315-
"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.",
1316-
"default": "3FFE:FFFF:0:CD30::a0/126"
1325+
"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."
13171326
},
13181327
"secondaryIpv4Prefix": {
13191328
"type": "string",
1320-
"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.",
1321-
"default": "172.31.0.20/31"
1329+
"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."
13221330
},
13231331
"secondaryIpv6Prefix": {
13241332
"type": "string",
1325-
"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.",
1326-
"default": "3FFE:FFFF:0:CD30::a4/126"
1333+
"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."
13271334
}
13281335
}
13291336
}

0 commit comments

Comments
 (0)