Skip to content

Commit

Permalink
[Bug-Fix] Minor change in Managed Network Fabric (#24948)
Browse files Browse the repository at this point in the history
* Changes Made:

1. InternetGateways - type param is renamed to gatewayType
2. NetworkFabricSkus - type param is renamed to skuType
3. AccessControlLists:
       -> action -> type is renamed to actionType
      -> matchcondition -> ipmatchCondition -> type is renamed to ipType
4. NetworkTapRule
     -> action -> type is renamed to actionType
     -> matchcondition -> ipmatchCondition -> type is renamed to ipType

New Params:

1. In RoutePolicies: -> statements -> defaultAction [Permit | Deny -> default Deny] is added.
2. In RoutePolicy -> condition -> conditionType is added.
3. In AccessControlLists: -> matchConfiguration -> defaultAction [Permit | Deny -> default Permit] is added.

* Reverting the changes made for "type" parameter.
  • Loading branch information
Mohana-Krishna-Nali authored Aug 1, 2023
1 parent 80c5b33 commit 47c7893
Show file tree
Hide file tree
Showing 14 changed files with 47 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -645,6 +645,12 @@
"format": "uri",
"minLength": 1
},
"defaultAction": {
"type": "string",
"description": "Default action that needs to be applied when no condition is matched. Example: Permit | Deny.",
"default": "Permit",
"$ref": "./common.json#/definitions/CommunityActionTypes"
},
"matchConfigurations": {
"type": "array",
"description": "List of match configurations.",
Expand Down Expand Up @@ -717,7 +723,7 @@
"description": "List of actions that need to be performed for the matched conditions.",
"minItems": 1,
"items": {
"description": "Action that need to performed.",
"description": "Action that need to be performed.",
"$ref": "#/definitions/AccessControlListAction"
}
}
Expand All @@ -730,7 +736,7 @@
"etherTypes": {
"type": "array",
"minItems": 1,
"description": "List of ether type values that needs to be matched.",
"description": "List of ether type values that need to be matched.",
"items": {
"type": "string",
"minLength": 1,
Expand All @@ -740,7 +746,7 @@
"fragments": {
"type": "array",
"minItems": 1,
"description": "List of IP fragment packets that needs to be matched.",
"description": "List of IP fragment packets that need to be matched.",
"items": {
"type": "string",
"minLength": 1,
Expand All @@ -750,7 +756,7 @@
"ipLengths": {
"type": "array",
"minItems": 1,
"description": "List of IP Lengths that needs to be matched.",
"description": "List of IP Lengths that need to be matched.",
"items": {
"type": "string",
"minLength": 1,
Expand All @@ -760,7 +766,7 @@
"ttlValues": {
"type": "array",
"minItems": 1,
"description": "List of TTL [Time To Live] values that needs to be matched.",
"description": "List of TTL [Time To Live] values that need to be matched.",
"items": {
"type": "string",
"minLength": 1,
Expand All @@ -770,7 +776,7 @@
"dscpMarkings": {
"type": "array",
"minItems": 1,
"description": "List of DSCP Markings that needs to be matched.",
"description": "List of DSCP Markings that need to be matched.",
"items": {
"type": "string",
"minLength": 1,
Expand All @@ -794,7 +800,7 @@
"properties": {
"flags": {
"type": "array",
"description": "List of protocol flags that needs to be matched.",
"description": "List of protocol flags that need to be matched.",
"items": {
"type": "string",
"description": "Flag of the port."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -736,7 +736,7 @@
"description": "List of actions that need to be performed for the matched conditions.",
"minItems": 1,
"items": {
"description": "Action that need to performed.",
"description": "Action that needs to performed.",
"$ref": "#/definitions/NetworkTapRuleAction"
}
}
Expand All @@ -748,7 +748,7 @@
"properties": {
"encapsulationType": {
"type": "string",
"description": "Encapsulation Type.",
"description": "Encapsulation Type that needs to be matched.",
"default": "None",
"minLength": 1,
"enum": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -619,6 +619,12 @@
"type": "object",
"description": "Route Policy patchable properties.",
"properties": {
"defaultAction": {
"type": "string",
"description": "Default action that needs to be applied when no condition is matched. Example: Permit | Deny.",
"default": "Deny",
"$ref": "./common.json#/definitions/CommunityActionTypes"
},
"statements": {
"type": "array",
"description": "Route Policy statements.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@
},
"portGroupNames": {
"type": "array",
"description": "List of the port Group Names that to be matched.",
"description": "List of the port Group Names that need to be matched.",
"minItems": 1,
"items": {
"type": "string",
Expand All @@ -512,11 +512,11 @@
},
"VlanMatchCondition": {
"type": "object",
"description": "The vlan match conditions that needs to be matched.",
"description": "The vlan match conditions that need to be matched.",
"properties": {
"vlans": {
"type": "array",
"description": "List of vlans that needs to be matched.",
"description": "List of vlans that need to be matched.",
"minItems": 1,
"items": {
"type": "string",
Expand All @@ -527,7 +527,7 @@
},
"innerVlans": {
"type": "array",
"description": "List of inner vlans that needs to be matched.",
"description": "List of inner vlans that need to be matched.",
"minItems": 1,
"items": {
"type": "string",
Expand All @@ -538,7 +538,7 @@
},
"vlanGroupNames": {
"type": "array",
"description": "List of vlan group names that to be matched.",
"description": "List of vlan group names that need to be matched.",
"minItems": 1,
"items": {
"type": "string",
Expand All @@ -554,7 +554,7 @@
"properties": {
"type": {
"type": "string",
"description": "IP Address type.",
"description": "IP Address type that needs to be matched.",
"minLength": 1,
"enum": [
"SourceIP",
Expand All @@ -567,7 +567,7 @@
},
"prefixType": {
"type": "string",
"description": "IP Prefix Type.",
"description": "IP Prefix Type that needs to be matched.",
"minLength": 1,
"enum": [
"Prefix",
Expand All @@ -580,7 +580,7 @@
},
"ipPrefixValues": {
"type": "array",
"description": "The list of IP Prefixes.",
"description": "The list of IP Prefixes that need to be matched.",
"minItems": 1,
"items": {
"type": "string",
Expand Down Expand Up @@ -624,7 +624,7 @@
},
"portGroups": {
"type": "array",
"description": "List of the port group.",
"description": "List of the port groups.",
"minItems": 1,
"items": {
"description": "Port Group",
Expand Down Expand Up @@ -691,7 +691,7 @@
},
"ports": {
"type": "array",
"description": "List of the ports that needs to be matched.",
"description": "List of the ports that need to be matched.",
"minItems": 1,
"items": {
"type": "string",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"annotation": "annotation",
"configurationType": "File",
"aclsUrl": "https://ACL-Storage-URL",
"defaultAction": "Permit",
"matchConfigurations": [
{
"matchConfigurationName": "example-match",
Expand Down Expand Up @@ -125,6 +126,7 @@
"annotation": "annotation",
"configurationType": "File",
"aclsUrl": "https://ACL-Storage-URL",
"defaultAction": "Permit",
"matchConfigurations": [
{
"matchConfigurationName": "example-match",
Expand Down Expand Up @@ -254,6 +256,7 @@
"annotation": "annotation",
"configurationType": "File",
"aclsUrl": "https://ACL-Storage-URL",
"defaultAction": "Permit",
"matchConfigurations": [
{
"matchConfigurationName": "example-match",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"annotation": "annotation",
"configurationType": "File",
"aclsUrl": "https://ACL-Storage-URL",
"defaultAction": "Permit",
"matchConfigurations": [
{
"matchConfigurationName": "example-match",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"annotation": "annotation",
"configurationType": "File",
"aclsUrl": "https://ACL-Storage-URL",
"defaultAction": "Permit",
"matchConfigurations": [
{
"matchConfigurationName": "example-match",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"annotation": "annotation",
"configurationType": "File",
"aclsUrl": "https://ACL-Storage-URL",
"defaultAction": "Permit",
"matchConfigurations": [
{
"matchConfigurationName": "example-match",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"properties": {
"configurationType": "File",
"aclsUrl": "https://microsoft.com/a",
"defaultAction": "Permit",
"matchConfigurations": [
{
"matchConfigurationName": "example-match",
Expand Down Expand Up @@ -124,6 +125,7 @@
"annotation": "annotation",
"configurationType": "File",
"aclsUrl": "https://ACL-Storage-URL",
"defaultAction": "Permit",
"matchConfigurations": [
{
"matchConfigurationName": "example-match",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"networkFabricId": "/subscriptions/1234ABCD-0A1B-1234-5678-123456ABCDEF/resourceGroups/example-rg/providers/Microsoft.ManagedNetworkFabric/networkFabrics/example-fabric",
"addressFamilyType": "IPv4",
"annotation": "annotation",
"defaultAction": "Deny",
"statements": [
{
"sequenceNumber": 7,
Expand Down Expand Up @@ -80,6 +81,7 @@
"provisioningState": "Accepted",
"administrativeState": "Enabled",
"annotation": "annotation",
"defaultAction": "Deny",
"statements": [
{
"sequenceNumber": 7,
Expand Down Expand Up @@ -164,6 +166,7 @@
"provisioningState": "Accepted",
"administrativeState": "Enabled",
"annotation": "annotation",
"defaultAction": "Deny",
"statements": [
{
"sequenceNumber": 7,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"provisioningState": "Accepted",
"administrativeState": "Enabled",
"annotation": "annotation",
"defaultAction": "Deny",
"statements": [
{
"sequenceNumber": 7,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"provisioningState": "Accepted",
"administrativeState": "Enabled",
"annotation": "annotation",
"defaultAction": "Deny",
"statements": [
{
"sequenceNumber": 7,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"provisioningState": "Accepted",
"administrativeState": "Enabled",
"annotation": "annotation",
"defaultAction": "Deny",
"statements": [
{
"sequenceNumber": 7,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"routePolicyName": "example-routePolicy",
"body": {
"properties": {
"defaultAction": "Deny",
"statements": [
{
"sequenceNumber": 7,
Expand Down Expand Up @@ -76,6 +77,7 @@
"provisioningState": "Accepted",
"administrativeState": "Enabled",
"annotation": "annotation",
"defaultAction": "Deny",
"statements": [
{
"sequenceNumber": 7,
Expand Down

0 comments on commit 47c7893

Please sign in to comment.