PS Development for UDR and NSG Management

src/Accounts/Accounts/Utilities/CommandMappings.json

@@ -4484,6 +4484,12 @@
       "Get-AzNetworkManagerSecurityAdminConfiguration": {},
       "Get-AzNetworkManagerSecurityAdminRule": {},
       "Get-AzNetworkManagerSecurityAdminRuleCollection": {},
+      "Get-AzNetworkManagerRoutingConfiguration": {},
+      "Get-AzNetworkManagerRoutingRule": {},
+      "Get-AzNetworkManagerRoutingRuleCollection": {},
+      "Get-AzNetworkManagerSecurityUserConfiguration": {},
+      "Get-AzNetworkManagerSecurityUserRule": {},
+      "Get-AzNetworkManagerSecurityUserRuleCollection": {},
       "Get-AzNetworkManagerStaticMember": {},
       "Get-AzNetworkManagerSubscriptionConnection": {},
       "Get-AzNetworkProfile": {},
@@ -4703,6 +4709,8 @@
       "New-AzNetworkInterfaceIpConfig": {},
       "New-AzNetworkManager": {},
       "New-AzNetworkManagerAddressPrefixItem": {},
+      "New-AzNetworkManagerRoutingRuleDestination": {},
+      "New-AzNetworkManagerRoutingRuleNextHop": {},
       "New-AzNetworkManagerConnectivityConfiguration": {},
       "New-AzNetworkManagerConnectivityGroupItem": {},
       "New-AzNetworkManagerGroup": {},
@@ -4713,7 +4721,14 @@
       "New-AzNetworkManagerSecurityAdminConfiguration": {},
       "New-AzNetworkManagerSecurityAdminRule": {},
       "New-AzNetworkManagerSecurityAdminRuleCollection": {},
+      "New-AzNetworkManagerRoutingConfiguration": {},
+      "New-AzNetworkManagerRoutingRule": {},
+      "New-AzNetworkManagerRoutingRuleCollection": {},
       "New-AzNetworkManagerSecurityGroupItem": {},
+      "New-AzNetworkManagerSecurityUserConfiguration": {},
+      "New-AzNetworkManagerSecurityUserRule": {},
+      "New-AzNetworkManagerSecurityUserRuleCollection": {},
+      "New-AzNetworkManagerSecurityUserGroupItem": {},
       "New-AzNetworkManagerStaticMember": {},
       "New-AzNetworkManagerSubscriptionConnection": {},
       "New-AzNetworkProfile": {},
@@ -4879,6 +4894,12 @@
       "Remove-AzNetworkManagerSecurityAdminConfiguration": {},
       "Remove-AzNetworkManagerSecurityAdminRule": {},
       "Remove-AzNetworkManagerSecurityAdminRuleCollection": {},
+      "Remove-AzNetworkManagerRoutingConfiguration": {},
+      "Remove-AzNetworkManagerRoutingRule": {},
+      "Remove-AzNetworkManagerRoutingRuleCollection": {},
+      "Remove-AzNetworkManagerSecurityUserConfiguration": {},
+      "Remove-AzNetworkManagerSecurityUserRule": {},
+      "Remove-AzNetworkManagerSecurityUserRuleCollection": {},
       "Remove-AzNetworkManagerStaticMember": {},
       "Remove-AzNetworkManagerSubscriptionConnection": {},
       "Remove-AzNetworkProfile": {},
@@ -5013,6 +5034,12 @@
       "Set-AzNetworkManagerSecurityAdminConfiguration": {},
       "Set-AzNetworkManagerSecurityAdminRule": {},
       "Set-AzNetworkManagerSecurityAdminRuleCollection": {},
+      "Set-AzNetworkManagerRoutingConfiguration": {},
+      "Set-AzNetworkManagerRoutingRule": {},
+      "Set-AzNetworkManagerRoutingRuleCollection": {},
+      "Set-AzNetworkManagerSecurityUserConfiguration": {},
+      "Set-AzNetworkManagerSecurityUserRule": {},
+      "Set-AzNetworkManagerSecurityUserRuleCollection": {},
       "Set-AzNetworkManagerSubscriptionConnection": {},
       "Set-AzNetworkProfile": {},
       "Set-AzNetworkSecurityGroup": {},

src/Network/Network.Test/ScenarioTests/NetworkManagerTests.cs

@@ -67,6 +67,22 @@ public void NetworkManagerSecurityAdminRuleCRUD()
             TestRunner.RunTestScript("Test-NetworkManagerSecurityAdminRuleCRUD");
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.Owner, NrpTeamAlias.nsmdev)]
+        public void NetworkManagerRoutingRuleCRUD()
+        {
+            TestRunner.RunTestScript("Test-NetworkManagerRoutingRuleCRUD");
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.Owner, NrpTeamAlias.nsmdev)]
+        public void NetworkManagerSecurityUserRuleCRUD()
+        {
+            TestRunner.RunTestScript("Test-NetworkManagerSecurityUserRuleCRUD");
+        }
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         [Trait(Category.Owner, NrpTeamAlias.nsmdev)]

src/Network/Network/Az.Network.psd1

@@ -213,7 +213,13 @@ CmdletsToExport = 'Add-AzApplicationGatewayAuthenticationCertificate',
                'Get-AzNetworkManagerScopeConnection', 
                'Get-AzNetworkManagerSecurityAdminConfiguration', 
                'Get-AzNetworkManagerSecurityAdminRule', 
-               'Get-AzNetworkManagerSecurityAdminRuleCollection', 
+               'Get-AzNetworkManagerSecurityAdminRuleCollection',
+               'Get-AzNetworkManagerRoutingConfiguration', 
+               'Get-AzNetworkManagerRoutingRule', 
+               'Get-AzNetworkManagerRoutingRuleCollection',
+               'Get-AzNetworkManagerSecurityUserConfiguration', 
+               'Get-AzNetworkManagerSecurityUserRule', 
+               'Get-AzNetworkManagerSecurityUserRuleCollection', 
                'Get-AzNetworkManagerStaticMember', 
                'Get-AzNetworkManagerSubscriptionConnection', 
                'Get-AzNetworkProfile', 'Get-AzNetworkSecurityGroup', 
@@ -379,6 +385,8 @@ CmdletsToExport = 'Add-AzApplicationGatewayAuthenticationCertificate',
                'New-AzLocalNetworkGateway', 'New-AzNatGateway', 
                'New-AzNetworkInterface', 'New-AzNetworkInterfaceIpConfig', 
                'New-AzNetworkManager', 'New-AzNetworkManagerAddressPrefixItem', 
+               'New-AzNetworkManagerRoutingRuleDestination', 
+               'New-AzNetworkManagerRoutingRuleNextHop', 
                'New-AzNetworkManagerConnectivityConfiguration', 
                'New-AzNetworkManagerConnectivityGroupItem', 
                'New-AzNetworkManagerGroup', 'New-AzNetworkManagerHub', 
@@ -387,7 +395,15 @@ CmdletsToExport = 'Add-AzApplicationGatewayAuthenticationCertificate',
                'New-AzNetworkManagerSecurityAdminConfiguration', 
                'New-AzNetworkManagerSecurityAdminRule', 
                'New-AzNetworkManagerSecurityAdminRuleCollection', 
+               'New-AzNetworkManagerRoutingConfiguration', 
+               'New-AzNetworkManagerRoutingRule', 
+               'New-AzNetworkManagerRoutingRuleCollection',
+               'New-AzNetworkManagerSecurityUserConfiguration', 
+               'New-AzNetworkManagerSecurityUserRule', 
+               'New-AzNetworkManagerSecurityUserRuleCollection',
                'New-AzNetworkManagerSecurityGroupItem', 
+               'New-AzNetworkManagerRoutingGroupItem', 
+               'New-AzNetworkManagerSecurityUserGroupItem', 
                'New-AzNetworkManagerStaticMember', 
                'New-AzNetworkManagerSubscriptionConnection', 
                'New-AzNetworkProfile', 'New-AzNetworkSecurityGroup', 
@@ -509,6 +525,12 @@ CmdletsToExport = 'Add-AzApplicationGatewayAuthenticationCertificate',
                'Remove-AzNetworkManagerSecurityAdminConfiguration', 
                'Remove-AzNetworkManagerSecurityAdminRule', 
                'Remove-AzNetworkManagerSecurityAdminRuleCollection', 
+               'Remove-AzNetworkManagerRoutingConfiguration', 
+               'Remove-AzNetworkManagerRoutingRuleCollection', 
+               'Remove-AzNetworkManagerRoutingRule', 
+               'Remove-AzNetworkManagerSecurityUserConfiguration', 
+               'Remove-AzNetworkManagerSecurityUserRuleCollection', 
+               'Remove-AzNetworkManagerSecurityUserRule', 
                'Remove-AzNetworkManagerStaticMember', 
                'Remove-AzNetworkManagerSubscriptionConnection', 
                'Remove-AzNetworkProfile', 'Remove-AzNetworkSecurityGroup', 
@@ -609,6 +631,12 @@ CmdletsToExport = 'Add-AzApplicationGatewayAuthenticationCertificate',
                'Set-AzNetworkManagerSecurityAdminConfiguration', 
                'Set-AzNetworkManagerSecurityAdminRule', 
                'Set-AzNetworkManagerSecurityAdminRuleCollection', 
+               'Set-AzNetworkManagerRoutingConfiguration', 
+               'Set-AzNetworkManagerRoutingRuleCollection', 
+               'Set-AzNetworkManagerRoutingRule', 
+               'Set-AzNetworkManagerSecurityUserConfiguration', 
+               'Set-AzNetworkManagerSecurityUserRuleCollection', 
+               'Set-AzNetworkManagerSecurityUserRule', 
                'Set-AzNetworkManagerSubscriptionConnection', 
                'Set-AzNetworkProfile', 'Set-AzNetworkSecurityGroup', 
                'Set-AzNetworkSecurityRuleConfig', 

src/Network/Network/Common/NetworkResourceManagerProfile.cs

@@ -2305,6 +2305,16 @@ private static void Initialize()
                 cfg.CreateMap<ANM.PSNetworkManagerSecurityAdminRuleCollection, MNM.AdminRuleCollection>();
                 cfg.CreateMap<ANM.PSNetworkManagerScopeConnection, MNM.ScopeConnection>();
                 cfg.CreateMap<ANM.PSNetworkManagerConnection, MNM.NetworkManagerConnection>();
+                cfg.CreateMap<ANM.PSNetworkManagerRoutingRule, MNM.RoutingRule>();
+                cfg.CreateMap<ANM.PSNetworkManagerRoutingRuleCollection, MNM.RoutingRuleCollection>();
+                cfg.CreateMap<ANM.PSNetworkManagerRoutingConfiguration, MNM.NetworkManagerRoutingConfiguration>();
+                cfg.CreateMap<ANM.PSNetworkManagerRoutingGroupItem, MNM.NetworkManagerRoutingGroupItem>();
+                cfg.CreateMap<ANM.PSNetworkManagerRoutingRuleDestination, MNM.RoutingRuleRouteDestination>();
+                cfg.CreateMap<ANM.PSNetworkManagerRoutingRuleNextHop, MNM.RoutingRuleNextHop>();
+                cfg.CreateMap<ANM.PSNetworkManagerSecurityUserRule, MNM.SecurityUserRule>();
+                cfg.CreateMap<ANM.PSNetworkManagerSecurityUserRuleCollection, MNM.SecurityUserRuleCollection>();
+                cfg.CreateMap<ANM.PSNetworkManagerSecurityUserConfiguration, MNM.SecurityUserConfiguration>();
+                cfg.CreateMap<ANM.PSNetworkManagerSecurityUserGroupItem, MNM.SecurityUserGroupItem>();
 
                 // MNM to CNM
                 cfg.CreateMap<MNM.NetworkManager, ANM.PSNetworkManager>();
@@ -2344,6 +2354,16 @@ private static void Initialize()
                 cfg.CreateMap<MNM.AdminRuleCollection, ANM.PSNetworkManagerSecurityAdminRuleCollection>();
                 cfg.CreateMap<MNM.ScopeConnection, ANM.PSNetworkManagerScopeConnection>();
                 cfg.CreateMap<MNM.NetworkManagerConnection, ANM.PSNetworkManagerConnection>();
+                cfg.CreateMap<MNM.RoutingRule, ANM.PSNetworkManagerRoutingRule>();
+                cfg.CreateMap<MNM.RoutingRuleCollection, ANM.PSNetworkManagerRoutingRuleCollection>();
+                cfg.CreateMap<MNM.NetworkManagerRoutingConfiguration, ANM.PSNetworkManagerRoutingConfiguration>();
+                cfg.CreateMap<MNM.RoutingRuleRouteDestination, ANM.PSNetworkManagerRoutingRuleDestination>();
+                cfg.CreateMap<MNM.RoutingRuleNextHop, ANM.PSNetworkManagerRoutingRuleNextHop>();
+                cfg.CreateMap<MNM.NetworkManagerRoutingGroupItem, ANM.PSNetworkManagerRoutingGroupItem>();
+                cfg.CreateMap<MNM.SecurityUserRule, ANM.PSNetworkManagerSecurityUserRule>();
+                cfg.CreateMap<MNM.SecurityUserRuleCollection, ANM.PSNetworkManagerSecurityUserRuleCollection>();
+                cfg.CreateMap<MNM.SecurityUserConfiguration, ANM.PSNetworkManagerSecurityUserConfiguration>();
+                cfg.CreateMap<MNM.SecurityUserGroupItem, ANM.PSNetworkManagerSecurityUserGroupItem>();
 
             });
             _mapper = config.CreateMapper();

src/Network/Network/Models/NetworkManager/PSNetworkManagerRoutingConfiguration.cs

@@ -0,0 +1,28 @@
+//
+// Copyright (c) Microsoft.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+
+namespace Microsoft.Azure.Commands.Network.Models.NetworkManager
+{
+    using System.Collections;
+    using System.Collections.Generic;
+    using Newtonsoft.Json;
+    using WindowsAzure.Commands.Common.Attributes;
+
+    public class PSNetworkManagerRoutingConfiguration : PSNetworkManagerBaseResource
+    {
+        public string NetworkManagerName { get; set; }
+    }
+}

src/Network/Network/Models/NetworkManager/PSNetworkManagerRoutingGroupItem.cs

@@ -0,0 +1,9 @@
+using Newtonsoft.Json;
+
+namespace Microsoft.Azure.Commands.Network.Models.NetworkManager
+{
+    public class PSNetworkManagerRoutingGroupItem
+    {
+        public string NetworkGroupId { get; set; }
+    }
+}

src/Network/Network/Models/NetworkManager/PSNetworkManagerRoutingRule.cs

@@ -0,0 +1,37 @@
+//
+// Copyright (c) Microsoft.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+
+namespace Microsoft.Azure.Commands.Network.Models.NetworkManager
+{
+    using Microsoft.Azure.Management.Network.Models;
+    using Newtonsoft.Json;
+    using System.Collections;
+    using System.Collections.Generic;
+    using WindowsAzure.Commands.Common.Attributes;
+
+    public class PSNetworkManagerRoutingRule : PSNetworkManagerBaseResource
+    {
+        public PSNetworkManagerRoutingRuleDestination Destination { get; set; }
+
+        public PSNetworkManagerRoutingRuleNextHop NextHop { get; set; }
+
+        public string NetworkManagerName { get; set; }
+
+        public string RoutingConfigurationName { get; set; }
+
+        public string RuleCollectionName { get; set; }
+    }
+}

src/Network/Network/Models/NetworkManager/PSNetworkManagerRoutingRuleCollection.cs

@@ -0,0 +1,39 @@
+//
+// Copyright (c) Microsoft.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+
+namespace Microsoft.Azure.Commands.Network.Models.NetworkManager
+{
+    using Newtonsoft.Json;
+    using System.Collections.Generic;
+    using System.Management.Automation;
+
+    public class PSNetworkManagerRoutingRuleCollection : PSNetworkManagerBaseResource
+    {
+        public string NetworkManagerName { get; set; }
+        public string RoutingConfigurationName { get; set; }
+
+        [JsonProperty(Order = 1)]
+        public IList<PSNetworkManagerRoutingGroupItem> AppliesTo { get; set; }
+
+        public SwitchParameter DisableBgpRoutePropagation { get; set; }
+
+        [JsonIgnore]
+        public string AppliesToText
+        {
+            get { return JsonConvert.SerializeObject(AppliesTo, Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore }); }
+        }
+    }
+}

src/Network/Network/Models/NetworkManager/PSNetworkManagerRoutingRuleDestination.cs

@@ -0,0 +1,14 @@
+using Microsoft.Azure.Management.Network.Models;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Microsoft.Azure.Commands.Network.Models.NetworkManager
+{
+    public class PSNetworkManagerRoutingRuleDestination
+    {
+        public string DestinationAddress { get; set; }
+
+        public string Type { get; set; }
+    }
+}

src/Network/Network/Models/NetworkManager/PSNetworkManagerRoutingRuleNextHop.cs

@@ -0,0 +1,14 @@
+using Microsoft.Azure.Management.Network.Models;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Microsoft.Azure.Commands.Network.Models.NetworkManager
+{
+    public class PSNetworkManagerRoutingRuleNextHop
+    {
+        public string NextHopAddress { get; set; }
+
+        public string NextHopType { get; set; }
+    }
+}

src/Network/Network/Models/NetworkManager/PSNetworkManagerSecurityUserConfiguration.cs

@@ -0,0 +1,28 @@
+//
+// Copyright (c) Microsoft.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+
+namespace Microsoft.Azure.Commands.Network.Models.NetworkManager
+{
+    using System.Collections;
+    using System.Collections.Generic;
+    using Newtonsoft.Json;
+    using WindowsAzure.Commands.Common.Attributes;
+
+    public class PSNetworkManagerSecurityUserConfiguration : PSNetworkManagerBaseResource
+    {
+        public string NetworkManagerName { get; set; }
+    }
+}

src/Network/Network/Models/NetworkManager/PSNetworkManagerSecurityUserGroupItem.cs

@@ -0,0 +1,9 @@
+using Newtonsoft.Json;
+
+namespace Microsoft.Azure.Commands.Network.Models.NetworkManager
+{
+    public class PSNetworkManagerSecurityUserGroupItem
+    {
+        public string NetworkGroupId { get; set; }
+    }
+}