From 41440a8bec85f90532d955e9a492444024a86b6b Mon Sep 17 00:00:00 2001
From: Shital Savekar <iamshital@live.in>
Date: Thu, 8 Dec 2016 13:49:20 +0530
Subject: [PATCH] Minor improvements

1. Changed Resource Group and Hosted Service Naming
2. Updated custom script extension xml data.
---
 TestLibs/ARMLibrary.psm1 | 5 +++--
 TestLibs/RDFELibs.psm1   | 5 +++--
 XML/Extensions.xml       | 8 ++++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/TestLibs/ARMLibrary.psm1 b/TestLibs/ARMLibrary.psm1
index de52f28..996c315 100644
--- a/TestLibs/ARMLibrary.psm1
+++ b/TestLibs/ARMLibrary.psm1
@@ -44,15 +44,16 @@
     foreach ($RG in $setupTypeData.HostedService )
     {
         $curtime = Get-Date
+        $randomNumber = Get-Random -Maximum 999 -Minimum 111 -SetSeed (Get-Random -Maximum 999 -Minimum 111 )
         $isServiceDeployed = "False"
         $retryDeployment = 0
         if ( $RG.Tag -ne $null )
         {
-            $groupName = "ICA-RG-" + $RG.Tag + "-" + $Distro + "-" + $curtime.Month + "-" +  $curtime.Day  + "-" + $curtime.Hour + "-" + $curtime.Minute + "-" + $curtime.Second
+            $groupName = "ICA-RG-" + $RG.Tag + "-" + $Distro + "-" + $curtime.Month + "-" +  $curtime.Day  + "-" + $curtime.Hour + "-" + $curtime.Minute + "-" + $randomNumber 
         }
         else
         {
-            $groupName = "ICA-RG-" + $setupType + "-" + $Distro + "-" + $curtime.Month + "-" +  $curtime.Day  + "-" + $curtime.Hour + "-" + $curtime.Minute + "-" + $curtime.Second
+            $groupName = "ICA-RG-" + $setupType + "-" + $Distro + "-" + $curtime.Month + "-" +  $curtime.Day  + "-" + $curtime.Hour + "-" + $curtime.Minute + "-" + $randomNumber
         }
         if($isMultiple -eq "True")
         {
diff --git a/TestLibs/RDFELibs.psm1 b/TestLibs/RDFELibs.psm1
index 0e62fdd..4aa5929 100644
--- a/TestLibs/RDFELibs.psm1
+++ b/TestLibs/RDFELibs.psm1
@@ -846,15 +846,16 @@ Function CreateAllDeployments($setupType, $xmlConfig, $Distro, [string]$region =
         foreach ($img in $osImage)
         {
         	$curtime = Get-Date
+        	$randomNumber = Get-Random -Maximum 999 -Minimum 111 -SetSeed (Get-Random -Maximum 999 -Minimum 111 )
 		    $isServiceDeployed = "False"
 		    $retryDeployment = 0
 		    if ( $HS.Tag -ne $null )
 		    {
-			    $serviceName = "ICA-HS-" + $HS.Tag + "-" + $Distro + "-" + $curtime.Month + "-" +  $curtime.Day  + "-" + $curtime.Hour + "-" + $curtime.Minute + "-" + $curtime.Second
+			    $serviceName = "ICA-HS-" + $HS.Tag + "-" + $Distro + "-" + $curtime.Month + "-" +  $curtime.Day  + "-" + $curtime.Hour + "-" + $curtime.Minute + "-" + $randomNumber
 		    }
 		    else
 		    {
-			    $serviceName = "ICA-HS-" + $setupType + "-" + $Distro + "-" + $curtime.Month + "-" +  $curtime.Day  + "-" + $curtime.Hour + "-" + $curtime.Minute + "-" + $curtime.Second
+			    $serviceName = "ICA-HS-" + $setupType + "-" + $Distro + "-" + $curtime.Month + "-" +  $curtime.Day  + "-" + $curtime.Hour + "-" + $curtime.Minute + "-" + $randomNumber
 		    }
 		    if($isMultiple -eq "True")
 		    {
diff --git a/XML/Extensions.xml b/XML/Extensions.xml
index 8778d04..9c3dbe0 100644
--- a/XML/Extensions.xml
+++ b/XML/Extensions.xml
@@ -2,14 +2,14 @@
 	<Extensions>
 		<Extension>
 			<Name>CustomScriptTouchCommand</Name>
-			<OfficialName>CustomScriptForLinux</OfficialName>
-			<Publisher>Microsoft.OSTCExtensions</Publisher>
+			<OfficialName>CustomScript</OfficialName>
+			<Publisher>Microsoft.Azure.Extensions</Publisher>
 			<PublicConfiguration>
 				<timestamp>EXECUTE-PS-(Get-Date).ticks</timestamp>
 				<commandToExecute>touch /var/log/CustomExtensionSuccessful</commandToExecute>
 			</PublicConfiguration>
-			<Version>1.*</Version>
-			<LatestVersion>1.4</LatestVersion>
+			<Version>2.*</Version>
+			<LatestVersion>2.0</LatestVersion>
 		</Extension>
 		<Extension>
 			<Name>OsPatching</Name>