Merge pull request #33 from AzCiS/fix-exceptions

parvezah · parvezah · commit 79ca0ee86f6f · 2015-03-26T09:31:55.000+05:30
Fix exceptions
diff --git a/src/ServiceManagement/StorSimple/Commands.StorSimple/Cmdlets/DeviceDetails/NewAzureStorSimpleNetworkConfig.cs b/src/ServiceManagement/StorSimple/Commands.StorSimple/Cmdlets/DeviceDetails/NewAzureStorSimpleNetworkConfig.cs
@@ -114,13 +114,9 @@ public class NewAzureStorSimpleNetworkConfig : StorSimpleCmdletBase
 
         public override void ExecuteCmdlet()
         {
-            if (!ProcessParameters())
-            {
-                WriteObject(null);
-                return;
-            }
             try
             {
+                ProcessParameters();
                 var netConfig = new NetworkConfig
                 {
                     IsIscsiEnabled = EnableIscsi,
@@ -145,63 +141,39 @@ public override void ExecuteCmdlet()
             }
         }
 
-        private bool ProcessParameters(){
+        private void ProcessParameters(){
             // parse interfaceAlias
             if (!Enum.TryParse<NetInterfaceId>(InterfaceAlias, out interfaceAlias))
             {
-                WriteVerbose(string.Format(Resources.InvalidInterfaceId, InterfaceAlias));
-                return false;
+                throw new ArgumentException(string.Format(Resources.InvalidInterfaceId, InterfaceAlias));
             }
 
             // Try and set all the IP address
-            if (!TrySetIPAddress(Controller0IPv4Address, out controller0Address, "Controller0IPv4Address"))
-            {
-                return false;
-            }
-            if (!TrySetIPAddress(Controller1IPv4Address, out controller1Address, "Controller1IPv4Address"))
-            {
-                return false;
-            }
-            if (!TrySetIPAddress(IPv4Address, out ipv4Address, "IPv4Address"))
-            {
-                return false;
-            }
-            if (!TrySetIPAddress(IPv4Gateway, out ipv4Gateway, "IPv4Gateway"))
-            {
-                return false;
-            }
-            if (!TrySetIPAddress(IPv4Netmask, out ipv4Netmask, "IPv4Netmask"))
-            {
-                return false;
-            }
-            if(!TrySetIPAddress(IPv6Gateway, out ipv6Gateway, "IPv6Gateway"))
-            {
-                return false;
-            }
+            TrySetIPAddress(Controller0IPv4Address, out controller0Address, "Controller0IPv4Address");
+            TrySetIPAddress(Controller1IPv4Address, out controller1Address, "Controller1IPv4Address");
+            TrySetIPAddress(IPv4Address, out ipv4Address, "IPv4Address");
+            TrySetIPAddress(IPv4Gateway, out ipv4Gateway, "IPv4Gateway");
+            TrySetIPAddress(IPv4Netmask, out ipv4Netmask, "IPv4Netmask");
+            TrySetIPAddress(IPv6Gateway, out ipv6Gateway, "IPv6Gateway");
 
             // Only EnableIscsi, Controller0 and controller1 IP Addresses can be set on Data0
             if (InterfaceAlias == NetInterfaceId.Data0.ToString())
             {
                 if(IPv4Address != null || IPv4Gateway != null || IPv4Netmask != null
                     && IPv6Gateway != null || IPv6Prefix != null || EnableCloud != null)
                 {
-                    WriteVerbose(Resources.NetworkConfigData0AllowedSettings);
-                    return false;
+                    throw new ArgumentException(Resources.NetworkConfigData0AllowedSettings);
                 }
             }
             // On other interfaces (non-Data0), Controller0 and Controller1 IP Addresses cannot be set
             else
             {
                 if (Controller0IPv4Address != null || Controller1IPv4Address != null)
                 {
-                    WriteVerbose(Resources.NetworkConfigControllerIPsNotAllowedOnOthers);
-                    return false;
+                    throw new ArgumentException(Resources.NetworkConfigControllerIPsNotAllowedOnOthers);
                 }
             }
-
-            return true;
         }
-
     }
 }
 
diff --git a/src/ServiceManagement/StorSimple/Commands.StorSimple/Cmdlets/DeviceDetails/SetAzureStorSimpleDevice.cs b/src/ServiceManagement/StorSimple/Commands.StorSimple/Cmdlets/DeviceDetails/SetAzureStorSimpleDevice.cs
@@ -82,35 +82,25 @@ public override void ExecuteCmdlet()
             try
             {
                 // Make sure params were supplied appropriately.
-                if (!ProcessParameters())
-                {
-                    return;
-                }
+                ProcessParameters();
 
                 // Get the current device details.
                 var deviceDetails = StorSimpleClient.GetDeviceDetails(DeviceId);
 
                 if (deviceDetails == null)
                 {
-                    WriteVerbose(string.Format(Resources.NoDeviceFoundWithGivenIdInResourceMessage, StorSimpleContext.ResourceName, DeviceId));
-                    WriteObject(null);
-                    return;
+                    throw new ArgumentException(string.Format(Resources.NoDeviceFoundWithGivenIdInResourceMessage, StorSimpleContext.ResourceName, DeviceId));
                 }
 
                 // If the device is being configured for the first time, validate that mandatory params 
                 // for first setup have been provided
                 if (!deviceDetails.DeviceProperties.IsConfigUpdated && !ValidParamsForFirstDeviceConfiguration(StorSimpleNetworkConfig, TimeZone, SecondaryDnsServer))
                 {
-                    WriteVerbose(Resources.MandatoryParamsMissingForInitialDeviceConfiguration);
-                    WriteObject(null);
-                    return;
-                }
-
-                if (!this.ValidateNetworkConfigs(deviceDetails, StorSimpleNetworkConfig))
-                {
-                    return;
+                    throw new ArgumentException(Resources.MandatoryParamsMissingForInitialDeviceConfiguration);
                 }
 
+                // Validate Network configs - this method throws an exception if any validation fails
+                ValidateNetworkConfigs(deviceDetails, StorSimpleNetworkConfig);
                 
                 WriteVerbose(string.Format(Resources.BeginningDeviceConfiguration, deviceDetails.DeviceProperties.FriendlyName));
 
@@ -133,7 +123,7 @@ public override void ExecuteCmdlet()
             }
         }
 
-        private bool ProcessParameters()
+        private void ProcessParameters()
         {
             // Make sure that atleast one of the settings has been provided.
             // Its no use making a request when the user didnt specify any of
@@ -151,17 +141,11 @@ private bool ProcessParameters()
                 var deviceId = StorSimpleClient.GetDeviceId(DeviceName);
                 if (deviceId == null)
                 {
-                    WriteVerbose(string.Format(Resources.NoDeviceFoundWithGivenNameInResourceMessage, StorSimpleContext.ResourceName, DeviceName));
-                    WriteObject(null);
-                    return false;
+                    throw new ArgumentException(string.Format(Resources.NoDeviceFoundWithGivenNameInResourceMessage, StorSimpleContext.ResourceName, DeviceName));
                 }
                 DeviceId = deviceId;
             }
-            if (!TrySetIPAddress(SecondaryDnsServer, out secondaryDnsServer, "SecondaryDnsServer"))
-            {
-                return false;
-            }
-            return true;
+            TrySetIPAddress(SecondaryDnsServer, out secondaryDnsServer, "SecondaryDnsServer");
         }
     }
 }
diff --git a/src/ServiceManagement/StorSimple/Commands.StorSimple/Cmdlets/DeviceDetails/SetAzureStorSimpleVirtualDevice.cs b/src/ServiceManagement/StorSimple/Commands.StorSimple/Cmdlets/DeviceDetails/SetAzureStorSimpleVirtualDevice.cs
@@ -77,9 +77,7 @@ public override void ExecuteCmdlet()
                 var deviceId = StorSimpleClient.GetDeviceId(DeviceName);
                 if (deviceId == null)
                 {
-                    WriteVerbose(string.Format(Resources.NoDeviceFoundWithGivenNameInResourceMessage, StorSimpleContext.ResourceName, DeviceName));
-                    WriteObject(null);
-                    return;
+                    throw new ArgumentException(string.Format(Resources.NoDeviceFoundWithGivenNameInResourceMessage, StorSimpleContext.ResourceName, DeviceName));
                 }
 
                 // Get the current device details. ( If we found id from the name, this call is bound to succeed)
diff --git a/src/ServiceManagement/StorSimple/Commands.StorSimple/Cmdlets/DeviceJobs/GetAzureStorSimpleJob.cs b/src/ServiceManagement/StorSimple/Commands.StorSimple/Cmdlets/DeviceJobs/GetAzureStorSimpleJob.cs
@@ -103,10 +103,7 @@ public override void ExecuteCmdlet()
             try
             {
                 // Make sure params were supplied appropriately.
-                if (!ProcessParameters())
-                {
-                    return;
-                }
+                ProcessParameters();
 
                 // Make call to get device jobs.
                 var response = StorSimpleClient.GetDeviceJobs(deviceId, Type, Status, InstanceId, fromDateTimeIsoString, toDateTimeIsoString, (int)Skip, (int)First);
@@ -115,9 +112,7 @@ public override void ExecuteCmdlet()
                 {
                     if (response == null || response.DeviceJobList.Count < 1)
                     {
-                        WriteVerbose(string.Format(Resources.NoDeviceJobFoundWithGivenIdMessage, InstanceId));
-                        WriteObject(null);
-                        return;
+                        throw new ArgumentException(string.Format(Resources.NoDeviceJobFoundWithGivenIdMessage, InstanceId));
                     }
                     WriteObject(response.DeviceJobList.First());
                     return;
@@ -155,7 +150,7 @@ public override void ExecuteCmdlet()
             }
         }
 
-        private bool ProcessParameters()
+        private void ProcessParameters()
         {
             // Default values for first and skip are 0
             First = First ?? 0;
@@ -174,13 +169,9 @@ private bool ProcessParameters()
                 deviceId = StorSimpleClient.GetDeviceId(DeviceName);
                 if (deviceId == null)
                 {
-                    WriteVerbose(string.Format(Resources.NoDeviceFoundWithGivenNameInResourceMessage,StorSimpleContext.ResourceName, DeviceName));
-                    WriteObject(null);
-                    return false;
+                    throw new ArgumentException(string.Format(Resources.NoDeviceFoundWithGivenNameInResourceMessage,StorSimpleContext.ResourceName, DeviceName));
                 }
             }
-
-            return true;
         }
     }
 }
diff --git a/src/ServiceManagement/StorSimple/Commands.StorSimple/Cmdlets/DeviceJobs/StopAzureStorSimpleJob.cs b/src/ServiceManagement/StorSimple/Commands.StorSimple/Cmdlets/DeviceJobs/StopAzureStorSimpleJob.cs
@@ -57,17 +57,13 @@ public override void ExecuteCmdlet()
                       var deviceJobDetails = StorSimpleClient.GetDeviceJobById(InstanceId);
                       if (deviceJobDetails == null)
                       {
-                          WriteVerbose(string.Format(Resources.NoDeviceJobFoundWithGivenIdMessage, InstanceId));
-                          WriteObject(null);
-                          return;
+                          throw new ArgumentException(string.Format(Resources.NoDeviceJobFoundWithGivenIdMessage, InstanceId));
                       }
 
                       // Make sure the job is running and cancellable, else fail.
                       if (!(deviceJobDetails.IsJobCancellable && deviceJobDetails.Status == "Running"))
                       {
-                          WriteVerbose(string.Format(Resources.JobNotRunningOrCancellable, InstanceId));
-                          WriteObject(null);
-                          return;
+                          throw new ArgumentException(string.Format(Resources.JobNotRunningOrCancellable, InstanceId));
                       }
 
                       // issue call to cancel the job.
diff --git a/src/ServiceManagement/StorSimple/Commands.StorSimple/StorSimpleCmdletBase.cs b/src/ServiceManagement/StorSimple/Commands.StorSimple/StorSimpleCmdletBase.cs
@@ -414,12 +414,11 @@ internal Exception GetGenericException(string exceptionMessage, Exception innerE
         /// Its mandatory to provide either (IPv4 Address and netmask) or IPv6 orefix for an interface that
         /// is being enabled. ( Was previously disabled and is now being configured)
         /// </summary>
-        /// <returns></returns>
-        internal bool ValidateNetworkConfigs(DeviceDetails details, NetworkConfig[] StorSimpleNetworkConfig)
+        internal void ValidateNetworkConfigs(DeviceDetails details, NetworkConfig[] StorSimpleNetworkConfig)
         {
             if (StorSimpleNetworkConfig == null)
             {
-                return true;
+                return;
             }
             foreach (var netConfig in StorSimpleNetworkConfig)
             {
@@ -431,13 +430,10 @@ internal bool ValidateNetworkConfigs(DeviceDetails details, NetworkConfig[] Stor
                     // If its not an enabled interface either IPv6(prefix) or IPv4(address and mask) must be provided.
                     if ((netConfig.IPv4Address == null || netConfig.IPv4Netmask == null) && netConfig.IPv6Prefix == null)
                     {
-                        WriteVerbose(string.Format(Resources.IPAddressesNotProvidedForNetInterfaceBeingEnabled, StorSimpleContext.ResourceName, details.DeviceProperties.DeviceId));
-                        WriteObject(null);
-                        return false;
+                        throw new ArgumentException(string.Format(Resources.IPAddressesNotProvidedForNetInterfaceBeingEnabled, StorSimpleContext.ResourceName, details.DeviceProperties.DeviceId));
                     }
                 }
             }
-            return true;
         }
 
         /// <summary>
@@ -446,23 +442,21 @@ internal bool ValidateNetworkConfigs(DeviceDetails details, NetworkConfig[] Stor
         /// <param name="data">IP Address string</param>
         /// <param name="ipAddress"></param>
         /// <param name="paramName">Name of the param which is being processed (to be used for errors)</param>
-        internal bool TrySetIPAddress(string data, out IPAddress ipAddress, string paramName)
+        internal void TrySetIPAddress(string data, out IPAddress ipAddress, string paramName)
         {
             if (data == null)
             {
                 ipAddress = null;
-                return true;
+                return;
             }
             try
             {
                 ipAddress = IPAddress.Parse(data);
-                return true;
             }
             catch (FormatException)
             {
                 ipAddress = null;
-                WriteVerbose(string.Format(Resources.InvalidIPAddressProvidedMessage, paramName));
-                return false;
+                throw new ArgumentException(string.Format(Resources.InvalidIPAddressProvidedMessage, paramName));
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -114,13 +114,9 @@ public class NewAzureStorSimpleNetworkConfig : StorSimpleCmdletBase`
`114`	`114`
`115`	`115`	`public override void ExecuteCmdlet()`
`116`	`116`	`{`
`117`		`- if (!ProcessParameters())`
`118`		`- {`
`119`		`- WriteObject(null);`
`120`		`- return;`
`121`		`- }`
`122`	`117`	`try`
`123`	`118`	`{`
	`119`	`+ ProcessParameters();`
`124`	`120`	`var netConfig = new NetworkConfig`
`125`	`121`	`{`
`126`	`122`	`IsIscsiEnabled = EnableIscsi,`
`@@ -145,63 +141,39 @@ public override void ExecuteCmdlet()`
`145`	`141`	`}`
`146`	`142`	`}`
`147`	`143`
`148`		`- private bool ProcessParameters(){`
	`144`	`+ private void ProcessParameters(){`
`149`	`145`	`// parse interfaceAlias`
`150`	`146`	`if (!Enum.TryParse<NetInterfaceId>(InterfaceAlias, out interfaceAlias))`
`151`	`147`	`{`
`152`		`- WriteVerbose(string.Format(Resources.InvalidInterfaceId, InterfaceAlias));`
`153`		`- return false;`
	`148`	`+ throw new ArgumentException(string.Format(Resources.InvalidInterfaceId, InterfaceAlias));`
`154`	`149`	`}`
`155`	`150`
`156`	`151`	`// Try and set all the IP address`
`157`		`- if (!TrySetIPAddress(Controller0IPv4Address, out controller0Address, "Controller0IPv4Address"))`
`158`		`- {`
`159`		`- return false;`
`160`		`- }`
`161`		`- if (!TrySetIPAddress(Controller1IPv4Address, out controller1Address, "Controller1IPv4Address"))`
`162`		`- {`
`163`		`- return false;`
`164`		`- }`
`165`		`- if (!TrySetIPAddress(IPv4Address, out ipv4Address, "IPv4Address"))`
`166`		`- {`
`167`		`- return false;`
`168`		`- }`
`169`		`- if (!TrySetIPAddress(IPv4Gateway, out ipv4Gateway, "IPv4Gateway"))`
`170`		`- {`
`171`		`- return false;`
`172`		`- }`
`173`		`- if (!TrySetIPAddress(IPv4Netmask, out ipv4Netmask, "IPv4Netmask"))`
`174`		`- {`
`175`		`- return false;`
`176`		`- }`
`177`		`- if(!TrySetIPAddress(IPv6Gateway, out ipv6Gateway, "IPv6Gateway"))`
`178`		`- {`
`179`		`- return false;`
`180`		`- }`
	`152`	`+ TrySetIPAddress(Controller0IPv4Address, out controller0Address, "Controller0IPv4Address");`
	`153`	`+ TrySetIPAddress(Controller1IPv4Address, out controller1Address, "Controller1IPv4Address");`
	`154`	`+ TrySetIPAddress(IPv4Address, out ipv4Address, "IPv4Address");`
	`155`	`+ TrySetIPAddress(IPv4Gateway, out ipv4Gateway, "IPv4Gateway");`
	`156`	`+ TrySetIPAddress(IPv4Netmask, out ipv4Netmask, "IPv4Netmask");`
	`157`	`+ TrySetIPAddress(IPv6Gateway, out ipv6Gateway, "IPv6Gateway");`
`181`	`158`
`182`	`159`	`// Only EnableIscsi, Controller0 and controller1 IP Addresses can be set on Data0`
`183`	`160`	`if (InterfaceAlias == NetInterfaceId.Data0.ToString())`
`184`	`161`	`{`
`185`	`162`	`if(IPv4Address != null \|\| IPv4Gateway != null \|\| IPv4Netmask != null`
`186`	`163`	`&& IPv6Gateway != null \|\| IPv6Prefix != null \|\| EnableCloud != null)`
`187`	`164`	`{`
`188`		`- WriteVerbose(Resources.NetworkConfigData0AllowedSettings);`
`189`		`- return false;`
	`165`	`+ throw new ArgumentException(Resources.NetworkConfigData0AllowedSettings);`
`190`	`166`	`}`
`191`	`167`	`}`
`192`	`168`	`// On other interfaces (non-Data0), Controller0 and Controller1 IP Addresses cannot be set`
`193`	`169`	`else`
`194`	`170`	`{`
`195`	`171`	`if (Controller0IPv4Address != null \|\| Controller1IPv4Address != null)`
`196`	`172`	`{`
`197`		`- WriteVerbose(Resources.NetworkConfigControllerIPsNotAllowedOnOthers);`
`198`		`- return false;`
	`173`	`+ throw new ArgumentException(Resources.NetworkConfigControllerIPsNotAllowedOnOthers);`
`199`	`174`	`}`
`200`	`175`	`}`
`201`		`-`
`202`		`- return true;`
`203`	`176`	`}`
`204`		`-`
`205`	`177`	`}`
`206`	`178`	`}`
`207`	`179`
Original file line number	Diff line number	Diff line change
`@@ -82,35 +82,25 @@ public override void ExecuteCmdlet()`
`82`	`82`	`try`
`83`	`83`	`{`
`84`	`84`	`// Make sure params were supplied appropriately.`
`85`		`- if (!ProcessParameters())`
`86`		`- {`
`87`		`- return;`
`88`		`- }`
	`85`	`+ ProcessParameters();`
`89`	`86`
`90`	`87`	`// Get the current device details.`
`91`	`88`	`var deviceDetails = StorSimpleClient.GetDeviceDetails(DeviceId);`
`92`	`89`
`93`	`90`	`if (deviceDetails == null)`
`94`	`91`	`{`
`95`		`- WriteVerbose(string.Format(Resources.NoDeviceFoundWithGivenIdInResourceMessage, StorSimpleContext.ResourceName, DeviceId));`
`96`		`- WriteObject(null);`
`97`		`- return;`
	`92`	`+ throw new ArgumentException(string.Format(Resources.NoDeviceFoundWithGivenIdInResourceMessage, StorSimpleContext.ResourceName, DeviceId));`
`98`	`93`	`}`
`99`	`94`
`100`	`95`	`// If the device is being configured for the first time, validate that mandatory params`
`101`	`96`	`// for first setup have been provided`
`102`	`97`	`if (!deviceDetails.DeviceProperties.IsConfigUpdated && !ValidParamsForFirstDeviceConfiguration(StorSimpleNetworkConfig, TimeZone, SecondaryDnsServer))`
`103`	`98`	`{`
`104`		`- WriteVerbose(Resources.MandatoryParamsMissingForInitialDeviceConfiguration);`
`105`		`- WriteObject(null);`
`106`		`- return;`
`107`		`- }`
`108`		`-`
`109`		`- if (!this.ValidateNetworkConfigs(deviceDetails, StorSimpleNetworkConfig))`
`110`		`- {`
`111`		`- return;`
	`99`	`+ throw new ArgumentException(Resources.MandatoryParamsMissingForInitialDeviceConfiguration);`
`112`	`100`	`}`
`113`	`101`
	`102`	`+ // Validate Network configs - this method throws an exception if any validation fails`
	`103`	`+ ValidateNetworkConfigs(deviceDetails, StorSimpleNetworkConfig);`
`114`	`104`
`115`	`105`	`WriteVerbose(string.Format(Resources.BeginningDeviceConfiguration, deviceDetails.DeviceProperties.FriendlyName));`
`116`	`106`
`@@ -133,7 +123,7 @@ public override void ExecuteCmdlet()`
`133`	`123`	`}`
`134`	`124`	`}`
`135`	`125`
`136`		`- private bool ProcessParameters()`
	`126`	`+ private void ProcessParameters()`
`137`	`127`	`{`
`138`	`128`	`// Make sure that atleast one of the settings has been provided.`
`139`	`129`	`// Its no use making a request when the user didnt specify any of`
`@@ -151,17 +141,11 @@ private bool ProcessParameters()`
`151`	`141`	`var deviceId = StorSimpleClient.GetDeviceId(DeviceName);`
`152`	`142`	`if (deviceId == null)`
`153`	`143`	`{`
`154`		`- WriteVerbose(string.Format(Resources.NoDeviceFoundWithGivenNameInResourceMessage, StorSimpleContext.ResourceName, DeviceName));`
`155`		`- WriteObject(null);`
`156`		`- return false;`
	`144`	`+ throw new ArgumentException(string.Format(Resources.NoDeviceFoundWithGivenNameInResourceMessage, StorSimpleContext.ResourceName, DeviceName));`
`157`	`145`	`}`
`158`	`146`	`DeviceId = deviceId;`
`159`	`147`	`}`
`160`		`- if (!TrySetIPAddress(SecondaryDnsServer, out secondaryDnsServer, "SecondaryDnsServer"))`
`161`		`- {`
`162`		`- return false;`
`163`		`- }`
`164`		`- return true;`
	`148`	`+ TrySetIPAddress(SecondaryDnsServer, out secondaryDnsServer, "SecondaryDnsServer");`
`165`	`149`	`}`
`166`	`150`	`}`
`167`	`151`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,9 +77,7 @@ public override void ExecuteCmdlet()`
`77`	`77`	`var deviceId = StorSimpleClient.GetDeviceId(DeviceName);`
`78`	`78`	`if (deviceId == null)`
`79`	`79`	`{`
`80`		`- WriteVerbose(string.Format(Resources.NoDeviceFoundWithGivenNameInResourceMessage, StorSimpleContext.ResourceName, DeviceName));`
`81`		`- WriteObject(null);`
`82`		`- return;`
	`80`	`+ throw new ArgumentException(string.Format(Resources.NoDeviceFoundWithGivenNameInResourceMessage, StorSimpleContext.ResourceName, DeviceName));`
`83`	`81`	`}`
`84`	`82`
`85`	`83`	`// Get the current device details. ( If we found id from the name, this call is bound to succeed)`
Original file line number	Diff line number	Diff line change
`@@ -103,10 +103,7 @@ public override void ExecuteCmdlet()`
`103`	`103`	`try`
`104`	`104`	`{`
`105`	`105`	`// Make sure params were supplied appropriately.`
`106`		`- if (!ProcessParameters())`
`107`		`- {`
`108`		`- return;`
`109`		`- }`
	`106`	`+ ProcessParameters();`
`110`	`107`
`111`	`108`	`// Make call to get device jobs.`
`112`	`109`	`var response = StorSimpleClient.GetDeviceJobs(deviceId, Type, Status, InstanceId, fromDateTimeIsoString, toDateTimeIsoString, (int)Skip, (int)First);`
`@@ -115,9 +112,7 @@ public override void ExecuteCmdlet()`
`115`	`112`	`{`
`116`	`113`	`if (response == null \|\| response.DeviceJobList.Count < 1)`
`117`	`114`	`{`
`118`		`- WriteVerbose(string.Format(Resources.NoDeviceJobFoundWithGivenIdMessage, InstanceId));`
`119`		`- WriteObject(null);`
`120`		`- return;`
	`115`	`+ throw new ArgumentException(string.Format(Resources.NoDeviceJobFoundWithGivenIdMessage, InstanceId));`
`121`	`116`	`}`
`122`	`117`	`WriteObject(response.DeviceJobList.First());`
`123`	`118`	`return;`
`@@ -155,7 +150,7 @@ public override void ExecuteCmdlet()`
`155`	`150`	`}`
`156`	`151`	`}`
`157`	`152`
`158`		`- private bool ProcessParameters()`
	`153`	`+ private void ProcessParameters()`
`159`	`154`	`{`
`160`	`155`	`// Default values for first and skip are 0`
`161`	`156`	`First = First ?? 0;`
`@@ -174,13 +169,9 @@ private bool ProcessParameters()`
`174`	`169`	`deviceId = StorSimpleClient.GetDeviceId(DeviceName);`
`175`	`170`	`if (deviceId == null)`
`176`	`171`	`{`
`177`		`- WriteVerbose(string.Format(Resources.NoDeviceFoundWithGivenNameInResourceMessage,StorSimpleContext.ResourceName, DeviceName));`
`178`		`- WriteObject(null);`
`179`		`- return false;`
	`172`	`+ throw new ArgumentException(string.Format(Resources.NoDeviceFoundWithGivenNameInResourceMessage,StorSimpleContext.ResourceName, DeviceName));`
`180`	`173`	`}`
`181`	`174`	`}`
`182`		`-`
`183`		`- return true;`
`184`	`175`	`}`
`185`	`176`	`}`
`186`	`177`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,17 +57,13 @@ public override void ExecuteCmdlet()`
`57`	`57`	`var deviceJobDetails = StorSimpleClient.GetDeviceJobById(InstanceId);`
`58`	`58`	`if (deviceJobDetails == null)`
`59`	`59`	`{`
`60`		`- WriteVerbose(string.Format(Resources.NoDeviceJobFoundWithGivenIdMessage, InstanceId));`
`61`		`- WriteObject(null);`
`62`		`- return;`
	`60`	`+ throw new ArgumentException(string.Format(Resources.NoDeviceJobFoundWithGivenIdMessage, InstanceId));`
`63`	`61`	`}`
`64`	`62`
`65`	`63`	`// Make sure the job is running and cancellable, else fail.`
`66`	`64`	`if (!(deviceJobDetails.IsJobCancellable && deviceJobDetails.Status == "Running"))`
`67`	`65`	`{`
`68`		`- WriteVerbose(string.Format(Resources.JobNotRunningOrCancellable, InstanceId));`
`69`		`- WriteObject(null);`
`70`		`- return;`
	`66`	`+ throw new ArgumentException(string.Format(Resources.JobNotRunningOrCancellable, InstanceId));`
`71`	`67`	`}`
`72`	`68`
`73`	`69`	`// issue call to cancel the job.`
Original file line number	Diff line number	Diff line change
`@@ -414,12 +414,11 @@ internal Exception GetGenericException(string exceptionMessage, Exception innerE`
`414`	`414`	`/// Its mandatory to provide either (IPv4 Address and netmask) or IPv6 orefix for an interface that`
`415`	`415`	`/// is being enabled. ( Was previously disabled and is now being configured)`
`416`	`416`	`/// </summary>`
`417`		`- /// <returns></returns>`
`418`		`- internal bool ValidateNetworkConfigs(DeviceDetails details, NetworkConfig[] StorSimpleNetworkConfig)`
	`417`	`+ internal void ValidateNetworkConfigs(DeviceDetails details, NetworkConfig[] StorSimpleNetworkConfig)`
`419`	`418`	`{`
`420`	`419`	`if (StorSimpleNetworkConfig == null)`
`421`	`420`	`{`
`422`		`- return true;`
	`421`	`+ return;`
`423`	`422`	`}`
`424`	`423`	`foreach (var netConfig in StorSimpleNetworkConfig)`
`425`	`424`	`{`
`@@ -431,13 +430,10 @@ internal bool ValidateNetworkConfigs(DeviceDetails details, NetworkConfig[] Stor`
`431`	`430`	`// If its not an enabled interface either IPv6(prefix) or IPv4(address and mask) must be provided.`
`432`	`431`	`if ((netConfig.IPv4Address == null \|\| netConfig.IPv4Netmask == null) && netConfig.IPv6Prefix == null)`
`433`	`432`	`{`
`434`		`- WriteVerbose(string.Format(Resources.IPAddressesNotProvidedForNetInterfaceBeingEnabled, StorSimpleContext.ResourceName, details.DeviceProperties.DeviceId));`
`435`		`- WriteObject(null);`
`436`		`- return false;`
	`433`	`+ throw new ArgumentException(string.Format(Resources.IPAddressesNotProvidedForNetInterfaceBeingEnabled, StorSimpleContext.ResourceName, details.DeviceProperties.DeviceId));`
`437`	`434`	`}`
`438`	`435`	`}`
`439`	`436`	`}`
`440`		`- return true;`
`441`	`437`	`}`
`442`	`438`
`443`	`439`	`/// <summary>`
`@@ -446,23 +442,21 @@ internal bool ValidateNetworkConfigs(DeviceDetails details, NetworkConfig[] Stor`
`446`	`442`	`/// <param name="data">IP Address string</param>`
`447`	`443`	`/// <param name="ipAddress"></param>`
`448`	`444`	`/// <param name="paramName">Name of the param which is being processed (to be used for errors)</param>`
`449`		`- internal bool TrySetIPAddress(string data, out IPAddress ipAddress, string paramName)`
	`445`	`+ internal void TrySetIPAddress(string data, out IPAddress ipAddress, string paramName)`
`450`	`446`	`{`
`451`	`447`	`if (data == null)`
`452`	`448`	`{`
`453`	`449`	`ipAddress = null;`
`454`		`- return true;`
	`450`	`+ return;`
`455`	`451`	`}`
`456`	`452`	`try`
`457`	`453`	`{`
`458`	`454`	`ipAddress = IPAddress.Parse(data);`
`459`		`- return true;`
`460`	`455`	`}`
`461`	`456`	`catch (FormatException)`
`462`	`457`	`{`
`463`	`458`	`ipAddress = null;`
`464`		`- WriteVerbose(string.Format(Resources.InvalidIPAddressProvidedMessage, paramName));`
`465`		`- return false;`
	`459`	`+ throw new ArgumentException(string.Format(Resources.InvalidIPAddressProvidedMessage, paramName));`
`466`	`460`	`}`
`467`	`461`	`}`
`468`	`462`