Skip to content

Fixed bug in New-AzConnectionMonitorEndpoint cmdlet. Updated help file #13001

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
VeryEarly merged 2 commits into from
Sep 18, 2020
Merged

Fixed bug in New-AzConnectionMonitorEndpoint cmdlet. Updated help file #13001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3de498
Fixed bug in New-AzConnectionMonitorEndpoint cmdlet. Updated help file
irrogozh Sep 17, 2020
82d1b4f
Fixed typo and add online version in help file
irrogozh Sep 17, 2020
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
144 changes: 119 additions & 25 deletions ...Watcher/ConnectionMonitor/NewAzureNetworkWatcherConnectionMonitorEndPointObjectCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,49 +25,127 @@ namespace Microsoft.Azure.Commands.Network
public class NewAzureNetworkWatcherConnectionMonitorEndpointObjectCommand : ConnectionMonitorBaseCmdlet
{
[Parameter(
Mandatory = false,
Mandatory = true,
HelpMessage = "The name of the connection monitor endpoint.")]
[ValidateNotNullOrEmpty]
public string Name { get; set; }

[Parameter(
Mandatory = true,
HelpMessage = "The type of the connection monitor endpoint. Supported types are AzureVM, AzureVNet, AzureSubnet, ExternalAddress, MMAWorkspaceMachine, MMAWorkspaceNetwork.")]
[ValidateNotNullOrEmpty]
[PSArgumentCompleter("AzureVM", "AzureVNet", "AzureSubnet", "ExternalAddress", "MMAWorkspaceMachine", "MMAWorkspaceNetwork")]
public string Type { get; set; }
HelpMessage = "Azure VM endpoint switch.",
ParameterSetName = "AzureVM")]
public SwitchParameter AzureVM { get; set; }

[Parameter(
Mandatory = true,
HelpMessage = "Azure Vnet endpoint switch.",
ParameterSetName = "AzureVNet")]
public SwitchParameter AzureVNet { get; set; }

[Parameter(
Mandatory = true,
HelpMessage = "Azure Subnet endpoint switch.",
ParameterSetName = "AzureSubnet")]
public SwitchParameter AzureSubnet { get; set; }

[Parameter(
Mandatory = true,
HelpMessage = "External Address endpoint switch.",
ParameterSetName = "ExternalAddress")]
public SwitchParameter ExternalAddress { get; set; }

[Parameter(
Mandatory = true,
HelpMessage = "MMA Workspace Machine endpoint switch.",
ParameterSetName = "MMAWorkspaceMachine")]
public SwitchParameter MMAWorkspaceMachine { get; set; }

[Parameter(
Mandatory = true,
HelpMessage = "MMA Workspace Network endpoint switch.",
ParameterSetName = "MMAWorkspaceNetwork")]
public SwitchParameter MMAWorkspaceNetwork { get; set; }

[Parameter(
Mandatory = true,
HelpMessage = "Resource ID of the connection monitor endpoint.",
ParameterSetName = "AzureVM")]
[Parameter(
Mandatory = true,
HelpMessage = "Resource ID of the connection monitor endpoint.",
ParameterSetName = "AzureVNet")]
[Parameter(
Mandatory = true,
HelpMessage = "Resource ID of the connection monitor endpoint.",
ParameterSetName = "SetByResourceId")]
ParameterSetName = "AzureSubnet")]
[Parameter(
Mandatory = true,
HelpMessage = "Resource ID of the connection monitor endpoint.",
ParameterSetName = "MMAWorkspaceMachine")]
[Parameter(
Mandatory = true,
HelpMessage = "Resource ID of the connection monitor endpoint.",
ParameterSetName = "MMAWorkspaceNetwork")]
[ValidateNotNullOrEmpty]
public string ResourceId { get; set; }

[Parameter(
Mandatory = true,
HelpMessage = "Address of the connection monitor endpoint (IP or domain name).",
ParameterSetName = "ExternalAddress")]
[Parameter(
Mandatory = true,
HelpMessage = "Address of the connection monitor endpoint (IP or domain name).",
ParameterSetName = "MMAWorkspaceMachine")]
[Parameter(
Mandatory = false,
HelpMessage = "Address of the connection monitor endpoint (IP or domain name).",
ParameterSetName = "SetByAddress")]
ParameterSetName = "AzureVM")]
[ValidateNotNullOrEmpty]
public string Address { get; set; }

[Parameter(
Mandatory = false,
HelpMessage = "List of items which need to be included into endpont scope.",
ParameterSetName = "SetByResourceId")]
ParameterSetName = "AzureVNet")]
[Parameter(
Mandatory = false,
HelpMessage = "List of items which need to be included into endpont scope.",
ParameterSetName = "MMAWorkspaceMachine")]
[Parameter(
Mandatory = true,
HelpMessage = "List of items which need to be included into endpont scope.",
ParameterSetName = "MMAWorkspaceNetwork")]
[ValidateNotNullOrEmpty]
public PSNetworkWatcherConnectionMonitorEndpointScopeItem[] IncludeItem { get; set; }

[Parameter(
Mandatory = false,
HelpMessage = "List of items which need to be excluded from endpoint scope.",
ParameterSetName = "SetByResourceId")]
ParameterSetName = "AzureVNet")]
[Parameter(
Mandatory = false,
HelpMessage = "List of items which need to be excluded from endpoint scope.",
ParameterSetName = "AzureSubnet")]
[Parameter(
Mandatory = false,
HelpMessage = "List of items which need to be excluded from endpoint scope.",
ParameterSetName = "MMAWorkspaceNetwork")]
[ValidateNotNullOrEmpty]
public PSNetworkWatcherConnectionMonitorEndpointScopeItem[] ExcludeItem { get; set; }

[Parameter(
Mandatory = false,
HelpMessage = "Test coverage for the endpoint. Supported values are Default, Low, BelowAverage, Average, AboveAvergae, Full.")]
HelpMessage = "Test coverage for the endpoint. Supported values are Default, Low, BelowAverage, Average, AboveAverage, Full.",
ParameterSetName = "AzureVNet")]
[Parameter(
Mandatory = false,
HelpMessage = "Test coverage for the endpoint. Supported values are Default, Low, BelowAverage, Average, AboveAverage, Full.",
ParameterSetName = "AzureSubnet")]
[Parameter(
Mandatory = false,
HelpMessage = "Test coverage for the endpoint. Supported values are Default, Low, BelowAverage, Average, AboveAverage, Full.",
ParameterSetName = "MMAWorkspaceNetwork")]
[ValidateNotNullOrEmpty]
[PSArgumentCompleter("Default", "Low", "BelowAverage", "Average", "AboveAverage", "Full")]
public string CoverageLevel { get; set; }
Expand All @@ -76,24 +154,10 @@ public override void Execute()
{
base.Execute();

if (string.IsNullOrEmpty(this.Name))
{
if (!string.IsNullOrEmpty(this.ResourceId))
{
string[] SplittedName = ResourceId.Split('/');
// Name is in the form resourceName(ResourceGroupName)
this.Name = SplittedName[8] + "(" + SplittedName[4] + ")";
}
else if (!string.IsNullOrEmpty(this.Address))
{
this.Name = this.Address;
}
}

PSNetworkWatcherConnectionMonitorEndpointObject endpoint = new PSNetworkWatcherConnectionMonitorEndpointObject()
{
Name = this.Name,
Type = this.Type,
Type = this.GetEndpointType(),
ResourceId = this.ResourceId,
Address = this.Address,
CoverageLevel = this.CoverageLevel
Expand Down Expand Up @@ -132,5 +196,35 @@ public override void Execute()

WriteObject(endpoint);
}

private string GetEndpointType()
{
if (AzureVM.IsPresent)
{
return "AzureVM";
}
else if (AzureVNet.IsPresent)
{
return "AzureVNet";
}
else if (AzureSubnet.IsPresent)
{
return "AzureSubnet";
}
else if (ExternalAddress.IsPresent)
{
return "ExternalAddress";
}
else if (MMAWorkspaceMachine.IsPresent)
{
return "MMAWorkspaceMachine";
}
else if (MMAWorkspaceNetwork.IsPresent)
{
return "MMAWorkspaceNetwork";
}

return string.Empty;
}
}
}
Loading