Merge pull request #7213 from chandrasekarsrinivasan/serviceendpoint

Bug fix in Service Endpoint policies

Author: praries880

src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/VirtualNetworkTests.ps1

@@ -785,6 +785,7 @@ function Test-VirtualNetworkSubnetServiceEndpointPolicies
 	$serviceEndpointPolicyDefinitionDescription = "New Policy"
     $serviceEndpointPolicyName = "ServiceEndpointPolicy1"
     $serviceEndpointPolicyDefinitionResourceName = "/subscriptions/subid1/resourceGroups/storageRg/providers/Microsoft.Storage/storageAccounts/stAccount"
+	$provisioningStateSucceeded = "Succeeded"
 
     try
     {
@@ -802,6 +803,14 @@ function Test-VirtualNetworkSubnetServiceEndpointPolicies
         Assert-AreEqual $serviceEndpointPolicyDefinitionName $getserviceEndpointPolicy[0].ServiceEndpointPolicyDefinitions[0].Name;
         Assert-AreEqual $serviceEndpointPolicyDefinitionDescription $getserviceEndpointPolicy[0].ServiceEndpointPolicyDefinitions[0].Description;
         Assert-AreEqual $serviceEndpointPolicyDefinitionResourceName $getserviceEndpointPolicy[0].ServiceEndpointPolicyDefinitions[0].ServiceResources[0];
+        Assert-AreEqual $getserviceEndpointPolicy[0].ProvisioningState $provisioningStateSucceeded;
+
+        $getserviceEndpointPolicyDefinition = Get-AzureRmServiceEndpointPolicyDefinition -Name $serviceEndpointPolicyDefinitionName -ServiceEndpointPolicy $getserviceEndpointPolicy
+
+        Assert-AreEqual $getserviceEndpointPolicyDefinition[0].Name $serviceEndpointPolicyDefinitionName;
+        Assert-AreEqual $getserviceEndpointPolicyDefinition[0].ProvisioningState $provisioningStateSucceeded;
+        Assert-AreEqual $getserviceEndpointPolicyDefinition[0].ServiceResources[0] $serviceEndpointPolicyDefinitionResourceName;
+        Assert-AreEqual $getserviceEndpointPolicyDefinition[0].Service $serviceEndpoint;
 
         $subnet = New-AzureRmVirtualNetworkSubnetConfig -Name $subnetName -AddressPrefix 10.0.1.0/24 -ServiceEndpoint $serviceEndpoint -ServiceEndpointPolicy $serviceEndpointPolicy;
         New-AzureRmvirtualNetwork -Name $vnetName -ResourceGroupName $rgname -Location $location -AddressPrefix 10.0.0.0/16 -Subnet $subnet;

src/ResourceManager/Network/Commands.Network/Microsoft.Azure.Commands.Network.format.ps1xml

@@ -1410,6 +1410,10 @@
                 <Label>ServiceEndpointPolicyDefinitions</Label>
                 <PropertyName>ServiceEndpointPolicyDefinitionsText</PropertyName>
               </ListItem>
+              <ListItem>
+                <Label>Subnets</Label>
+                <PropertyName>SubnetsText</PropertyName>
+              </ListItem>
             </ListItems>
           </ListEntry>
         </ListEntries>
@@ -1428,14 +1432,6 @@
                 <Label>Name</Label>
                 <PropertyName>Name</PropertyName>
               </ListItem>
-              <ListItem>
-                <Label>ResourceGroupName</Label>
-                <PropertyName>ResourceGroupName</PropertyName>
-              </ListItem>
-              <ListItem>
-                <Label>Location</Label>
-                <PropertyName>Location</PropertyName>
-              </ListItem>
               <ListItem>
                 <Label>Id</Label>
                 <PropertyName>Id</PropertyName>
@@ -1444,10 +1440,6 @@
                 <Label>Etag</Label>
                 <PropertyName>Etag</PropertyName>
               </ListItem>
-              <ListItem>
-                <Label>ResourceGuid</Label>
-                <PropertyName>ResourceGuid</PropertyName>
-              </ListItem>
               <ListItem>
                 <Label>ProvisioningState</Label>
                 <PropertyName>ProvisioningState</PropertyName>

src/ResourceManager/Network/Commands.Network/Models/PSServiceEndpointPolicy.cs

@@ -1,21 +1,58 @@
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// 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
 {
+    using Microsoft.WindowsAzure.Commands.Common.Attributes;
+    using Newtonsoft.Json;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Text;
+    using System.Threading.Tasks;
+
     public class PSServiceEndpointPolicy : PSTopLevelResource
     {
         [JsonProperty(Order = 1)]
         public List<PSServiceEndpointPolicyDefinition> ServiceEndpointPolicyDefinitions { get; set; }
 
+        [JsonProperty(Order = 1)]
+        public List<PSSubnet> Subnets { get; set; }
+
         [JsonIgnore]
         public string ServiceEndpointPolicyDefinitionsText
         {
             get { return JsonConvert.SerializeObject(ServiceEndpointPolicyDefinitions, Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore }); }
         }
+
+        [JsonIgnore]
+        public string SubnetsText
+        {
+            get { return JsonConvert.SerializeObject(Subnets, Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore }); }
+        }
+
+        [Ps1Xml(Target = ViewControl.Table)]
+        public string ProvisioningState { get; set; }
+
+        public bool ShouldSerializeSubnets()
+        {
+            return !string.IsNullOrEmpty(this.Name);
+        }
+
+        public bool ShouldSerializeServiceEndpointPolicyDefinitions()
+        {
+            return !string.IsNullOrEmpty(this.Name);
+        }
     }
 }

src/ResourceManager/Network/Commands.Network/Models/PSServiceEndpointPolicyDefinition.cs

@@ -14,6 +14,7 @@
 
 namespace Microsoft.Azure.Commands.Network.Models
 {
+    using Microsoft.WindowsAzure.Commands.Common.Attributes;
     using Newtonsoft.Json;
     using System.Collections.Generic;
 
@@ -27,5 +28,8 @@ public class PSServiceEndpointPolicyDefinition : PSChildResource
 
         [JsonProperty(Order = 1)]
         public List<string> serviceResources { get; set; }
+
+        [Ps1Xml(Target = ViewControl.Table)]
+        public string ProvisioningState { get; set; }
     }
 }

src/ResourceManager/Network/Commands.Network/Models/PSSubnet.cs

@@ -41,6 +41,7 @@ public class PSSubnet : PSChildResource
         [JsonProperty(Order = 1)]
         public List<PSServiceEndpoint> ServiceEndpoints { get; set; }
 
+        [JsonProperty(Order = 1)]
         public List<PSServiceEndpointPolicy> ServiceEndpointPolicies { get; set; }
 
         [JsonProperty(Order = 1)]
@@ -76,7 +77,22 @@ public bool ShouldSerializeIpConfigurations()
             return !string.IsNullOrEmpty(this.Name);
         }
 
-         [JsonIgnore]
+        public bool ShouldSerializeServiceEndpointPolicies()
+        {
+            return !string.IsNullOrEmpty(this.Name);
+        }
+
+        public bool ShouldSerializeServiceEndpoints()
+        {
+            return !string.IsNullOrEmpty(this.Name);
+        }
+
+        public bool ShouldSerializeResourceNavigationLinks()
+        {
+            return !string.IsNullOrEmpty(this.Name);
+        }
+
+        [JsonIgnore]
         public string ServiceEndpointText
         {
             get { return JsonConvert.SerializeObject(ServiceEndpoints, Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore }); }

src/ResourceManager/Network/Commands.Network/ServiceEndpointPolicy/ServiceEndpointPolicyDefinition/GetAzureServiceEndpointPolicyDefinitionCommand.cs

@@ -14,6 +14,7 @@
 
 using Microsoft.Azure.Commands.Network.Models;
 using Microsoft.Azure.Management.Internal.Resources.Utilities.Models;
+using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
 using Microsoft.WindowsAzure.Commands.Utilities.Common;
 using System.Linq;
 using System.Management.Automation;
@@ -24,7 +25,7 @@ namespace Microsoft.Azure.Commands.Network
     public class GetAzureServiceEndpointPolicyDefinitionCommand : NetworkBaseCmdlet
     {
         [Parameter(
-            Mandatory = false,
+            Mandatory = true,
             HelpMessage = "The name of the service endpoint policy definition")]
         public string Name { get; set; }
 
@@ -34,8 +35,9 @@ public class GetAzureServiceEndpointPolicyDefinitionCommand : NetworkBaseCmdlet
             HelpMessage = "The Service endpoint policy")]
         public PSServiceEndpointPolicy ServiceEndpointPolicy { get; set; }
 
+        [CmdletParameterBreakingChange("ResourceId", ChangeDescription = "Parameter is being deprecated without being replaced")]
         [Parameter(
-            Mandatory = true,
+            Mandatory = false,
             ValueFromPipelineByPropertyName = true,
             ParameterSetName = "GetByResourceIdParameterSet")]
         [ValidateNotNullOrEmpty]
@@ -45,12 +47,6 @@ public override void Execute()
         {
             if (this.ShouldProcess(Name, VerbsLifecycle.Restart))
             {
-                if (this.IsParameterBound(c => c.ResourceId))
-                {
-                    var resourceIdentifier = new ResourceIdentifier(this.ResourceId);
-                    this.Name = resourceIdentifier.ResourceName;
-                }
-
                 base.Execute();
                 var definitions = this.ServiceEndpointPolicy.ServiceEndpointPolicyDefinitions;
 

src/ResourceManager/Network/Commands.Network/help/Get-AzureRmServiceEndpointPolicyDefinition.md

@@ -1,7 +1,7 @@
 ---
 external help file: Microsoft.Azure.Commands.Network.dll-Help.xml
 Module Name: AzureRM.Network
-online version:https://docs.microsoft.com/en-us/powershell/module/azurerm.network/get-azurermserviceendpointpolicydefinition
+online version: https://docs.microsoft.com/en-us/powershell/module/azurerm.network/get-azurermserviceendpointpolicydefinition
 schema: 2.0.0
 ---
 
@@ -14,7 +14,7 @@ schema: 2.0.0
 
 ```
 Get-AzureRmServiceEndpointPolicyDefinition [-Name <String>] -ServiceEndpointPolicy <PSServiceEndpointPolicy>
- [-DefaultRules] [-DefaultProfile <IAzureContextContainer>] [<CommonParameters>]
+ -ResourceId <String> [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -24,18 +24,18 @@ The **Get-AzureRmServiceEndpointPolicyDefinition** cmdlet gets a service endpoin
 
 ### Example 1
 ```
-$policydef= Get-AzureRmServiceEndpointPolicyDefinition -Name "ServiceEndpointPolicyDefinition1"
+$policydef= Get-AzureRmServiceEndpointPolicyDefinition -Name "ServiceEndpointPolicyDefinition1" -ServiceEndpointPolicy $Policy
 ```
 
-This command gets the service endpoint policy definition named ServiceEndpointPolicyDefinition1 stores it in the $policydef variable.
+This command gets the service endpoint policy definition named ServiceEndpointPolicyDefinition1 in ServiceEndpointPolicy $Policy stores it in the $policydef variable.
 
 ## PARAMETERS
 
 ### -DefaultProfile
 The credentials, account, tenant, and subscription used for communication with azure.
 
 ```yaml
-Type: Microsoft.Azure.Commands.Common.Authentication.Abstractions.IAzureContextContainer
+Type: IAzureContextContainer
 Parameter Sets: (All)
 Aliases: AzureRmContext, AzureCredential
 
@@ -46,11 +46,11 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -DefaultRules
-{{Fill DefaultRules Description}}
+### -Name
+The name of the service endpoint policy definition
 
 ```yaml
-Type: SwitchParameter
+Type: String
 Parameter Sets: (All)
 Aliases:
 
@@ -61,26 +61,26 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -Name
-The name of the service endpoint policy definition
+### -ResourceId
+{{Fill ResourceId Description}}
 
 ```yaml
-Type: System.String
+Type: String
 Parameter Sets: (All)
 Aliases:
 
-Required: False
+Required: True
 Position: Named
 Default value: None
-Accept pipeline input: False
+Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
 ```
 
 ### -ServiceEndpointPolicy
 The Service endpoint policy
 
 ```yaml
-Type: Microsoft.Azure.Commands.Network.Models.PSServiceEndpointPolicy
+Type: PSServiceEndpointPolicy
 Parameter Sets: (All)
 Aliases:
 
@@ -91,20 +91,47 @@ Accept pipeline input: True (ByValue)
 Accept wildcard characters: False
 ```
 
+### -Confirm
+Prompts you for confirmation before running the cmdlet.
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases: cf
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -WhatIf
+Shows what would happen if the cmdlet runs. The cmdlet is not run.
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases: wi
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### CommonParameters
-This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable.
-For more information, see about_CommonParameters (http://go.microsoft.com/fwlink/?LinkID=113216).
+This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see about_CommonParameters (http://go.microsoft.com/fwlink/?LinkID=113216).
 
 ## INPUTS
 
 ### Microsoft.Azure.Commands.Network.Models.PSServiceEndpointPolicy
 
-
 ## OUTPUTS
 
 ### Microsoft.Azure.Commands.Network.Models.PSServiceEndpointPolicyDefinition
 
-
 ## NOTES
 
 ## RELATED LINKS

tools/StaticAnalysis/Exceptions/AzureRM.Network/BreakingChangeIssues.csv

@@ -51,3 +51,5 @@
 "Microsoft.Azure.Commands.Network.dll","Microsoft.Azure.Commands.Network.AddAzureVirtualNetworkSubnetConfigCommand","Add-AzureRmVirtualNetworkSubnetConfig","0","2020","The cmdlet 'Add-AzureRmVirtualNetworkSubnetConfig' no longer supports the type 'System.String' for parameter 'AddressPrefix'.","Change the type for parameter 'AddressPrefix' back to 'System.String'."
 "Microsoft.Azure.Commands.Network.dll","Microsoft.Azure.Commands.Network.NewAzureVirtualNetworkSubnetConfigCommand","New-AzureRmVirtualNetworkSubnetConfig","0","3000","The type of property 'AddressPrefix' of type 'Microsoft.Azure.Commands.Network.Models.PSSubnet' has changed from 'System.String' to 'System.Collections.Generic.List`1[System.String]'.","Change the type of property 'AddressPrefix' back to 'System.String'."
 "Microsoft.Azure.Commands.Network.dll","Microsoft.Azure.Commands.Network.NewAzureVirtualNetworkSubnetConfigCommand","New-AzureRmVirtualNetworkSubnetConfig","0","2020","The cmdlet 'New-AzureRmVirtualNetworkSubnetConfig' no longer supports the type 'System.String' for parameter 'AddressPrefix'.","Change the type for parameter 'AddressPrefix' back to 'System.String'."
+"Microsoft.Azure.Commands.Network.dll","Microsoft.Azure.Commands.Network.GetAzureServiceEndpointPolicyDefinitionCommand","Get-AzureRmServiceEndpointPolicyDefinition","0","1050","The parameter set '__AllParameterSets' for cmdlet 'Get-AzureRmServiceEndpointPolicyDefinition' has been removed.","Add parameter set '__AllParameterSets' back to cmdlet 'Get-AzureRmServiceEndpointPolicyDefinition'."
+"Microsoft.Azure.Commands.Network.dll","Microsoft.Azure.Commands.Network.GetAzureServiceEndpointPolicyDefinitionCommand","Get-AzureRmServiceEndpointPolicyDefinition","0","1050","The parameter set 'GetByResourceIdParameterSet' for cmdlet 'Get-AzureRmServiceEndpointPolicyDefinition' has been removed.","Add parameter set 'GetByResourceIdParameterSet' back to cmdlet 'Get-AzureRmServiceEndpointPolicyDefinition'."