Merge branch 'main' into users/ankitshar/diskspdOnBareDisk

Author: ankitsharma-99

VERSION

@@ -1 +1 @@
-3.0.14
+3.0.17

src/VirtualClient/VirtualClient.Actions.FunctionalTests/AspNetBenchProfileTests.cs

@@ -16,6 +16,7 @@ namespace VirtualClient.Actions
 
     [TestFixture]
     [Category("Functional")]
+    [Ignore("MLPerf profiles archived - no longer in active profiles directory")]
     public class MLPerfProfileTests
     {
         private DependencyFixture mockFixture;

src/VirtualClient/VirtualClient.Actions.FunctionalTests/MLPerfProfileTests.cs

@@ -0,0 +1,109 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+namespace VirtualClient.Actions
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Net;
+    using System.Threading;
+    using System.Threading.Tasks;
+    using NUnit.Framework;
+    using VirtualClient.Common;
+    using VirtualClient.Contracts;
+
+    [TestFixture]
+    [Category("Functional")]
+    public class NginxWrkProfileTests
+    {
+        private DependencyFixture mockFixture;
+        private string clientAgentId;
+        private string serverAgentId;
+
+        [OneTimeSetUp]
+        public void SetupFixture()
+        {
+            this.clientAgentId = $"{Environment.MachineName}-Client";
+            this.serverAgentId = $"{Environment.MachineName}-Server";
+
+            ComponentTypeCache.Instance.LoadComponentTypes(TestDependencies.TestDirectory);
+        }
+
+        [SetUp]
+        public void Setup()
+        {
+            this.mockFixture = new DependencyFixture();
+        }
+
+        [Test]
+        [TestCase("PERF-WEB-NGINX-WRK.json")]
+        [TestCase("PERF-WEB-NGINX-WRK2.json")]
+        public void NginxWrkProfileParametersAreInlinedCorrectly(string profile)
+        {
+            this.mockFixture.Setup(PlatformID.Unix, agentId: this.clientAgentId).SetupLayout(
+                new ClientInstance(this.clientAgentId, "1.2.3.5", ClientRole.Client),
+                new ClientInstance(this.serverAgentId, "1.2.3.4", ClientRole.Server));
+
+            using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies))
+            {
+                WorkloadAssert.ParameterReferencesInlined(executor.Profile);
+            }
+        }
+
+        [Test]
+        [TestCase("PERF-WEB-NGINX-WRK.json")]
+        [TestCase("PERF-WEB-NGINX-WRK2.json")]
+        public void NginxWrkProfileParametersAreAvailable(string profile)
+        {
+            this.mockFixture.Setup(PlatformID.Unix, agentId: this.clientAgentId).SetupLayout(
+                new ClientInstance(this.clientAgentId, "1.2.3.5", ClientRole.Client),
+                new ClientInstance(this.serverAgentId, "1.2.3.4", ClientRole.Server));
+
+            var serverPrams = new List<string> { "PackageName", "Role", "Timeout" };
+
+            var reverseProxyPrams = new List<string> { "PackageName", "Role", "Timeout" };
+
+            var clientPrams = new List<string> { "PackageName", "Role", "Timeout", "TestDuration", "FileSizeInKB", "Connection", "ThreadCount", "CommandArguments", "MetricScenario", "Scenario" };
+
+            using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies))
+            {
+                foreach (var actionBlock in executor.Profile.Actions)
+                {
+                    string role = actionBlock.Parameters["Role"].ToString();
+
+                    if (role.Equals("server", StringComparison.OrdinalIgnoreCase))
+                    {
+                        foreach (var pram in serverPrams)
+                        {
+                            if (!actionBlock.Parameters.ContainsKey(pram))
+                            {
+                                Assert.False(true, $"{actionBlock.Type} does not have {pram} parameter.");
+                            }
+                        }
+                    }
+                    else if (role.Equals("reverseproxy", StringComparison.OrdinalIgnoreCase))
+                    {
+                        foreach (var pram in reverseProxyPrams)
+                        {
+                            if (!actionBlock.Parameters.ContainsKey(pram))
+                            {
+                                Assert.False(true, $"{actionBlock.Type} does not have {pram} parameter.");
+                            }
+                        }
+                    }
+                    else
+                    {
+                        foreach (var pram in clientPrams)
+                        {
+                            if (!actionBlock.Parameters.ContainsKey(pram))
+                            {
+                                Assert.False(true, $"{actionBlock.Type} does not have {pram} parameter.");
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

src/VirtualClient/VirtualClient.Actions.FunctionalTests/NginxWrkProfileTests.cs

@@ -39,7 +39,7 @@ public void SuperBenchmarkWorkloadProfileParametersAreInlinedCorrectly(string pr
         }
 
         [Test]
-        [TestCase("SETUP-NVIDIA-A100.json")]
+        [TestCase("SETUP-GPU-NVIDIA-A100.json")]
         public async Task SuperBenchmarkWorkloadProfileExecutesTheExpectedDependenciesAndReboot(string profile)
         {
             List<string> expectedCommands = new List<string>
@@ -74,7 +74,7 @@ public async Task SuperBenchmarkWorkloadProfileExecutesTheExpectedDependenciesAn
         }
 
         [Test]
-        [TestCase("SETUP-NVIDIA-A100.json")]
+        [TestCase("SETUP-GPU-NVIDIA-A100.json")]
         public async Task SuperBenchmarkWorkloadProfileExecutesTheExpectedDependenciesAndWorkloadsAfterReboot(string profile)
         {
             IEnumerable<string> expectedCommands = this.GetProfileExpectedCommands(PlatformID.Unix);