Merge branch 'preview' of https://github.com/Azure/azure-powershell into loganalytics

# Conflicts:
#	src/ResourceManager/Compute/ChangeLog.md

Author: hyonholee

src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/BatchApplicationPackageTests.cs

@@ -26,7 +26,7 @@ public class BatchApplicationPackageTests : WindowsAzure.Commands.Test.Utilities
         private const string version = "foo";
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.AcceptanceType, Category.Flaky)]
         public void TestUploadApplicationPackage()
         {
             string id = "newApplicationPackage";
@@ -56,7 +56,7 @@ public void TestUploadApplicationPackage()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.AcceptanceType, Category.Flaky)]
         public void TestUpdateApplicationPackage()
         {
             string id = "updateApplicationPackage";
@@ -86,7 +86,7 @@ public void TestUpdateApplicationPackage()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.AcceptanceType, Category.Flaky)]
         public void TestCreatePoolWithApplicationPackage()
         {
             string id = "createPoolWithApplicationPackage";
@@ -115,7 +115,7 @@ public void TestCreatePoolWithApplicationPackage()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.AcceptanceType, Category.Flaky)]
         public void TestUpdatePoolWithApplicationPackage()
         {
             string id = "updatePoolWithApplicationPackage";

src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/CertificateTests.cs

@@ -28,14 +28,14 @@ public CertificateTests(Xunit.Abstractions.ITestOutputHelper output)
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.AcceptanceType, Category.Flaky)]
         public void TestCertificateCrudOperations()
         {
             BatchController.NewInstance.RunPsTest("Test-CertificateCrudOperations");
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.AcceptanceType, Category.Flaky)]
         public void TestCancelCertificateDelete()
         {
             BatchController controller = BatchController.NewInstance;

src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/ComputeNodeTests.cs

@@ -29,7 +29,7 @@ public ComputeNodeTests(Xunit.Abstractions.ITestOutputHelper output)
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.AcceptanceType, Category.Flaky)]
         public void TestRemoveComputeNodes()
         {
             BatchController controller = BatchController.NewInstance;
@@ -52,7 +52,7 @@ public void TestRemoveComputeNodes()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.AcceptanceType, Category.Flaky)]
         public void TestRebootAndReimageComputeNode()
         {
             BatchController controller = BatchController.NewInstance;
@@ -75,7 +75,7 @@ public void TestRebootAndReimageComputeNode()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.AcceptanceType, Category.Flaky)]
         public void TestDisableAndEnableComputeNodeScheduling()
         {
             BatchController controller = BatchController.NewInstance;
@@ -95,7 +95,7 @@ public void TestDisableAndEnableComputeNodeScheduling()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.AcceptanceType, Category.Flaky)]
         public void TestGetComputeNodeRemoteLoginSettings()
         {
             BatchController controller = BatchController.NewInstance;

src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/FileTests.cs

@@ -30,7 +30,7 @@ public FileTests(Xunit.Abstractions.ITestOutputHelper output)
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.AcceptanceType, Category.Flaky)]
         public void TestGetNodeFileContentByTask()
         {
             BatchController controller = BatchController.NewInstance;
@@ -58,7 +58,7 @@ public void TestGetNodeFileContentByTask()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.AcceptanceType, Category.Flaky)]
         public void TestGetNodeFileContentByComputeNode()
         {
             BatchController controller = BatchController.NewInstance;
@@ -77,7 +77,7 @@ public void TestGetNodeFileContentByComputeNode()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.AcceptanceType, Category.Flaky)]
         public void TestGetRemoteDesktopProtocolFile()
         {
             BatchController controller = BatchController.NewInstance;
@@ -96,7 +96,7 @@ public void TestGetRemoteDesktopProtocolFile()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.AcceptanceType, Category.Flaky)]
         public void TestDeleteNodeFileByTask()
         {
             BatchController controller = BatchController.NewInstance;
@@ -123,7 +123,7 @@ public void TestDeleteNodeFileByTask()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.AcceptanceType, Category.Flaky)]
         public void TestDeleteNodeFileByComputeNode()
         {
             BatchController controller = BatchController.NewInstance;

src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/JobScheduleTests.cs

@@ -34,7 +34,7 @@ public void TestJobScheduleCRUD()
 
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.AcceptanceType, Category.Flaky)]
         public void TestDisableEnableTerminateJobSchedule()
         {
             BatchController controller = BatchController.NewInstance;

src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/JobTests.cs

@@ -28,15 +28,15 @@ public JobTests(Xunit.Abstractions.ITestOutputHelper output)
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.AcceptanceType, Category.Flaky)]
         public void TestJobCRUD()
         {
             BatchController.NewInstance.RunPsTest("Test-JobCRUD");
         }
 
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.AcceptanceType, Category.Flaky)]
         public void TestDisableEnableTerminateJob()
         {
             BatchController controller = BatchController.NewInstance;
@@ -59,7 +59,7 @@ public void TestDisableEnableTerminateJob()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.AcceptanceType, Category.Flaky)]
         public void IfJobSetsAutoFailure_ItCompletesWhenAnyTaskFails()
         {
             BatchController controller = BatchController.NewInstance;

src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/PoolTests.cs

@@ -31,14 +31,14 @@ public PoolTests(Xunit.Abstractions.ITestOutputHelper output)
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.AcceptanceType, Category.Flaky)]
         public void TestPoolCRUD()
         {
             BatchController.NewInstance.RunPsTest("Test-PoolCRUD");
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.AcceptanceType, Category.Flaky)]
         public void TestResizeAndStopResizePool()
         {
             BatchController controller = BatchController.NewInstance;
@@ -60,7 +60,7 @@ public void TestResizeAndStopResizePool()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.AcceptanceType, Category.Flaky)]
         public void TestAutoScaleActions()
         {
             BatchController controller = BatchController.NewInstance;
@@ -82,7 +82,7 @@ public void TestAutoScaleActions()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.AcceptanceType, Category.Flaky)]
         public  void TestChangeOSVersion()
         {
             BatchController controller = BatchController.NewInstance;

src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/TaskTests.cs

@@ -26,7 +26,7 @@ public TaskTests(Xunit.Abstractions.ITestOutputHelper output)
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.AcceptanceType, Category.Flaky)]
         public void TestTaskCRUD()
         {
             BatchController controller = BatchController.NewInstance;
@@ -48,7 +48,7 @@ public void TestTaskCRUD()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.AcceptanceType, Category.Flaky)]
         public void TestCreateTaskCollection()
         {
             BatchController controller = BatchController.NewInstance;
@@ -70,7 +70,7 @@ public void TestCreateTaskCollection()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.AcceptanceType, Category.Flaky)]
         public void TestTerminateTask()
         {
             BatchController controller = BatchController.NewInstance;
@@ -97,7 +97,7 @@ public void TestTerminateTask()
         }
 
         [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.AcceptanceType, Category.Flaky)]
         public void TestListAllSubtasks()
         {
             BatchController controller = BatchController.NewInstance;

src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/Constants.cs

@@ -65,6 +65,8 @@ public class Category
         public const string BVT = "BVT";
 
         public const string CheckIn = "CheckIn";
+        
+        public const string Flaky = "Flaky";
 
         // Run Type
         public const string RunType = "RunType";

src/ResourceManager/Compute/ChangeLog.md

@@ -19,9 +19,9 @@
 -->
 ## Current Release
 * Log analytic feature
-    - Added Export-AzureRmLogAnalyticRequestRateByInterval cmdlet
-    - Added Export-AzureRmLogAnalyticThrottledRequests cmdlet
-
+    - Added `Export-AzureRmLogAnalyticRequestRateByInterval` cmdlet
+    - Added `Export-AzureRmLogAnalyticThrottledRequests` cmdlet
+* `New-AzureRmVmss` supports public IP address, load balancing rules, inbound NAT rules.
 * WriteAccelerator feature
     - Added WriteAccelerator switch parameter to the following cmdlets:
           Set-AzureRmVMOSDisk