Skip to content

Added Get-AzureRMAutomationHybridRunbookWorkerGroup cmdlet #2325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Jun 28, 2016
Merged

Added Get-AzureRMAutomationHybridRunbookWorkerGroup cmdlet #2325

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8771de5
New cmdlet Get-AzureRMAutomationHybridRunbookWorkerGroup
robplank May 17, 2016
46f82b4
updates requested by Microsoft
robplank May 26, 2016
8836dfd
updated help for get-AzureRMAutomationHybridRunbookWorkerGroup
robplank May 26, 2016
610aedf
setting VS version back to 2013
robplank May 26, 2016
43b3e98
removed lines added from a git action
robplank May 26, 2016
94819e3
fixing merge conflicts
robplank May 26, 2016
0739af6
fix formating
robplank May 27, 2016
fc349b2
fixed typo
robplank May 27, 2016
e540a57
add Unit Test
robplank Jun 17, 2016
521df62
update Test
robplank Jun 17, 2016
f73250c
update unit test
robplank Jun 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixing merge conflicts
  • Loading branch information
@robplank
robplank committed Jun 27, 2016
commit 94819e3dbcf8c47b41e2e855f73fc019092e3dcc
16 changes: 5 additions & 11 deletions src/ResourceManager/Automation/Commands.Automation/Common/AutomationClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,6 @@
using Runbook = Microsoft.Azure.Commands.Automation.Model.Runbook;
using Schedule = Microsoft.Azure.Commands.Automation.Model.Schedule;
using Variable = Microsoft.Azure.Commands.Automation.Model.Variable;
using JobStream = Microsoft.Azure.Commands.Automation.Model.JobStream;
using Credential = Microsoft.Azure.Commands.Automation.Model.CredentialInfo;
using JobSchedule = Microsoft.Azure.Commands.Automation.Model.JobSchedule;
using Certificate = Microsoft.Azure.Commands.Automation.Model.CertificateInfo;
using Connection = Microsoft.Azure.Commands.Automation.Model.Connection;
using HybridRunbookWorkerGroup = Microsoft.Azure.Commands.Automation.Model.HybridRunbookWorkerGroup;


Expand Down Expand Up @@ -1644,20 +1639,20 @@ private Azure.Management.Automation.Models.Runbook TryGetRunbookModel(string res
}
return runbook;
}
<<<<<<< 5a3f20949198c648832d7ae2bed4ba88898a4a3d

private Azure.Management.Automation.Models.Certificate TryGetCertificateModel(string resourceGroupName, string automationAccountName,
=======



private Azure.Management.Automation.Models.HybridRunbookWorkerGroup TryGetHybridRunbookWorkerModel(string resourceGroupName, string automationAccountName, string HybridRunbookWorkerGroupName)
{
Azure.Management.Automation.Models.HybridRunbookWorkerGroup hybridRunbookWorkerGroup = null;
try
{
hybridRunbookWorkerGroup = this.automationManagementClient.HybridRunbookWorkerGroups.Get(resourceGroupName, automationAccountName, HybridRunbookWorkerGroupName).HybridRunbookWorkerGroup;
}
catch(CloudException e)
catch (CloudException e)
{
if(e.Response.StatusCode == HttpStatusCode.NotFound)
if (e.Response.StatusCode == HttpStatusCode.NotFound)
{
hybridRunbookWorkerGroup = null;
}
Expand All @@ -1669,7 +1664,6 @@ private Azure.Management.Automation.Models.HybridRunbookWorkerGroup TryGetHybrid
return hybridRunbookWorkerGroup;
}
private Azure.Management.Automation.Models.Certificate TryGetCertificateModel(string resourceGroupName, string automationAccountName,
>>>>>>> New cmdlet Get-AzureRMAutomationHybridRunbookWorkerGroup
string certificateName)
{
Azure.Management.Automation.Models.Certificate certificate = null;
Expand Down