Fixed VM and Deployments tests

Author: stankovski

examples/compute-management/02-VirtualMachineCreation.sh

@@ -9,7 +9,7 @@ printf "\n2. Creating a new storage account '%s' in type '%s'.\n" "$storageAccou
 azure storage account new --resourcegroupname "$groupName" --name "$storageAccountName" --location "$location" --type "$storageAccountType"
 
 printf "\n3. Create virtual network.\n"
-result=`azure virtual network create --resourcegroupname "$groupName" --name test --location "$location" --addressprefix "[\"10.0.0.0/16\"]" --subnet "[{\"Name\":\"test\",\"AddressPrefix\":\"10.0.0.0/24\"}]" --force`
+result=`azure virtual network new --resourcegroupname "$groupName" --name test --location "$location" --addressprefix "[\"10.0.0.0/16\"]" --subnet "[{\"Name\":\"test\",\"AddressPrefix\":\"10.0.0.0/24\"}]" --force`
 
 contextResult=`azure context get`
 
@@ -19,7 +19,7 @@ subnetId="/subscriptions/$subId/resourceGroups/$groupName/providers/Microsoft.Ne
 
 printf "\n4. Create network interface with:\r\nsubId='%s' \r\n& \r\nsubnetId='$subnetId'.\n" "$subId"
 export MSYS_NO_PATHCONV=1
-azure network interface create --name test --resourcegroupname "$groupName" --location "$location" --subnetid "$subnetId"
+azure network interface new --name test --resourcegroupname "$groupName" --location "$location" --subnetid "$subnetId"
 export MSYS_NO_PATHCONV=
 
 nicId="/subscriptions/$subId/resourceGroups/$groupName/providers/Microsoft.Network/networkInterfaces/test"

examples/lib/testrunner.sh

@@ -3,7 +3,6 @@ export TESTDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . $TESTDIR/helper.sh
 export groupName=`randomName testrg`
 export location="westus"
-export CmdletSessionID=1010
 export MSYS_NO_PATHCONV=1
 
 echo "Logging in as user"

examples/resource-management/03-Deployments.sh

@@ -6,12 +6,11 @@ printf "\n1. Creating a new resource group: %s and location: %s.\n" "$groupName"
 azure group create --name "$groupName" --location "$location"
 
 printf "\n2. Test template with dynamic parameters\n"
-siteName=`randomName testrn`
-azure group deployment test -g "$groupName" --templatefile $BASEDIR/resource-management/sampleTemplate.json --siteName "$siteName" --hostingPlanName "$siteName" --siteLocation "$location" --sku "Standard" --workerSize "0"
+azure group deployment test -g "$groupName" --templatefile $BASEDIR/sampleTemplate.json --siteName "$resourceName" --hostingPlanName "$resourceName" --siteLocation "$location" --sku "Standard" --workerSize "0"
 
 printf "\n3. Test template with JSON parameter object\n"
-azure group deployment test -g "$groupName" --templatefile $BASEDIR/resource-management/sampleTemplate.json --templateparameterobject "{\"siteName\":\"$siteName\",\"hostingPlanName\":\"$siteName\",\"siteLocation\":\"$location\",\"sku\":\"Standard\",\"workerSize\": 0 }"
+azure group deployment test -g "$groupName" --templatefile $BASEDIR/sampleTemplate.json --templateparameterobject "{\"siteName\":\"$resourceName\",\"hostingPlanName\":\"$resourceName\",\"siteLocation\":\"$location\",\"sku\":\"Standard\",\"workerSize\": 0 }"
 
 printf "\n4. Provisioning Deployment\n"
-deploymentInfo=`azure group deployment create --Name "$siteName" --ResourceGroupName "$groupName" --TemplateFile $BASEDIR/resource-management/sampleTemplate.json --TemplateParameterFile $BASEDIR/resource-management/sampleTemplateParams.json`
+deploymentInfo=`azure group deployment create --Name "$resourceName" --ResourceGroupName "$groupName" --TemplateFile $BASEDIR/sampleTemplate.json --TemplateParameterFile $BASEDIR/sampleTemplateParams.json`
 echo $deploymentInfo

src/CLU/Commands.Common.ScenarioTest/ExampleScriptRunner.cs

@@ -41,7 +41,7 @@ public class ExampleScriptRunner
         const string ResourceGroupNameKey = "groupName";
         const string LocationKey = "location";
         const string BaseDir = "BASEDIR";
-        const string SessionKey = "CmdletSessionID";
+        const string SessionKey = "AzureProfile";
         const string StorageAccountTypeKey = "storageAccountType";
         const string StorageAccountNameKey = "storageAccountName";
         const string DefaultStorageAccountType = "Standard_GRS";

src/CLU/Commands.Common.ScenarioTest/ExamplesTests/ResourceManagementTests.cs

@@ -42,6 +42,15 @@ public void ResourcesTest()
             helper.RunScript("02-Resource");
         }
 
+        [Fact]
+        public void DeploymentsTest()
+        {
+            var helper = _collectionState
+                .GetRunner("resource-management");
+            helper.EnvironmentVariables.Add("resourceName", helper.GenerateName("csmr"));
+            helper.RunScript("03-Deployments");
+        }
+
         [Fact]
         public void RoleAssignmentsTest()
         {

src/CLU/Commands.Common.ScenarioTest/ScenarioTestFixture.cs

@@ -38,27 +38,24 @@ public ScenarioTestFixture()
             SessionId = $"{Generator.Next(10000, 99999)}";
         }
 
-        private ScenarioTestFixture(AzureContext conext, string sessionId)
-        {
-            Generator = new Random();
-            SessionId = sessionId;
-            AzureContext = conext;
-        }
-
         public string SessionId { get; protected set; }
         public Random Generator { get; protected set; }
 
         public ScenarioTestFixture LoginAsUser()
         {
-            return new ScenarioTestFixture(Login(EnvironmentCredentialsProvider.LoginUserScript), SessionId);
+            var newTestFixture = new ScenarioTestFixture();
+            newTestFixture.Login(EnvironmentCredentialsProvider.LoginUserScript);
+            return newTestFixture;
         }
 
         public ScenarioTestFixture LoginAsService()
         {
-            return new ScenarioTestFixture(Login(EnvironmentCredentialsProvider.LoginServiceScript), SessionId);
+            var newTestFixture = new ScenarioTestFixture();
+            newTestFixture.Login(EnvironmentCredentialsProvider.LoginServiceScript);
+            return newTestFixture;
         }
 
-        private AzureContext Login(string loginScript)
+        private void Login(string loginScript)
         {
             var helper = new ExampleScriptRunner(Generator, SessionId)
             {
@@ -70,7 +67,7 @@ private AzureContext Login(string loginScript)
             {
                 throw new ArgumentOutOfRangeException(nameof(profile), $"Deserialized profile is null: `{profileText}`");
             }
-            return profile.Context;
+            AzureContext = profile.Context;
         }
 
         public ExampleScriptRunner GetRunner(string directoryName)
@@ -79,7 +76,7 @@ public ExampleScriptRunner GetRunner(string directoryName)
             {
                 var credentials = new EnvironmentCredentialsProvider();
                 credentials.Initialize();
-                AzureContext = Login(credentials.LoginScriptName);
+                Login(credentials.LoginScriptName);
             }
             var context = EnvironmentContextFactory.GetTestContext(directoryName);
             context.Context = AzureContext;