Merge pull request #57 from AzCiS/LAMigration

parvezah · parvezah · commit f15a12c2f75b · 2015-04-21T15:42:25.000+05:30
Migration cmdlet fixes
diff --git a/src/ServiceManagement/StorSimple/Commands.StorSimple/Cmdlets/Migration/ConfirmAzureStorSimpleLegacyVolumeContainerStatus.cs b/src/ServiceManagement/StorSimple/Commands.StorSimple/Cmdlets/Migration/ConfirmAzureStorSimpleLegacyVolumeContainerStatus.cs
@@ -46,7 +46,7 @@ public override void ExecuteCmdlet()
                 confirmMigrationRequest.Operation =
                     (MigrationOperation) Enum.Parse(typeof (MigrationOperation), MigrationOperation, true);
                 confirmMigrationRequest.DataContainerNameList = (null != LegacyContainerNames)
-                    ? new List<string>(LegacyContainerNames.ToList().Distinct())
+                    ? new List<string>(LegacyContainerNames.ToList().Distinct(StringComparer.InvariantCultureIgnoreCase))
                     : new List<string>();
                 var status = StorSimpleClient.ConfirmLegacyVolumeContainerStatus(LegacyConfigId, confirmMigrationRequest);
                 MigrationCommonModelFormatter opFormatter = new MigrationCommonModelFormatter();
diff --git a/src/ServiceManagement/StorSimple/Commands.StorSimple/Cmdlets/Migration/GetAzureStorSimpleLegacyVolumeContainerConfirmStatus.cs b/src/ServiceManagement/StorSimple/Commands.StorSimple/Cmdlets/Migration/GetAzureStorSimpleLegacyVolumeContainerConfirmStatus.cs
@@ -42,7 +42,9 @@ public override void ExecuteCmdlet()
                     {
                         var legacyContainerNameList = LegacyContainerNames.ToList();
                         confirmStatus.ContainerConfirmStatus = confirmStatus.ContainerConfirmStatus.ToList().FindAll(
-                            status => legacyContainerNameList.Contains(status.CloudConfigurationName));
+                            status =>
+                                legacyContainerNameList.Contains(status.CloudConfigurationName,
+                                    StringComparer.InvariantCultureIgnoreCase));
                     }
                 }
 
diff --git a/src/ServiceManagement/StorSimple/Commands.StorSimple/Cmdlets/Migration/GetAzureStorSimpleLegacyVolumeContainerMigrationPlan.cs b/src/ServiceManagement/StorSimple/Commands.StorSimple/Cmdlets/Migration/GetAzureStorSimpleLegacyVolumeContainerMigrationPlan.cs
@@ -41,7 +41,7 @@ public override void ExecuteCmdlet()
                     var migrationPlanList = StorSimpleClient.GetAllMigrationPlan();
                     if (migrationPlanList.MigrationPlans.Count == 0)
                     {
-                        throw new ArgumentException(Resources.MigrationPlanNoConfigs);
+                        WriteWarning(Resources.MigrationPlanNoConfigs);
                     }
                     else
                     {
@@ -68,7 +68,9 @@ public override void ExecuteCmdlet()
                             var legacyContainerNamesList = LegacyContainerNames.ToList();
                             migrationPlan.MigrationPlanInfo =
                                 migrationPlan.MigrationPlanInfo.ToList().FindAll(
-                                    plan => legacyContainerNamesList.Contains(plan.DataContainerName));
+                                    plan =>
+                                        legacyContainerNamesList.Contains(plan.DataContainerName,
+                                            StringComparer.InvariantCultureIgnoreCase));
                         }
 
                         var migrationPlanMsg = new MigrationPlanMsg(migrationPlan);
diff --git a/src/ServiceManagement/StorSimple/Commands.StorSimple/Cmdlets/Migration/GetAzureStorSimpleLegacyVolumeContainerStatus.cs b/src/ServiceManagement/StorSimple/Commands.StorSimple/Cmdlets/Migration/GetAzureStorSimpleLegacyVolumeContainerStatus.cs
@@ -41,9 +41,12 @@ public override void ExecuteCmdlet()
                     overallMigrationStatusList.MigrationDataContainerStatuses.ToList();
                 if (null != LegacyContainerNames && 0 < LegacyContainerNames.Length)
                 {
-                    List<string> containerNameList = LegacyContainerNames.ToList();
+
+                    var containerNameList = LegacyContainerNames.ToList();
                     migrationDataContainerStatusList = migrationDataContainerStatusList.ToList().FindAll(
-                        status => containerNameList.Contains(status.CloudConfigurationName));
+                        status =>
+                            containerNameList.Contains(status.CloudConfigurationName,
+                                StringComparer.InvariantCultureIgnoreCase));
                 }
 
                 var migrationStatus = new DataContainerMigrationStatus(
diff --git a/src/ServiceManagement/StorSimple/Commands.StorSimple/Cmdlets/Migration/ImportAzureStorSimpleLegacyVolumeContainer.cs b/src/ServiceManagement/StorSimple/Commands.StorSimple/Cmdlets/Migration/ImportAzureStorSimpleLegacyVolumeContainer.cs
@@ -46,7 +46,7 @@ public override void ExecuteCmdlet()
             {
                 var importDataContainerRequest = new MigrationImportDataContainerRequest();
                 importDataContainerRequest.DataContainerNames = (null != LegacyContainerNames)
-                    ? new List<string>(LegacyContainerNames.ToList().Distinct())
+                    ? new List<string>(LegacyContainerNames.ToList().Distinct(StringComparer.InvariantCultureIgnoreCase))
                     : new List<string>();
                 importDataContainerRequest.ForceOnOtherDevice = Force.IsPresent;
                 importDataContainerRequest.SkipACRs = SkipACRs.IsPresent;
diff --git a/src/ServiceManagement/StorSimple/Commands.StorSimple/Cmdlets/Migration/StartAzureStorSimpleLegacyVolumeContainerMigrationPlan.cs b/src/ServiceManagement/StorSimple/Commands.StorSimple/Cmdlets/Migration/StartAzureStorSimpleLegacyVolumeContainerMigrationPlan.cs
@@ -40,7 +40,7 @@ public override void ExecuteCmdlet()
                 var startMigrationPlanRequest = new MigrationPlanStartRequest();
                 startMigrationPlanRequest.ConfigId = LegacyConfigId;
                 startMigrationPlanRequest.DataContainerNameList = (null != LegacyContainerNames)
-                    ? new List<string>(LegacyContainerNames.ToList().Distinct())
+                    ? new List<string>(LegacyContainerNames.ToList().Distinct(StringComparer.InvariantCultureIgnoreCase))
                     : new List<string>();
 
                 var status = StorSimpleClient.StartLegacyVolumeContainerMigrationPlan(startMigrationPlanRequest);
diff --git a/src/ServiceManagement/StorSimple/Commands.StorSimple/Properties/Resources.Designer.cs b/src/ServiceManagement/StorSimple/Commands.StorSimple/Properties/Resources.Designer.cs
diff --git a/src/ServiceManagement/StorSimple/Commands.StorSimple/Properties/Resources.resx b/src/ServiceManagement/StorSimple/Commands.StorSimple/Properties/Resources.resx
@@ -566,7 +566,7 @@ a special character</value>
     <value>Import started. You can check the import status with Get-AzureStorSimpleLegacyVolumeContainerStatus cmdlet.</value>
   </data>
   <data name="MigrationPlanNoConfigs" xml:space="preserve">
-    <value>There are no configs on the resource.</value>
+    <value>No ConfigFile imported.</value>
   </data>
   <data name="MigrationPlanNotFound" xml:space="preserve">
     <value>No migration plan found corresponding to the LegacyConfigId.</value>

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,9 @@ public override void ExecuteCmdlet()`
`42`	`42`	`{`
`43`	`43`	`var legacyContainerNameList = LegacyContainerNames.ToList();`
`44`	`44`	`confirmStatus.ContainerConfirmStatus = confirmStatus.ContainerConfirmStatus.ToList().FindAll(`
`45`		`- status => legacyContainerNameList.Contains(status.CloudConfigurationName));`
	`45`	`+ status =>`
	`46`	`+ legacyContainerNameList.Contains(status.CloudConfigurationName,`
	`47`	`+ StringComparer.InvariantCultureIgnoreCase));`
`46`	`48`	`}`
`47`	`49`	`}`
`48`	`50`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public override void ExecuteCmdlet()`
`41`	`41`	`var migrationPlanList = StorSimpleClient.GetAllMigrationPlan();`
`42`	`42`	`if (migrationPlanList.MigrationPlans.Count == 0)`
`43`	`43`	`{`
`44`		`- throw new ArgumentException(Resources.MigrationPlanNoConfigs);`
	`44`	`+ WriteWarning(Resources.MigrationPlanNoConfigs);`
`45`	`45`	`}`
`46`	`46`	`else`
`47`	`47`	`{`
`@@ -68,7 +68,9 @@ public override void ExecuteCmdlet()`
`68`	`68`	`var legacyContainerNamesList = LegacyContainerNames.ToList();`
`69`	`69`	`migrationPlan.MigrationPlanInfo =`
`70`	`70`	`migrationPlan.MigrationPlanInfo.ToList().FindAll(`
`71`		`- plan => legacyContainerNamesList.Contains(plan.DataContainerName));`
	`71`	`+ plan =>`
	`72`	`+ legacyContainerNamesList.Contains(plan.DataContainerName,`
	`73`	`+ StringComparer.InvariantCultureIgnoreCase));`
`72`	`74`	`}`
`73`	`75`
`74`	`76`	`var migrationPlanMsg = new MigrationPlanMsg(migrationPlan);`
Original file line number	Diff line number	Diff line change
`@@ -41,9 +41,12 @@ public override void ExecuteCmdlet()`
`41`	`41`	`overallMigrationStatusList.MigrationDataContainerStatuses.ToList();`
`42`	`42`	`if (null != LegacyContainerNames && 0 < LegacyContainerNames.Length)`
`43`	`43`	`{`
`44`		`- List<string> containerNameList = LegacyContainerNames.ToList();`
	`44`	`+`
	`45`	`+ var containerNameList = LegacyContainerNames.ToList();`
`45`	`46`	`migrationDataContainerStatusList = migrationDataContainerStatusList.ToList().FindAll(`
`46`		`- status => containerNameList.Contains(status.CloudConfigurationName));`
	`47`	`+ status =>`
	`48`	`+ containerNameList.Contains(status.CloudConfigurationName,`
	`49`	`+ StringComparer.InvariantCultureIgnoreCase));`
`47`	`50`	`}`
`48`	`51`
`49`	`52`	`var migrationStatus = new DataContainerMigrationStatus(`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public override void ExecuteCmdlet()`
`46`	`46`	`{`
`47`	`47`	`var importDataContainerRequest = new MigrationImportDataContainerRequest();`
`48`	`48`	`importDataContainerRequest.DataContainerNames = (null != LegacyContainerNames)`
`49`		`- ? new List<string>(LegacyContainerNames.ToList().Distinct())`
	`49`	`+ ? new List<string>(LegacyContainerNames.ToList().Distinct(StringComparer.InvariantCultureIgnoreCase))`
`50`	`50`	`: new List<string>();`
`51`	`51`	`importDataContainerRequest.ForceOnOtherDevice = Force.IsPresent;`
`52`	`52`	`importDataContainerRequest.SkipACRs = SkipACRs.IsPresent;`