Merge pull request Azure#5000 from rdbartram/preview

Update Import-AzureRMAutomationRunbook command to support Python Runbooks

Author: cormacpayne

src/ResourceManager/Automation/ChangeLog.md

@@ -18,6 +18,8 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Update to Import-AzureRMAutomationRunbook
+    - Support is now being provided for Python2 runbooks
 
 ## Version 4.0.0
 * Add support for online help

src/ResourceManager/Automation/Commands.Automation/Cmdlet/ImportAzureAutomationRunbook.cs

@@ -1,4 +1,4 @@
-// ----------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------------
 //
 // Copyright Microsoft Corporation
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -66,6 +66,7 @@ public class ImportAzureAutomationRunbook : AzureAutomationBaseCmdlet
             Constants.RunbookType.PowerShellWorkflow,
             Constants.RunbookType.GraphicalPowerShellWorkflow,
             Constants.RunbookType.Graph,
+            Constants.RunbookType.Python2,
             IgnoreCase = true)]
         [ValidateNotNullOrEmpty]
         public string Type { get; set; }

src/ResourceManager/Automation/Commands.Automation/Common/AutomationClient.cs

@@ -1,4 +1,4 @@
-// ----------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------------
 //
 // Copyright Microsoft Corporation
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -489,6 +489,9 @@ public Runbook ImportRunbook(string resourceGroupName, string automationAccountN
                     StringComparison.OrdinalIgnoreCase) &&
                 0 !=
                 string.Compare(fileExtension, Constants.SupportedFileExtensions.Graph,
+                    StringComparison.OrdinalIgnoreCase) &&
+                0 !=
+                string.Compare(fileExtension, Constants.SupportedFileExtensions.Python,
                     StringComparison.OrdinalIgnoreCase))
             {
                 throw new ResourceCommonException(typeof(Runbook),

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

@@ -1,4 +1,4 @@
-// ----------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------------
 //
 // Copyright Microsoft Corporation
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -85,13 +85,17 @@ public static class RunbookType
             public const string GraphicalPowerShell = "GraphicalPowerShell";
 
             public const string GraphicalPowerShellWorkflow = "GraphicalPowerShellWorkflow";
+
+            public const string Python2 = "Python2";
         }
 
         public static class SupportedFileExtensions
         {
             public const string PowerShellScript = ".ps1";
 
             public const string Graph = ".graphrunbook";
+
+            public const string Python = ".py";
         }
     }
 }

src/ResourceManager/Automation/Commands.Automation/help/Import-AzureRMAutomationRunbook.md

@@ -21,11 +21,10 @@ Import-AzureRmAutomationRunbook [-Path] <String> [-Description <String>] [-Name
 ```
 
 ## DESCRIPTION
-The **Import-AzureRmAutomationRunbook** cmdlet imports an Azure Automation runbook. Specify the
-path to a wps_2 script (.ps1 ) file to import for wps_2 and wps_2 Workflow runbooks, or to a
-graphical runbook (.graphrunbook) file for graphical runbooks. The name of the file becomes the
-name of the runbook. For wps_2 Workflow runbooks, the script must contain a single wps_2 Workflow
-definition that matches the name of the file.
+The **Import-AzureRmAutomationRunbook** cmdlet imports an Azure Automation runbook. Specify the 
+path to a wps_2 script (.ps1) file to import for wps_2 and wps_2 Workflow runbooks,
+(.graphrunbook) file for graphical runbooks, or (.py) file for python 2 runbooks. 
+For wps_2 Workflow runbooks, the script must contain a single wps_2 Workflow definition that matches the name of the file.
 
 ## EXAMPLES
 
@@ -218,6 +217,7 @@ Valid values are:
 - PowerShellWorkflow
 - GraphicalPowerShellWorkflow
 - Graph
+- Python2
 
 The value Graph is obsolete.
 It is equivalent to GraphicalPowerShellWorkflow.
@@ -226,7 +226,7 @@ It is equivalent to GraphicalPowerShellWorkflow.
 Type: String
 Parameter Sets: (All)
 Aliases: 
-Accepted values: PowerShell, GraphicalPowerShell, PowerShellWorkflow, GraphicalPowerShellWorkflow, Graph
+Accepted values: PowerShell, GraphicalPowerShell, PowerShellWorkflow, GraphicalPowerShellWorkflow, Graph, Python
 
 Required: True
 Position: Named