Jonathanhe/workload network

src/vmware/CHANGELOG.md

@@ -6,6 +6,11 @@
 - Add `az vmware workload-network dns-service` command group
 - Add `az vmware workload-network dns-zone` command group
 - Add `az vmware workload-network port-mirroring` command group
+- Add `az vmware workload-network segment` command group
+- Add `az vmware workload-network public-ip` command group
+- Add `az vmware workload-network vm-group` command group
+- Add `az vmware workload-network vm` command group
+- Add `az vmware workload-network gateway` command group
 
 ## 3.1.0 (2021-08)
 

src/vmware/azext_vmware/_params.py

@@ -138,7 +138,7 @@ def load_arguments(self, _):
         c.argument('script_cmdlet_id', help='A reference to the script cmdlet resource if user is running a AVS script.')
 
     with self.argument_context('vmware workload-network dhcp') as c:
-        c.argument('dhcp_id', help='NSX DHCP identifier. Generally the same as the DHCP display name.')
+        c.argument('dhcp', help='NSX DHCP identifier. Generally the same as the DHCP display name.')
         c.argument('display_name', help='Display name of the DHCP entity.')
         c.argument('revision', help='NSX revision number.')
 
@@ -150,7 +150,7 @@ def load_arguments(self, _):
         c.argument('server_addresses', nargs='+', validator=server_addresses_length, help='DHCP Relay Addresses. Max 3.')
 
     with self.argument_context('vmware workload-network dns-service') as c:
-        c.argument('dns_service_id', help="NSX DNS service identifier. Generally the same as the DNS service's display name.")
+        c.argument('dns_service', help="NSX DNS service identifier. Generally the same as the DNS service's display name.")
         c.argument('display_name', help='Display name of the DNS service.')
         c.argument('dns_service_ip', help='DNS service IP of the DNS service.')
         c.argument('default_dns_zone', help='Default DNS zone of the DNS service.')
@@ -159,7 +159,7 @@ def load_arguments(self, _):
         c.argument('revision', help='NSX revision number.')
 
     with self.argument_context('vmware workload-network dns-zone') as c:
-        c.argument('dns_zone_id', help="NSX DNS zone identifier. Generally the same as the DNS zone's display name.")
+        c.argument('dns_zone', help="NSX DNS zone identifier. Generally the same as the DNS zone's display name.")
         c.argument('display_name', help='Display name of the DNS zone.')
         c.argument('domain', nargs='+', help='Domain names of the DNS zone.')
         c.argument('dns_server_ips', nargs='+', help='DNS Server IP array of the DNS zone.')
@@ -168,9 +168,35 @@ def load_arguments(self, _):
         c.argument('revision', help='NSX revision number.')
 
     with self.argument_context('vmware workload-network port-mirroring') as c:
-        c.argument('port_mirroring_id', help="NSX Port Mirroring identifier. Generally the same as the Port Mirroring display name.")
+        c.argument('port_mirroring', help="NSX Port Mirroring identifier. Generally the same as the Port Mirroring display name.")
         c.argument('display_name', help='Display name of the port mirroring profile.')
         c.argument('direction', help='Direction of port mirroring profile. Possible values include: "INGRESS, EGRESS, BIDIRECTIONAL".')
         c.argument('source', help='Source VM Group.')
         c.argument('destination', help='Destination VM Group.')
         c.argument('revision', help='NSX revision number.')
+
+    with self.argument_context('vmware workload-network segment') as c:
+        c.argument('segment', help="NSX Segment identifier. Generally the same as the Segment's display name.")
+        c.argument('display_name', help='Display name of the segment.')
+        c.argument('connected_gateway', help='Gateway which to connect segment to.')
+        c.argument('revision', help='NSX revision number.')
+        c.argument('dhcp_ranges', nargs='+', help='DHCP Range assigned for subnet.')
+        c.argument('gateway_address', help='Gateway address.')
+        c.argument('port_name', help='Name of port or VIF attached to segment.')
+
+    with self.argument_context('vmware workload-network public-ip') as c:
+        c.argument('public_ip', help="NSX Public IP Block identifier. Generally the same as the Public IP.")
+        c.argument('display_name', help='Display name of the Public IP Block.')
+        c.argument('number_of_public_ips', help='Number of Public IPs requested.')
+
+    with self.argument_context('vmware workload-network vm-group') as c:
+        c.argument('vm_group', help="NSX VM Group identifier. Generally the same as the VM Group's display name.")
+        c.argument('display_name', help='Display name of the VM group.')
+        c.argument('members', nargs='+', help='Virtual machine members of this group.')
+        c.argument('revision', help='NSX revision number.')
+
+    with self.argument_context('vmware workload-network vm') as c:
+        c.argument('virtual_machine', help="Virtual Machine identifier.")
+
+    with self.argument_context('vmware workload-network gateway') as c:
+        c.argument('gateway', help="NSX Gateway identifier. Generally the same as the Gateway's display name.")

src/vmware/azext_vmware/commands.py

@@ -142,3 +142,31 @@ def load_command_table(self, _):
         g.custom_command('create', 'workload_network_port_mirroring_create')
         g.custom_command('update', 'workload_network_port_mirroring_update')
         g.custom_command('delete', 'workload_network_port_mirroring_delete')
+
+    with self.command_group('vmware workload-network segment', vmware_sdk, client_factory=cf_vmware) as g:
+        g.custom_command('list', 'workload_network_segment_list')
+        g.custom_show_command('show', 'workload_network_segment_get')
+        g.custom_command('create', 'workload_network_segment_create')
+        g.custom_command('update', 'workload_network_segment_update')
+        g.custom_command('delete', 'workload_network_segment_delete')
+
+    with self.command_group('vmware workload-network public-ip', vmware_sdk, client_factory=cf_vmware) as g:
+        g.custom_command('list', 'workload_network_public_ip_list')
+        g.custom_show_command('show', 'workload_network_public_ip_get')
+        g.custom_command('create', 'workload_network_public_ip_create')
+        g.custom_command('delete', 'workload_network_public_ip_delete')
+
+    with self.command_group('vmware workload-network vm-group', vmware_sdk, client_factory=cf_vmware) as g:
+        g.custom_command('list', 'workload_network_vm_group_list')
+        g.custom_show_command('show', 'workload_network_vm_group_get')
+        g.custom_command('create', 'workload_network_vm_group_create')
+        g.custom_command('update', 'workload_network_vm_group_update')
+        g.custom_command('delete', 'workload_network_vm_group_delete')
+
+    with self.command_group('vmware workload-network vm', vmware_sdk, client_factory=cf_vmware) as g:
+        g.custom_command('list', 'workload_network_vm_list')
+        g.custom_show_command('show', 'workload_network_vm_get')
+
+    with self.command_group('vmware workload-network gateway', vmware_sdk, client_factory=cf_vmware) as g:
+        g.custom_command('list', 'workload_network_gateway_list')
+        g.custom_show_command('show', 'workload_network_gateway_get')