Merge pull request #46 from huangpf/dev

Dev

Author: AzureRT

src/ServiceManagement/Common/Commands.ScenarioTest/Resources/ServiceManagement/Files/LongRoleName.Cloud.cscfg

@@ -8,8 +8,8 @@
 
   **********************************************************************************************
 -->
-<ServiceConfiguration serviceName="AzureCloudService2" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceConfiguration" osFamily="4" osVersion="*" schemaVersion="2015-04.2.6">
-  <Role name="WebRole1">
+<ServiceConfiguration serviceName="WindowsAzure1" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceConfiguration" osFamily="4" osVersion="*" schemaVersion="2014-01.2.3">
+  <Role name="WebRole1 With Spaces In Name">
     <Instances count="1" />
     <ConfigurationSettings>
       <Setting name="Microsoft.WindowsAzure.Plugins.Diagnostics.ConnectionString" value="UseDevelopmentStorage=true" />

src/ServiceManagement/Common/Commands.ScenarioTest/Resources/ServiceManagement/Files/LongRoleName.Cloud.cspkg

@@ -564,11 +564,11 @@ function Run-ServiceDeploymentExtensionCmdletTests
         }
         $cscfg = '.\Resources\ServiceManagement\Files\LongRoleName.Cloud.cscfg';
 
-        $webRoleShortName = "WebRole1";
+        $webRoleNameWithSpaces = "WebRole1 With Spaces In Name";
         $workerRoleLongName = "Microsoft.Contoso.Department.ProjectCodeName.Worker";
-        $rdpCfg1 = New-AzureServiceRemoteDesktopExtensionConfig -Credential $credential -Role $webRoleShortName
+        $rdpCfg1 = New-AzureServiceRemoteDesktopExtensionConfig -Credential $credential -Role $webRoleNameWithSpaces
         $rdpCfg2 = New-AzureServiceRemoteDesktopExtensionConfig -Credential $credential -Role $workerRoleLongName;
-        $adCfg1 = New-AzureServiceADDomainExtensionConfig -Role $webRoleShortName -WorkgroupName 'test1';
+        $adCfg1 = New-AzureServiceADDomainExtensionConfig -Role $webRoleNameWithSpaces -WorkgroupName 'test1';
         $adCfg2 = New-AzureServiceADDomainExtensionConfig -Role $workerRoleLongName -WorkgroupName 'test2';
 
         $st = New-AzureDeployment -ServiceName $svcName -Package $cspkg -Configuration $cscfg -Label $svcName -Slot Production -ExtensionConfiguration $rdpCfg1,$adCfg1;

src/ServiceManagement/Common/Commands.ScenarioTest/Resources/ServiceManagement/ServiceManagementTests.ps1

@@ -49,6 +49,7 @@ public ExtensionRole(string roleName)
             {
                 PrefixName = RoleName = roleName.Trim();
                 PrefixName = PrefixName.Replace(".", string.Empty);
+                PrefixName = PrefixName.Replace(" ", string.Empty);
                 RoleType = ExtensionRoleType.NamedRoles;
                 Default = false;
             }
@@ -62,6 +63,7 @@ public override string ToString()
         public string GetExtensionId(string extensionName, string slot, int index)
         {
             var normalizedExtName = extensionName.Replace(".", string.Empty);
+            normalizedExtName = normalizedExtName.Replace(" ", string.Empty);
 
             var suffix = new StringBuilder();
             suffix.AppendFormat(ExtensionIdSuffixTemplate, normalizedExtName, slot, index);