Skip to content

Commit e1e2e21

Browse files
deepakswiftydeepakswifty
committed
Make resource group optional to retreive all resources
1 parent 2c3024b commit e1e2e21

22 files changed

+208
-27
lines changed

‎src/ResourceManager/Network/Commands.NetworkResourceProvider/LoadBalancer/GetAzureLoadBalancerCmdlet.cs

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,36 @@ public override void ExecuteCmdlet()
4949

5050
WriteObject(loadBalancer);
5151
}
52+
else if (!string.IsNullOrEmpty(this.ResourceGroupName))
53+
{
54+
var getLbResponse = this.LoadBalancerClient.List(this.ResourceGroupName);
55+
56+
var psLoadBalancers = new List<PSLoadBalancer>();
57+
58+
foreach (var lb in getLbResponse.LoadBalancers)
59+
{
60+
var psLb = this.ToPsLoadBalancer(lb);
61+
psLb.ResourceGroupName = this.ResourceGroupName;
62+
psLoadBalancers.Add(psLb);
63+
}
64+
65+
WriteObject(psLoadBalancers, true);
66+
}
67+
5268
else
5369
{
54-
var getLoadBalancerResponse = this.LoadBalancerClient.List(this.ResourceGroupName);
70+
var getLbResponse = this.LoadBalancerClient.ListAll();
5571

56-
var loadBalancers = Mapper.Map<List<PSLoadBalancer>>(getLoadBalancerResponse.LoadBalancers);
72+
var psLoadBalancers = new List<PSLoadBalancer>();
5773

58-
// populate the loadbalancers with the ResourceGroupName
59-
foreach (var loadBalancer in loadBalancers)
74+
foreach (var lb in getLbResponse.LoadBalancers)
6075
{
61-
loadBalancer.ResourceGroupName = this.ResourceGroupName;
76+
var psLb = this.ToPsLoadBalancer(lb);
77+
psLb.ResourceGroupName = NetworkBaseClient.GetResourceGroup(lb.Id);
78+
psLoadBalancers.Add(psLb);
6279
}
6380

64-
WriteObject(loadBalancers, true);
81+
WriteObject(psLoadBalancers, true);
6582
}
6683
}
6784
}

‎src/ResourceManager/Network/Commands.NetworkResourceProvider/LoadBalancer/LoadBalancerBaseClient.cs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323

2424
namespace Microsoft.Azure.Commands.NetworkResourceProvider
2525
{
26+
using Microsoft.Azure.Management.Network.Models;
27+
2628
public abstract class LoadBalancerBaseClient : NetworkBaseClient
2729
{
2830
public ILoadBalancerOperations LoadBalancerClient
@@ -64,5 +66,14 @@ public PSLoadBalancer GetLoadBalancer(string resourceGroupName, string name)
6466

6567
return loadBalancer;
6668
}
69+
70+
public PSLoadBalancer ToPsLoadBalancer(LoadBalancer lb)
71+
{
72+
var psLb = Mapper.Map<PSLoadBalancer>(lb);
73+
74+
psLb.Tag = TagsConversionHelper.CreateTagHashtable(lb.Tags);
75+
76+
return psLb;
77+
}
6778
}
6879
}

‎src/ResourceManager/Network/Commands.NetworkResourceProvider/LoadBalancer/NewAzureLoadBalancerCmdlet.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ private PSLoadBalancer CreateLoadBalancer()
150150

151151
// Map to the sdk object
152152
var lbModel = Mapper.Map<MNM.LoadBalancer>(loadBalancer);
153+
lbModel.Type = Resources.LoadBalancerType;
153154
lbModel.Tags = TagsConversionHelper.CreateTagDictionary(this.Tag, validate: true);
154155

155156
// Execute the Create VirtualNetwork call

‎src/ResourceManager/Network/Commands.NetworkResourceProvider/LoadBalancer/SetAzureLoadBalancerCmdlet.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ public override void ExecuteCmdlet()
4646

4747
// Map to the sdk object
4848
var lbModel = Mapper.Map<MNM.LoadBalancer>(this.LoadBalancer);
49+
lbModel.Type = Resources.LoadBalancerType;
4950
lbModel.Tags = TagsConversionHelper.CreateTagDictionary(this.LoadBalancer.Tag, validate: true);
5051

5152
// Execute the Create VirtualNetwork call

‎src/ResourceManager/Network/Commands.NetworkResourceProvider/NetworkInterface/GetAzureNetworkInterfaceCmdlet.cs

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,19 +51,36 @@ public override void ExecuteCmdlet()
5151

5252
WriteObject(networkInterface);
5353
}
54-
else
54+
else if (!string.IsNullOrEmpty(this.ResourceGroupName))
5555
{
5656
var getNetworkInterfaceResponse = this.NetworkInterfaceClient.List(this.ResourceGroupName);
5757

58-
var networkInterfaces = Mapper.Map<List<PSNetworkInterface>>(getNetworkInterfaceResponse.NetworkInterfaces);
58+
var psNetworkInterfaces = new List<PSNetworkInterface>();
59+
60+
foreach (var nic in getNetworkInterfaceResponse.NetworkInterfaces)
61+
{
62+
var psNic = this.ToPsNetworkInterface(nic);
63+
psNic.ResourceGroupName = this.ResourceGroupName;
64+
psNetworkInterfaces.Add(psNic);
65+
}
66+
67+
WriteObject(psNetworkInterfaces, true);
68+
}
69+
70+
else
71+
{
72+
var getNetworkInterfaceResponse = this.NetworkInterfaceClient.ListAll();
73+
74+
var psNetworkInterfaces = new List<PSNetworkInterface>();
5975

60-
// populate the networkInterfaces with the ResourceGroupName
61-
foreach (var networkInterface in networkInterfaces)
76+
foreach (var nic in getNetworkInterfaceResponse.NetworkInterfaces)
6277
{
63-
networkInterface.ResourceGroupName = this.ResourceGroupName;
78+
var psNic = this.ToPsNetworkInterface(nic);
79+
psNic.ResourceGroupName = NetworkBaseClient.GetResourceGroup(psNic.Id);
80+
psNetworkInterfaces.Add(psNic);
6481
}
6582

66-
WriteObject(networkInterfaces, true);
83+
WriteObject(psNetworkInterfaces, true);
6784
}
6885
}
6986
}

‎src/ResourceManager/Network/Commands.NetworkResourceProvider/NetworkInterface/NetworkInterfaceBaseClient.cs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323

2424
namespace Microsoft.Azure.Commands.NetworkResourceProvider
2525
{
26+
using Microsoft.Azure.Management.Network.Models;
27+
2628
public abstract class NetworkInterfaceBaseClient : NetworkBaseClient
2729
{
2830
public INetworkInterfaceOperations NetworkInterfaceClient
@@ -69,5 +71,14 @@ public PSNetworkInterface GetNetworkInterface(string resourceGroupName, string n
6971

7072
return networkInterface;
7173
}
74+
75+
public PSNetworkInterface ToPsNetworkInterface(NetworkInterface nic)
76+
{
77+
var psNic = Mapper.Map<PSNetworkInterface>(nic);
78+
79+
psNic.Tag = TagsConversionHelper.CreateTagHashtable(nic.Tags);
80+
81+
return psNic;
82+
}
7283
}
7384
}

‎src/ResourceManager/Network/Commands.NetworkResourceProvider/NetworkInterface/NewAzureNetworkInterfaceCmdlet.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ private PSNetworkInterface CreateNetworkInterface()
191191
networkInterface.IpConfigurations.Add(nicIpConfiguration);
192192

193193
var networkInterfaceModel = Mapper.Map<MNM.NetworkInterface>(networkInterface);
194-
194+
networkInterfaceModel.Type = Resources.NetworkInterfaceType;
195195
networkInterfaceModel.Tags = TagsConversionHelper.CreateTagDictionary(this.Tag, validate: true);
196196

197197
this.NetworkInterfaceClient.CreateOrUpdate(this.ResourceGroupName, this.Name, networkInterfaceModel);

‎src/ResourceManager/Network/Commands.NetworkResourceProvider/NetworkInterface/SetAzureNetworkInterfaceCmdlet.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ public override void ExecuteCmdlet()
5353

5454
// Map to the sdk object
5555
var networkInterfaceModel = Mapper.Map<MNM.NetworkInterface>(this.NetworkInterface);
56+
networkInterfaceModel.Type = Resources.NetworkInterfaceType;
5657
networkInterfaceModel.Tags = TagsConversionHelper.CreateTagDictionary(this.NetworkInterface.Tag, validate: true);
5758

5859
this.NetworkInterfaceClient.CreateOrUpdate(this.NetworkInterface.ResourceGroupName, this.NetworkInterface.Name, networkInterfaceModel);

‎src/ResourceManager/Network/Commands.NetworkResourceProvider/NetworkSecurityGroup/GetAzureNetworkSecurityGroupCmdlet.cs

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,20 +48,36 @@ public override void ExecuteCmdlet()
4848

4949
WriteObject(nsg);
5050
}
51-
else
51+
else if (!string.IsNullOrEmpty(this.ResourceGroupName))
5252
{
5353
var nsgGetResponse = this.NetworkSecurityGroupClient.List(this.ResourceGroupName);
5454

55-
var networkResourceGroups = Mapper.Map<List<PSNetworkSecurityGroup>>(nsgGetResponse.NetworkSecurityGroups);
55+
var psNsgs = new List<PSNetworkSecurityGroup>();
56+
57+
foreach (var networkSecurityGroup in nsgGetResponse.NetworkSecurityGroups)
58+
{
59+
var psNsg = this.ToPsNetworkSecurityGroup(networkSecurityGroup);
60+
psNsg.ResourceGroupName = this.ResourceGroupName;
61+
psNsgs.Add(psNsg);
62+
}
63+
64+
WriteObject(psNsgs, true);
65+
}
66+
else
67+
{
68+
var nsgGetResponse = this.NetworkSecurityGroupClient.ListAll();
69+
70+
var psNsgs = new List<PSNetworkSecurityGroup>();
5671

57-
// populate the virtualNetworks with the ResourceGroupName
58-
foreach (var nsg in networkResourceGroups)
72+
foreach (var networkSecurityGroup in nsgGetResponse.NetworkSecurityGroups)
5973
{
60-
nsg.ResourceGroupName = this.ResourceGroupName;
74+
var psNsg = this.ToPsNetworkSecurityGroup(networkSecurityGroup);
75+
psNsg.ResourceGroupName = NetworkBaseClient.GetResourceGroup(networkSecurityGroup.Id);
76+
psNsgs.Add(psNsg);
6177
}
6278

63-
WriteObject(networkResourceGroups, true);
79+
WriteObject(psNsgs, true);
6480
}
6581
}
66-
}
82+
}
6783
}

‎src/ResourceManager/Network/Commands.NetworkResourceProvider/NetworkSecurityGroup/NetworkSecurityGroupBaseClient.cs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424

2525
namespace Microsoft.Azure.Commands.NetworkResourceProvider
2626
{
27+
using Microsoft.Azure.Management.Network.Models;
28+
2729
public abstract class NetworkSecurityGroupBaseClient : NetworkBaseClient
2830
{
2931
public INetworkSecurityGroupOperations NetworkSecurityGroupClient
@@ -66,5 +68,14 @@ public PSNetworkSecurityGroup GetNetworkSecurityGroup(string resourceGroupName,
6668

6769
return networkSecurityGroup;
6870
}
71+
72+
public PSNetworkSecurityGroup ToPsNetworkSecurityGroup(NetworkSecurityGroup nsg)
73+
{
74+
var psNsg = Mapper.Map<PSNetworkSecurityGroup>(nsg);
75+
76+
psNsg.Tag = TagsConversionHelper.CreateTagHashtable(nsg.Tags);
77+
78+
return psNsg;
79+
}
6980
}
7081
}

‎src/ResourceManager/Network/Commands.NetworkResourceProvider/NetworkSecurityGroup/NewAzureNetworkSecurityGroupCmdlet.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ private PSNetworkSecurityGroup CreateNetworkSecurityGroup()
9595

9696
// Map to the sdk object
9797
var nsgModel = Mapper.Map<MNM.NetworkSecurityGroup>(nsg);
98+
nsgModel.Type = Resources.NetworkSecurityGroupType;
9899
nsgModel.Tags = TagsConversionHelper.CreateTagDictionary(this.Tag, validate: true);
99100

100101
// Execute the Create VirtualNetwork call

‎src/ResourceManager/Network/Commands.NetworkResourceProvider/NetworkSecurityGroup/SetAzureNetworkSecurityGroupCmdlet.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ public override void ExecuteCmdlet()
4343

4444
// Map to the sdk object
4545
var nsgModel = Mapper.Map<MNM.NetworkSecurityGroup>(this.NetworkSecurityGroup);
46+
nsgModel.Type = Resources.NetworkSecurityGroupType;
4647
nsgModel.Tags = TagsConversionHelper.CreateTagDictionary(this.NetworkSecurityGroup.Tag, validate: true);
4748

4849
// Execute the Create VirtualNetwork call

‎src/ResourceManager/Network/Commands.NetworkResourceProvider/Properties/Resources.Designer.cs

Lines changed: 45 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)