Adding new parameters for CustomIpPrefix

src/Network/Network/BYOIP/CustomIpPrefix/NewAzureCustomIpPrefixCommand.cs

@@ -57,6 +57,24 @@ public class NewAzureCustomIpPrefixCommand : CustomIpPrefixBaseCmdlet
         [ValidateNotNullOrEmpty]
         public string Cidr { get; set; }
 
+        [Parameter(
+            Mandatory = false,
+            HelpMessage = "Signed message for WAN validation.",
+            ValueFromPipelineByPropertyName = true)]
+        public string SignedMessage { get; set; }
+
+        [Parameter(
+            Mandatory = false,
+            HelpMessage = "Authorization message for WAN validation.",
+            ValueFromPipelineByPropertyName = true)]
+        public string AuthorizationMessage { get; set; }
+
+        [Parameter(
+            Mandatory = false,
+            HelpMessage = "Parent CustomIpPrefix for /64 IPv6 CustomIpPrefix",
+            ValueFromPipelineByPropertyName = true)]
+        public PSCustomIpPrefix CustomIpPrefixParent { get; set; }
+
         [Parameter(
             Mandatory = false,
             HelpMessage = "A list of availability zones denoting the IP allocated for the resource needs to come from.",
@@ -97,9 +115,12 @@ private PSCustomIpPrefix CreateCustomIpPrefix()
                 ResourceGroupName = this.ResourceGroupName,
                 Location = this.Location,
                 Cidr = this.Cidr,
-                Zones = this.Zone?.ToList()
+                Zones = this.Zone?.ToList(),
+                SignedMessage = this.SignedMessage,
+                AuthorizationMessage = this.AuthorizationMessage,
+                CustomIpPrefixParent = this.CustomIpPrefixParent
             };
-            
+
             var sdkModel = NetworkResourceManagerProfile.Mapper.Map<MNM.CustomIpPrefix>(psModel);
 
             sdkModel.Tags = TagsConversionHelper.CreateTagDictionary(this.Tag, validate: true);

src/Network/Network/BYOIP/CustomIpPrefix/UpdateAzureCustomIpPrefixCommand.cs

@@ -63,11 +63,25 @@ public class UpdateAzureCustomIpPrefixCommand : CustomIpPrefixBaseCmdlet
         [SupportsWildcards]
         public virtual string ResourceId { get; set; }
 
-        [Parameter(Mandatory = false, HelpMessage = "Run cmdlet in the background")]
+        [Parameter(Mandatory = false, HelpMessage = "start commissioning process.")]
         public SwitchParameter Commission { get; set; }
 
-        [Parameter(Mandatory = false, HelpMessage = "Run cmdlet in the background")]
-        public SwitchParameter Decomission { get; set; }
+        [Alias("Decomission")]
+        [Parameter(Mandatory = false, HelpMessage = "start decommissioning process.")]
+        public SwitchParameter Decommission { get; set; }
+
+        [Parameter(Mandatory = false, HelpMessage = "start provisioning process.")]
+        public SwitchParameter Provision { get; set; }
+
+        [Parameter(Mandatory = false, HelpMessage = "start deprovisioning process.")]
+        public SwitchParameter Deprovision { get; set; }
+
+        [Parameter(
+            Mandatory = false,
+            ValueFromPipelineByPropertyName = true,
+            HelpMessage = "The customIpPrefix CIDR.")]
+        [ValidateNotNullOrEmpty]
+        public string Cidr { get; set; }
 
         [Parameter(
             Mandatory = false,
@@ -103,7 +117,7 @@ public override void Execute()
                 throw new ArgumentException(Microsoft.Azure.Commands.Network.Properties.Resources.ResourceNotFound);
             }
 
-            if (Commission && Decomission)
+            if ((Commission ? 1 : 0) + (Decommission ? 1 : 0) + (Provision ? 1 : 0) + (Deprovision ? 1 : 0) > 1)
             {
                 throw new ArgumentException(Microsoft.Azure.Commands.Network.Properties.Resources.CommissioningStateConflict);
             }
@@ -115,9 +129,26 @@ public override void Execute()
                 throw new PSArgumentException(Properties.Resources.ResourceNotFound, this.Name);
             }
 
-            if (Commission || Decomission)
+            if (Commission)
+            {
+                customIpPrefixToUpdate.CommissionedState = "Commissioning";
+            }
+            else if (Decommission)
+            {
+                customIpPrefixToUpdate.CommissionedState = "Decommissioning";
+            }
+            else if (Provision)
+            {
+                customIpPrefixToUpdate.CommissionedState = "Provisioning";
+            }
+            else if (Deprovision)
+            {
+                customIpPrefixToUpdate.CommissionedState = "Deprovisioning";
+            }
+
+            if (this.Cidr != null)
             {
-                customIpPrefixToUpdate.CommissionedState = Commission ? "Commissioning" : "Decomissioning";
+                customIpPrefixToUpdate.Cidr = this.Cidr;
             }
 
             var sdkModel = NetworkResourceManagerProfile.Mapper.Map<MNM.CustomIpPrefix>(customIpPrefixToUpdate);

src/Network/Network/ChangeLog.md

@@ -21,6 +21,9 @@
 ## Upcoming Release
 * Updated cmdlets to enable processing of available zones on AzureFirewalll
     - `New-AzFirewall`
+* Updated cmdlets to add properties for new BYOIP features.
+    - `New-AzCustomIpPrefix`
+    - `Update-AzCustomIpPrefix`
 
 ## Version 4.9.0
 * Updated cmdlets for route server for a more stable way to add IP configuration.

src/Network/Network/Models/BYOIP/PSCustomIpPrefix.cs

@@ -29,10 +29,30 @@ public class PSCustomIpPrefix : PSTopLevelResource
 
         public string ProvisioningState { get; set; }
 
+        public string SignedMessage { get; set; }
+
+        public string AuthorizationMessage { get; set; }
+
+        public PSCustomIpPrefix CustomIpPrefixParent { get; set; }
+
+        public List<PSResourceId> ChildCustomIpPrefixes { get; set; }
+
         [JsonIgnore]
         public string PublicIpPrefixesText
         {
             get { return JsonConvert.SerializeObject(PublicIpPrefixes, Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore }); }
         }
+
+        [JsonIgnore]
+        public string CustomIpPrefixParentText
+        {
+            get { return JsonConvert.SerializeObject(new PSResourceId() { Id = CustomIpPrefixParent.Id }, Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore }); }
+        }
+
+        [JsonIgnore]
+        public string ChildCustomIpPrefixesText
+        {
+            get { return JsonConvert.SerializeObject(ChildCustomIpPrefixes, Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore }); }
+        }
     }
 }

src/Network/Network/Network.format.ps1xml

@@ -1632,14 +1632,30 @@
                 <Label>CommissionedState</Label>
                 <PropertyName>CommissionedState</PropertyName>
               </ListItem>
-			        <ListItem>
+              <ListItem>
                 <Label>PublicIpPrefixes</Label>
                 <PropertyName>PublicIpPrefixesText</PropertyName>
               </ListItem>
               <ListItem>
                 <Label>Zones</Label>
                 <PropertyName>Zones</PropertyName>
               </ListItem>
+              <ListItem>
+                <Label>SignedMessage</Label>
+                <PropertyName>SignedMessage</PropertyName>
+              </ListItem>
+              <ListItem>
+                <Label>AuthorizationMessage</Label>
+                <PropertyName>AuthorizationMessage</PropertyName>
+              </ListItem>
+              <ListItem>
+                <Label>CustomIpPrefixParent</Label>
+                <PropertyName>CustomIpPrefixParentText</PropertyName>
+              </ListItem>
+              <ListItem>
+                <Label>ChildCustomIpPrefixes</Label>
+                <PropertyName>childCustomIpPrefixesText</PropertyName>
+              </ListItem>
             </ListItems>
           </ListEntry>
         </ListEntries>