Hello community,

here is the log from the commit of package azure-cli-eventhubs for 
openSUSE:Factory checked in at 2019-10-31 18:16:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/azure-cli-eventhubs (Old)
 and      /work/SRC/openSUSE:Factory/.azure-cli-eventhubs.new.2990 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "azure-cli-eventhubs"

Thu Oct 31 18:16:06 2019 rev:5 rq:742690 version:0.3.7

Changes:
--------
--- /work/SRC/openSUSE:Factory/azure-cli-eventhubs/azure-cli-eventhubs.changes  
2019-06-05 11:43:27.195036658 +0200
+++ 
/work/SRC/openSUSE:Factory/.azure-cli-eventhubs.new.2990/azure-cli-eventhubs.changes
        2019-10-31 18:16:07.246064270 +0100
@@ -1,0 +2,9 @@
+Thu Oct 24 12:10:16 UTC 2019 - John Paul Adrian Glaubitz 
<[email protected]>
+
+- New upstream release
+  + Version 0.3.7
+  + For detailed information about changes see the
+    HISTORY.txt file provided with this package
+- Update Requires from setup.py
+
+-------------------------------------------------------------------

Old:
----
  azure-cli-eventhubs-0.3.3.tar.gz

New:
----
  azure-cli-eventhubs-0.3.7.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ azure-cli-eventhubs.spec ++++++
--- /var/tmp/diff_new_pack.U4EZwT/_old  2019-10-31 18:16:08.574065645 +0100
+++ /var/tmp/diff_new_pack.U4EZwT/_new  2019-10-31 18:16:08.594065666 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           azure-cli-eventhubs
-Version:        0.3.3
+Version:        0.3.7
 Release:        0
 Summary:        Microsoft Azure CLI 'eventhubs' Command Module
 License:        MIT
@@ -33,7 +33,7 @@
 Requires:       azure-cli-command-modules-nspkg
 Requires:       azure-cli-core
 Requires:       azure-cli-nspkg
-Requires:       python3-azure-mgmt-eventhub >= 2.2.0
+Requires:       python3-azure-mgmt-eventhub >= 2.6.0
 Requires:       python3-azure-nspkg >= 3.0.0
 Requires:       python3-six
 Conflicts:      azure-cli < 2.0.0

++++++ azure-cli-eventhubs-0.3.3.tar.gz -> azure-cli-eventhubs-0.3.7.tar.gz 
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/azure-cli-eventhubs-0.3.3/HISTORY.rst 
new/azure-cli-eventhubs-0.3.7/HISTORY.rst
--- old/azure-cli-eventhubs-0.3.3/HISTORY.rst   2019-01-25 20:43:40.000000000 
+0100
+++ new/azure-cli-eventhubs-0.3.7/HISTORY.rst   2019-06-13 23:17:46.000000000 
+0200
@@ -2,6 +2,24 @@
 
 Release History
 ===============
+
+0.3.7
++++++
+* Minor fixes.
+
+0.3.6
++++++
+* Minor fixes.
+
+0.3.5
++++++
+* namespace: Added network-rule commands.
+* namespace create/update: Added --default-action argument for network rules.
+
+0.3.4
++++++
+* eventhubs eventhub create/update: Added --skip-empty-archives flag to 
support empty archives in capture.
+
 0.3.3
 +++++
 * Minor fixes
@@ -12,7 +30,7 @@
 
 0.3.1
 +++++
-* eventhub namespace create/update: Added --enable-kafka flag to support Kafka.
+* eventhubs namespace create/update: Added --enable-kafka flag to support 
Kafka.
 
 0.3.0
 +++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/azure-cli-eventhubs-0.3.3/PKG-INFO 
new/azure-cli-eventhubs-0.3.7/PKG-INFO
--- old/azure-cli-eventhubs-0.3.3/PKG-INFO      2019-01-25 20:44:02.000000000 
+0100
+++ new/azure-cli-eventhubs-0.3.7/PKG-INFO      2019-06-13 23:18:09.000000000 
+0200
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: azure-cli-eventhubs
-Version: 0.3.3
+Version: 0.3.7
 Summary: Microsoft Azure Command-Line Tools Event Hubs Command Module
 Home-page: https://github.com/Azure/azure-cli
 Author: Microsoft Corporation
@@ -19,6 +19,24 @@
         
         Release History
         ===============
+        
+        0.3.7
+        +++++
+        * Minor fixes.
+        
+        0.3.6
+        +++++
+        * Minor fixes.
+        
+        0.3.5
+        +++++
+        * namespace: Added network-rule commands.
+        * namespace create/update: Added --default-action argument for network 
rules.
+        
+        0.3.4
+        +++++
+        * eventhubs eventhub create/update: Added --skip-empty-archives flag 
to support empty archives in capture.
+        
         0.3.3
         +++++
         * Minor fixes
@@ -29,7 +47,7 @@
         
         0.3.1
         +++++
-        * eventhub namespace create/update: Added --enable-kafka flag to 
support Kafka.
+        * eventhubs namespace create/update: Added --enable-kafka flag to 
support Kafka.
         
         0.3.0
         +++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/azure-cli-eventhubs-0.3.3/azure/cli/command_modules/eventhubs/__init__.py 
new/azure-cli-eventhubs-0.3.7/azure/cli/command_modules/eventhubs/__init__.py
--- 
old/azure-cli-eventhubs-0.3.3/azure/cli/command_modules/eventhubs/__init__.py   
    2019-01-25 20:43:40.000000000 +0100
+++ 
new/azure-cli-eventhubs-0.3.7/azure/cli/command_modules/eventhubs/__init__.py   
    2019-06-13 23:17:46.000000000 +0200
@@ -16,10 +16,11 @@
     def __init__(self, cli_ctx=None):
         from azure.cli.core import ModExtensionSuppress
         from azure.cli.core.commands import CliCommandType
+        from azure.cli.core.profiles import ResourceType
         eventhub_custom = 
CliCommandType(operations_tmpl='azure.cli.command_modules.eventhubs.custom#{}')
         super(EventhubCommandsLoader, self).__init__(cli_ctx=cli_ctx,
                                                      
custom_command_type=eventhub_custom,
-                                                     
min_profile='2017-03-10-profile',
+                                                     
resource_type=ResourceType.MGMT_EVENTHUB,
                                                      
suppress_extension=ModExtensionSuppress(__name__, 'eventhubs', '0.0.1',
                                                                                
              reason='These commands are now in the CLI.',
                                                                                
              recommend_remove=True))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/azure-cli-eventhubs-0.3.3/azure/cli/command_modules/eventhubs/_help.py 
new/azure-cli-eventhubs-0.3.7/azure/cli/command_modules/eventhubs/_help.py
--- old/azure-cli-eventhubs-0.3.3/azure/cli/command_modules/eventhubs/_help.py  
2019-01-25 20:43:40.000000000 +0100
+++ new/azure-cli-eventhubs-0.3.7/azure/cli/command_modules/eventhubs/_help.py  
2019-06-13 23:17:46.000000000 +0200
@@ -13,22 +13,27 @@
 
 helps['eventhubs namespace'] = """
     type: group
-    short-summary: Manage Azure Event Hubs namespace and Authorizationrule
+    short-summary: Manage Azure EventHubs namespace and Authorizationrule
 """
 
 helps['eventhubs namespace authorization-rule'] = """
     type: group
-    short-summary: Manage Azure Event Hubs Authorizationrule for Namespace
+    short-summary: Manage Azure EventHubs Authorizationrule for Namespace
 """
 
 helps['eventhubs namespace authorization-rule keys'] = """
     type: group
-    short-summary: Manage Azure Event Hubs Authorizationrule connection 
strings for Namespace
+    short-summary: Manage Azure EventHubs Authorizationrule connection strings 
for Namespace
+"""
+
+helps['eventhubs namespace network-rule'] = """
+    type: group
+    short-summary: Manage Azure EventHubs networkruleset for namespace
 """
 
 helps['eventhubs eventhub'] = """
     type: group
-    short-summary: Manage Azure Event Hubs eventhub and authorization-rule
+    short-summary: Manage Azure EventHubs eventhub and authorization-rule
 """
 
 helps['eventhubs eventhub authorization-rule'] = """
@@ -48,12 +53,12 @@
 
 helps['eventhubs georecovery-alias'] = """
     type:  group
-    short-summary: Manage Azure Event Hubs Geo Recovery configuration Alias
+    short-summary: Manage Azure EventHubs Geo Recovery configuration Alias
 """
 
 helps['eventhubs georecovery-alias authorization-rule'] = """
     type: group
-    short-summary: Manage Azure Event Hubs Authorizationrule for Geo Recovery 
configuration Alias
+    short-summary: Manage Azure EventHubs Authorizationrule for Geo Recovery 
configuration Alias
 """
 
 helps['eventhubs georecovery-alias authorization-rule keys'] = """
@@ -71,7 +76,7 @@
 
 helps['eventhubs namespace create'] = """
     type: command
-    short-summary: Creates the Event Hubs Namespace
+    short-summary: Creates the EventHubs Namespace
     examples:
         - name: Creates a new namespace.
           text: az eventhubs namespace create --resource-group myresourcegroup 
--name mynamespace --location westus
@@ -80,7 +85,7 @@
 
 helps['eventhubs namespace update'] = """
     type: command
-    short-summary: Updates the Event Hubs Namespace
+    short-summary: Updates the EventHubs Namespace
     examples:
         - name: Update a new namespace.
           text: az eventhubs namespace update --resource-group myresourcegroup 
--name mynamespace --tags tag=value --enable-auto-inflate True
@@ -96,7 +101,7 @@
 
 helps['eventhubs namespace list'] = """
     type: command
-    short-summary: Lists the Event Hubs Namespaces
+    short-summary: Lists the EventHubs Namespaces
     examples:
         - name: List the Event Hubs Namespaces by resource group.
           text: az eventhubs namespace list --resource-group myresourcegroup
@@ -171,7 +176,7 @@
 
 helps['eventhubs eventhub create'] = """
     type: command
-    short-summary: Creates the Event Hubs Eventhub
+    short-summary: Creates the EventHubs Eventhub
     examples:
         - name: Create a new Eventhub.
           text: az eventhubs eventhub create --resource-group myresourcegroup 
--namespace-name mynamespace --name myeventhub --message-retention 4 
--partition-count 15
@@ -179,7 +184,7 @@
 
 helps['eventhubs eventhub update'] = """
     type: command
-    short-summary: Updates the Event Hubs Eventhub
+    short-summary: Updates the EventHubs Eventhub
     examples:
         - name: Updates a new Eventhub.
           text: az eventhubs eventhub update --resource-group myresourcegroup 
--namespace-name mynamespace --name myeventhub --message-retention 3 
--partition-count 12
@@ -333,23 +338,23 @@
 
 helps['eventhubs georecovery-alias authorization-rule show'] = """
     type: command
-    short-summary: Show properties of Event Hubs Geo-Disaster Recovery 
Configuration Alias and Namespace Authorizationrule
+    short-summary: Show properties of EventHubs Geo-Disaster Recovery 
Configuration Alias and Namespace Authorizationrule
     examples:
-        - name: Show properties Authorizationrule by Event Hubs Namespace
+        - name: Show properties Authorizationrule by EventHubs Namespace
           text: az eventhubs georecovery-alias authorization-rule show 
--resource-group myresourcegroup --namespace-name mynamespace
 """
 
 helps['eventhubs georecovery-alias authorization-rule list'] = """
     type: command
-    short-summary: List of Authorizationrule by Event Hubs Namespace
+    short-summary: List of Authorizationrule by EventHubs Namespace
     examples:
-        - name: List of Authorizationrule by Event Hubs Namespace
+        - name: List of Authorizationrule by EventHubs Namespace
           text: az eventhubs georecovery-alias authorization-rule list 
--resource-group myresourcegroup --namespace-name mynamespace --alias 
myaliasname
 """
 
 helps['eventhubs georecovery-alias authorization-rule keys list'] = """
     type: command
-    short-summary: Shows the keys and connection strings of Authorizationrule 
for the Event Hubs Namespace
+    short-summary: Shows the keys and connection strings of Authorizationrule 
for the EventHubs Namespace
     examples:
         - name: Shows the keys and connection strings of Authorizationrule for 
the namespace.
           text: az eventhubs georecovery-alias authorization-rule keys list 
--resource-group myresourcegroup --namespace-name mynamespace --name 
myauthorule --alias myaliasname
@@ -378,3 +383,31 @@
         - name: Delete Geo-Disaster Recovery Configuration Alias
           text: az eventhubs georecovery-alias delete --resource-group 
myresourcegroup --namespace-name secondarynamespace --alias myaliasname
 """
+
+helps['eventhubs namespace network-rule add'] = """
+    type: command
+    short-summary: Add a network rule for a namespace.
+    examples:
+        - name: add a VirtualNetwork rule in NetworkruleSet for a namespace
+          text: az eventhubs namespace network-rule add --resource-group 
myresourcegroup --namespace-name mynamespace --subnet 
/subscriptions/{subscriptionid}/resourcegroups/{resourcegroupname}/providers/Microsoft.Network/virtualNetworks/{virtualnetworkname}/subnets/{subnetname}
 --ignore-missing-endpoint True
+        - name: add a IP rule in NetworkruleSet for a namespace
+          text: az eventhubs namespace network-rule add --resource-group 
myresourcegroup --namespace-name mynamespace --ip-address 10.6.0.0/24 --action 
Allow
+"""
+
+helps['eventhubs namespace network-rule list'] = """
+    type: command
+    short-summary: Show properties of Network rule of the given Namespace.
+    examples:
+        - name: Show properties of Network rule of the given Namespace
+          text: az eventhubs namespace network-rule list --resource-group 
myresourcegroup --namespace-name mynamespace
+"""
+
+helps['eventhubs namespace network-rule remove'] = """
+    type: command
+    short-summary: Remove network rule for a namespace
+    examples:
+        - name: remove VirtualNetwork rule from NetworkruleSet for a namespace
+          text: az eventhubs namespace network-rule remove --resource-group 
myresourcegroup --namespace-name mynamespace --subnet 
/subscriptions/{subscriptionid}/resourcegroups/{resourcegroupname}/providers/Microsoft.Network/virtualNetworks/{virtualnetworkname}/subnets/{subnetname}
+        - name: remove IP rule from NetworkruleSet for a namespace
+          text: az eventhubs namespace network-rule remove --resource-group 
myresourcegroup --namespace-name mynamespace --ip-address 10.6.0.0/24
+"""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/azure-cli-eventhubs-0.3.3/azure/cli/command_modules/eventhubs/_params.py 
new/azure-cli-eventhubs-0.3.7/azure/cli/command_modules/eventhubs/_params.py
--- 
old/azure-cli-eventhubs-0.3.3/azure/cli/command_modules/eventhubs/_params.py    
    2019-01-25 20:43:40.000000000 +0100
+++ 
new/azure-cli-eventhubs-0.3.7/azure/cli/command_modules/eventhubs/_params.py    
    2019-06-13 23:17:46.000000000 +0200
@@ -5,16 +5,18 @@
 # pylint: disable=line-too-long
 # pylint: disable=too-many-statements
 
-from azure.cli.core.commands.parameters import tags_type, get_enum_type, 
resource_group_name_type, name_type, get_location_type, get_three_state_flag, 
get_resource_name_completion_list
-from azure.cli.core.commands.validators import 
get_default_location_from_resource_group
-
 
 # pylint: disable=line-too-long
 def load_arguments_eh(self, _):
-    from knack.arguments import CLIArgumentType
-    from azure.mgmt.eventhub.models import KeyType, AccessRights, SkuName
-    from azure.cli.command_modules.eventhubs._completers import 
get_consumergroup_command_completion_list, get_eventhubs_command_completion_list
+    from azure.cli.core.commands.parameters import tags_type, get_enum_type, 
resource_group_name_type, name_type, \
+        get_location_type, get_three_state_flag, 
get_resource_name_completion_list
+    from azure.cli.core.commands.validators import 
get_default_location_from_resource_group
+    from azure.cli.command_modules.eventhubs._completers import 
get_consumergroup_command_completion_list, \
+        get_eventhubs_command_completion_list
     from azure.cli.command_modules.eventhubs._validator import 
validate_storageaccount, validate_partner_namespace
+    from knack.arguments import CLIArgumentType
+    from azure.cli.core.profiles import ResourceType
+    (KeyType, AccessRights, SkuName) = self.get_models('KeyType', 
'AccessRights', 'SkuName', resource_type=ResourceType.MGMT_EVENTHUB)
 
     rights_arg_type = CLIArgumentType(options_list=['--rights'], nargs='+', 
arg_type=get_enum_type(AccessRights), help='Space-separated list of 
Authorization rule rights')
     key_arg_type = CLIArgumentType(options_list=['--key'], 
arg_type=get_enum_type(KeyType), help='specifies Primary or Secondary key needs 
to be reset')
@@ -33,21 +35,14 @@
         c.argument('namespace_name', arg_type=name_type, id_part='name', 
completer=get_resource_name_completion_list('Microsoft.ServiceBus/namespaces'), 
help='Name of Namespace')
         c.argument('is_kafka_enabled', options_list=['--enable-kafka'], 
arg_type=get_three_state_flag(),
                    help='A boolean value that indicates whether Kafka is 
enabled for eventhub namespace.')
-
-    with self.argument_context('eventhubs namespace create') as c:
         c.argument('tags', arg_type=tags_type)
-        c.argument('sku', options_list=['--sku'], 
arg_type=get_enum_type(SkuName))
+        c.argument('sku', options_list=['--sku'], 
arg_type=get_enum_type(SkuName), help='Namespace SKU.')
         c.argument('location', arg_type=get_location_type(self.cli_ctx), 
validator=get_default_location_from_resource_group)
         c.argument('capacity', type=int, help='Capacity for Sku')
         c.argument('is_auto_inflate_enabled', 
options_list=['--enable-auto-inflate'], arg_type=get_three_state_flag(), 
help='A boolean value that indicates whether AutoInflate is enabled for 
eventhub namespace.')
         c.argument('maximum_throughput_units', type=int, help='Upper limit of 
throughput units when AutoInflate is enabled, vaule should be within 0 to 20 
throughput units. ( 0 if AutoInflateEnabled = true)')
-
-    with self.argument_context('eventhubs namespace update') as c:
-        c.argument('tags', arg_type=tags_type)
-        c.argument('sku', options_list=['--sku'], 
arg_type=get_enum_type(SkuName))
-        c.argument('capacity', type=int, help='Capacity for Sku')
-        c.argument('is_auto_inflate_enabled', 
options_list=['--enable-auto-inflate'], arg_type=get_three_state_flag(), 
help='A boolean value that indicates whether AutoInflate is enabled for 
eventhub namespace.')
-        c.argument('maximum_throughput_units', type=int, help='Upper limit of 
throughput units when AutoInflate is enabled, vaule should be within 0 to 20 
throughput units. ( 0 if AutoInflateEnabled = true)')
+        c.argument('default_action', arg_group='networkrule', 
options_list=['--default-action'], arg_type=get_enum_type(['Allow', 'Deny']),
+                   help='Default Action for Network Rule Set.')
 
     # region Namespace Authorizationrule
     with self.argument_context('eventhubs namespace authorization-rule list') 
as c:
@@ -70,17 +65,17 @@
         c.argument('key_type', arg_type=key_arg_type)
         c.argument('key', arg_type=keyvalue_arg_type)
 
-
 # region - Eventhub Create
     with self.argument_context('eventhubs eventhub') as c:
         c.argument('event_hub_name', arg_type=name_type, 
id_part='child_name_1', completer=get_eventhubs_command_completion_list, 
help='Name of Eventhub')
 
     for scope in ['eventhubs eventhub update', 'eventhubs eventhub create']:
         with self.argument_context(scope) as c:
-            c.argument('message_retention_in_days', 
options_list=['--message-retention'], type=int, help='Number of days to retain 
events for this Event Hub, value should be 1 to 7 days')
+            c.argument('message_retention_in_days', 
options_list=['--message-retention'], type=int, help='Number of days to retain 
events for this Event Hub, value should be 1 to 7 days and depends on Namespace 
sku. if Namespace sku is Basic than value should be one and is Manadatory 
parameter. Namespace sku is standard value should be 1 to 7 days, default is 7 
days and is optional parameter')
             c.argument('partition_count', type=int, help='Number of partitions 
created for the Event Hub. By default, allowed values are 2-32. Lower value of 
1 is supported with Kafka enabled namespaces. In presence of a custom quota, 
the upper limit will match the upper limit of the quota.')
             c.argument('status', arg_type=get_enum_type(['Active', 'Disabled', 
'SendDisabled', 'ReceiveDisabled']), help='Status of Eventhub')
             c.argument('enabled', options_list=['--enable-capture'], 
arg_type=get_three_state_flag(), help='A boolean value that indicates whether 
capture description is enabled.')
+            c.argument('skip_empty_archives', 
options_list=['--skip-empty-archives'], arg_type=get_three_state_flag(), 
help='A boolean value that indicates whether to Skip Empty.')
             c.argument('capture_interval_seconds', arg_group='Capture', 
options_list=['--capture-interval'], type=int, help='Allows you to set the 
frequency with which the capture to Azure Blobs will happen, value should 
between 60 to 900 seconds')
             c.argument('capture_size_limit_bytes', arg_group='Capture', 
options_list=['--capture-size-limit'], type=int, help='Defines the amount of 
data built up in your Event Hub before an capture operation, value should be 
between 10485760 to 524288000 bytes')
             c.argument('destination_name', arg_group='Capture-Destination', 
help='Name for capture destination')
@@ -155,3 +150,18 @@
         c.argument('alias', options_list=['--alias', '-a'], id_part=None, 
help='Name of Geo-Disaster Recovery Configuration Alias')
         c.argument('namespace_name', options_list=['--namespace-name'], 
id_part=None, help='Name of Namespace')
         c.argument('authorization_rule_name', arg_type=name_type, help='Name 
of Namespace AuthorizationRule')
+
+# Region Namespace NetworkRuleSet
+    with self.argument_context('eventhubs namespace network-rule', 
resource_type=ResourceType.MGMT_EVENTHUB, min_api='2017-04-01') as c:
+        c.argument('namespace_name', options_list=['--namespace-name'], 
id_part=None, help='Name of the Namespace')
+
+    for scope in ['eventhubs namespace network-rule add', 'eventhubs namespace 
network-rule remove']:
+        with self.argument_context(scope, 
resource_type=ResourceType.MGMT_EVENTHUB, min_api='2017-04-01') as c:
+            c.argument('subnet', arg_group='Virtual Network Rule', 
options_list=['--subnet'], help='Name or ID of subnet. If name is supplied, 
`--vnet-name` must be supplied.')
+            c.argument('ip_mask', arg_group='IP Address Rule', 
options_list=['--ip-address'], help='IPv4 address or CIDR range - 10.6.0.0/24')
+            c.argument('namespace_name', options_list=['--namespace-name'], 
id_part=None, help='Name of the Namespace')
+            c.extra('vnet_name', arg_group='Virtual Network Rule', 
options_list=['--vnet-name'], help='Name of the Virtual Network')
+
+    with self.argument_context('eventhubs namespace network-rule add', 
resource_type=ResourceType.MGMT_EVENTHUB, min_api='2017-04-01') as c:
+        c.argument('ignore_missing_vnet_service_endpoint', arg_group='Virtual 
Network Rule', options_list=['--ignore-missing-endpoint'], 
arg_type=get_three_state_flag(), help='A boolean value that indicates whether 
to ignore missing vnet Service Endpoint')
+        c.argument('action', arg_group='IP Address Rule', 
options_list=['--action'], arg_type=get_enum_type(['Allow']), help='Action of 
the IP rule')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/azure-cli-eventhubs-0.3.3/azure/cli/command_modules/eventhubs/_validator.py 
new/azure-cli-eventhubs-0.3.7/azure/cli/command_modules/eventhubs/_validator.py
--- 
old/azure-cli-eventhubs-0.3.3/azure/cli/command_modules/eventhubs/_validator.py 
    2019-01-25 20:43:40.000000000 +0100
+++ 
new/azure-cli-eventhubs-0.3.7/azure/cli/command_modules/eventhubs/_validator.py 
    2019-06-13 23:17:46.000000000 +0200
@@ -6,6 +6,7 @@
 # pylint: disable=line-too-long
 # pylint: disable=too-many-lines
 # pylint: disable=inconsistent-return-statements
+from azure.cli.core.util import CLIError
 
 
 def validate_storageaccount(cmd, namespace):
@@ -32,3 +33,28 @@
                 namespace='Microsoft.EventHub',
                 type='namespaces',
                 name=namespace.partner_namespace)
+
+
+# Validates if a subnet id or name have been given by the user. If subnet id 
is given, vnet-name should not be provided.
+def validate_subnet(cmd, namespace):
+    from msrestazure.tools import resource_id, is_valid_resource_id
+    from azure.cli.core.commands.client_factory import get_subscription_id
+
+    subnet = namespace.subnet
+    subnet_is_id = is_valid_resource_id(subnet)
+    vnet = namespace.vnet_name
+
+    if (subnet_is_id and not vnet) or (not subnet and not vnet):
+        pass
+    elif subnet and not subnet_is_id and vnet:
+        namespace.subnet = resource_id(
+            subscription=get_subscription_id(cmd.cli_ctx),
+            resource_group=namespace.resource_group_name,
+            namespace='Microsoft.Network',
+            type='virtualNetworks',
+            name=vnet,
+            child_type_1='subnets',
+            child_name_1=subnet)
+    else:
+        raise CLIError('incorrect usage: [--subnet ID | --subnet NAME 
--vnet-name NAME]')
+    delattr(namespace, 'vnet_name')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/azure-cli-eventhubs-0.3.3/azure/cli/command_modules/eventhubs/commands.py 
new/azure-cli-eventhubs-0.3.7/azure/cli/command_modules/eventhubs/commands.py
--- 
old/azure-cli-eventhubs-0.3.3/azure/cli/command_modules/eventhubs/commands.py   
    2019-01-25 20:43:40.000000000 +0100
+++ 
new/azure-cli-eventhubs-0.3.7/azure/cli/command_modules/eventhubs/commands.py   
    2019-06-13 23:17:46.000000000 +0200
@@ -7,6 +7,7 @@
 # pylint: disable=too-many-statements
 
 from azure.cli.core.commands import CliCommandType
+from azure.cli.core.profiles import ResourceType
 
 
 def load_command_table(self, _):
@@ -16,25 +17,32 @@
                                                                      
disaster_recovery_mgmt_client_factory)
 
     eh_namespace_util = CliCommandType(
-        
operations_tmpl='azure.mgmt.eventhub.operations.namespaces_operations#NamespacesOperations.{}',
-        client_factory=namespaces_mgmt_client_factory)
+        
operations_tmpl='azure.mgmt.eventhub.operations#NamespacesOperations.{}',
+        client_factory=namespaces_mgmt_client_factory,
+        resource_type=ResourceType.MGMT_EVENTHUB)
 
     eh_event_hub_util = CliCommandType(
-        
operations_tmpl='azure.mgmt.eventhub.operations.event_hubs_operations#EventHubsOperations.{}',
-        client_factory=event_hub_mgmt_client_factory)
+        
operations_tmpl='azure.mgmt.eventhub.operations#EventHubsOperations.{}',
+        client_factory=event_hub_mgmt_client_factory,
+        resource_type=ResourceType.MGMT_EVENTHUB)
 
     eh_consumer_groups_util = CliCommandType(
-        
operations_tmpl='azure.mgmt.eventhub.operations.consumer_groups_operations#ConsumerGroupsOperations.{}',
-        client_factory=consumer_groups_mgmt_client_factory)
+        
operations_tmpl='azure.mgmt.eventhub.operations#ConsumerGroupsOperations.{}',
+        client_factory=consumer_groups_mgmt_client_factory,
+        resource_type=ResourceType.MGMT_EVENTHUB)
 
     eh_geodr_util = CliCommandType(
-        
operations_tmpl='azure.mgmt.eventhub.operations.disaster_recovery_configs_operations#DisasterRecoveryConfigsOperations.{}',
-        client_factory=disaster_recovery_mgmt_client_factory)
+        
operations_tmpl='azure.mgmt.eventhub.operations#DisasterRecoveryConfigsOperations.{}',
+        client_factory=disaster_recovery_mgmt_client_factory,
+        resource_type=ResourceType.MGMT_EVENTHUB)
+
+    from ._validator import validate_subnet
+
 
 # Namespace Region
     custom_tmpl = 'azure.cli.command_modules.eventhubs.custom#{}'
     eventhubs_custom = CliCommandType(operations_tmpl=custom_tmpl)
-    with self.command_group('eventhubs namespace', eh_namespace_util, 
client_factory=namespaces_mgmt_client_factory) as g:
+    with self.command_group('eventhubs namespace', eh_namespace_util, 
resource_type=ResourceType.MGMT_EVENTHUB, 
client_factory=namespaces_mgmt_client_factory) as g:
         g.custom_command('create', 'cli_namespace_create')
         g.show_command('show', 'get')
         g.custom_command('list', 'cli_namespace_list')
@@ -42,7 +50,7 @@
         g.command('exists', 'check_name_availability')
         g.generic_update_command('update', 
custom_func_name='cli_namespace_update', custom_func_type=eventhubs_custom)
 
-    with self.command_group('eventhubs namespace authorization-rule', 
eh_namespace_util, client_factory=namespaces_mgmt_client_factory) as g:
+    with self.command_group('eventhubs namespace authorization-rule', 
eh_namespace_util, resource_type=ResourceType.MGMT_EVENTHUB, 
client_factory=namespaces_mgmt_client_factory) as g:
         g.command('create', 'create_or_update_authorization_rule')
         g.show_command('show', 'get_authorization_rule')
         g.command('list', 'list_authorization_rules')
@@ -52,14 +60,14 @@
         g.generic_update_command('update', 
getter_name='get_authorization_rule', 
setter_name='create_or_update_authorization_rule', 
custom_func_name='cli_autho_update')
 
 # EventHub Region
-    with self.command_group('eventhubs eventhub', eh_event_hub_util, 
client_factory=event_hub_mgmt_client_factory) as g:
+    with self.command_group('eventhubs eventhub', eh_event_hub_util, 
resource_type=ResourceType.MGMT_EVENTHUB, 
client_factory=event_hub_mgmt_client_factory) as g:
         g.custom_command('create', 'cli_eheventhub_create')
         g.show_command('show', 'get')
         g.command('list', 'list_by_namespace')
         g.command('delete', 'delete')
         g.generic_update_command('update', 
custom_func_name='cli_eheventhub_update')
 
-    with self.command_group('eventhubs eventhub authorization-rule', 
eh_event_hub_util, client_factory=event_hub_mgmt_client_factory) as g:
+    with self.command_group('eventhubs eventhub authorization-rule', 
eh_event_hub_util, resource_type=ResourceType.MGMT_EVENTHUB, 
client_factory=event_hub_mgmt_client_factory) as g:
         g.command('create', 'create_or_update_authorization_rule')
         g.show_command('show', 'get_authorization_rule')
         g.command('list', 'list_authorization_rules')
@@ -69,7 +77,7 @@
         g.generic_update_command('update', 
getter_name='get_authorization_rule', 
setter_name='create_or_update_authorization_rule', 
custom_func_name='cli_autho_update')
 
 # ConsumerGroup Region
-    with self.command_group('eventhubs eventhub consumer-group', 
eh_consumer_groups_util, client_factory=consumer_groups_mgmt_client_factory) as 
g:
+    with self.command_group('eventhubs eventhub consumer-group', 
eh_consumer_groups_util, resource_type=ResourceType.MGMT_EVENTHUB, 
client_factory=consumer_groups_mgmt_client_factory) as g:
         g.command('create', 'create_or_update')
         g.show_command('show', 'get')
         g.command('list', 'list_by_event_hub')
@@ -77,7 +85,7 @@
         g.generic_update_command('update')
 
 # DisasterRecoveryConfigs Region
-    with self.command_group('eventhubs georecovery-alias', eh_geodr_util, 
client_factory=disaster_recovery_mgmt_client_factory) as g:
+    with self.command_group('eventhubs georecovery-alias', eh_geodr_util, 
resource_type=ResourceType.MGMT_EVENTHUB, 
client_factory=disaster_recovery_mgmt_client_factory) as g:
         g.command('set', 'create_or_update')
         g.show_command('show', 'get')
         g.command('list', 'list')
@@ -86,7 +94,13 @@
         g.command('exists', 'check_name_availability')
         g.command('delete', 'delete')
 
-    with self.command_group('eventhubs georecovery-alias authorization-rule', 
eh_geodr_util, client_factory=disaster_recovery_mgmt_client_factory) as g:
+    with self.command_group('eventhubs georecovery-alias authorization-rule', 
eh_geodr_util, resource_type=ResourceType.MGMT_EVENTHUB, 
client_factory=disaster_recovery_mgmt_client_factory) as g:
         g.command('list', 'list_authorization_rules')
         g.show_command('show', 'get_authorization_rule')
         g.command('keys list', 'list_keys')
+
+# NetwrokRuleSet Region
+    with self.command_group('eventhubs namespace network-rule', 
eh_namespace_util, min_api='2017-04-01', 
resource_type=ResourceType.MGMT_EVENTHUB, 
client_factory=namespaces_mgmt_client_factory) as g:
+        g.custom_command('add', 'cli_networkrule_createupdate', 
validator=validate_subnet)
+        g.show_command('list', 'get_network_rule_set')
+        g.custom_command('remove', 'cli_networkrule_delete', 
validator=validate_subnet)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/azure-cli-eventhubs-0.3.3/azure/cli/command_modules/eventhubs/custom.py 
new/azure-cli-eventhubs-0.3.7/azure/cli/command_modules/eventhubs/custom.py
--- old/azure-cli-eventhubs-0.3.3/azure/cli/command_modules/eventhubs/custom.py 
2019-01-25 20:43:40.000000000 +0100
+++ new/azure-cli-eventhubs-0.3.7/azure/cli/command_modules/eventhubs/custom.py 
2019-06-13 23:17:46.000000000 +0200
@@ -6,87 +6,117 @@
 # pylint: disable=line-too-long
 # pylint: disable=too-many-lines
 # pylint: disable=inconsistent-return-statements
+from azure.cli.core.profiles import ResourceType
 
 
+# , resource_type = ResourceType.MGMT_EVENTHUB
 # Namespace Region
-def cli_namespace_create(client, resource_group_name, namespace_name, 
location=None, tags=None, sku='Standard', capacity=None, 
is_auto_inflate_enabled=None, maximum_throughput_units=None, 
is_kafka_enabled=None):
-    from azure.mgmt.eventhub.models import EHNamespace, Sku
-    return client.create_or_update(
-        resource_group_name=resource_group_name,
-        namespace_name=namespace_name,
-        parameters=EHNamespace(
-            location=location,
-            tags=tags,
-            sku=Sku(name=sku, tier=sku, capacity=capacity),
-            is_auto_inflate_enabled=is_auto_inflate_enabled,
-            maximum_throughput_units=maximum_throughput_units,
-            kafka_enabled=is_kafka_enabled))
-
-
-def cli_namespace_update(instance, tags=None, sku=None, capacity=None, 
is_auto_inflate_enabled=None, maximum_throughput_units=None, 
is_kafka_enabled=None):
-
-    if tags:
-        instance.tags = tags
-
-    if sku:
-        instance.sku.name = sku
-        instance.sku.tier = sku
-
-    if capacity:
-        instance.sku.capacity = capacity
-
-    if is_auto_inflate_enabled:
-        instance.is_auto_inflate_enabled = is_auto_inflate_enabled
-
-    if maximum_throughput_units:
-        instance.maximum_throughput_units = maximum_throughput_units
-
-    if is_kafka_enabled:
-        instance.kafka_enabled = is_kafka_enabled
+def cli_namespace_create(cmd, client, resource_group_name, namespace_name, 
location=None, tags=None, sku='Standard', capacity=None, 
is_auto_inflate_enabled=None, maximum_throughput_units=None, 
is_kafka_enabled=None, default_action=None):
+    # from azure.mgmt.eventhub.models import EHNamespace, Sku
+    EHNamespace = cmd.get_models('EHNamespace', 
resource_type=ResourceType.MGMT_EVENTHUB)
+    Sku = cmd.get_models('Sku', resource_type=ResourceType.MGMT_EVENTHUB)
+
+    if cmd.supported_api_version(resource_type=ResourceType.MGMT_EVENTHUB, 
min_api='2017-04-01'):
+        client.create_or_update(
+            resource_group_name=resource_group_name,
+            namespace_name=namespace_name,
+            parameters=EHNamespace(
+                location=location,
+                tags=tags,
+                sku=Sku(name=sku, tier=sku, capacity=capacity),
+                is_auto_inflate_enabled=is_auto_inflate_enabled,
+                maximum_throughput_units=maximum_throughput_units,
+                kafka_enabled=is_kafka_enabled)).result()
+
+    if default_action:
+        netwrokruleset = client.get_network_rule_set(resource_group_name, 
namespace_name)
+        netwrokruleset.default_action = default_action
+        client.create_or_update_network_rule_set(resource_group_name, 
namespace_name, netwrokruleset)
+
+    return client.get(resource_group_name, namespace_name)
+
+
+def cli_namespace_update(cmd, client, instance, tags=None, sku=None, 
capacity=None, is_auto_inflate_enabled=None, maximum_throughput_units=None, 
is_kafka_enabled=None, default_action=None):
+
+    if cmd.supported_api_version(resource_type=ResourceType.MGMT_EVENTHUB, 
min_api='2017-04-01'):
+        if tags:
+            instance.tags = tags
+
+        if sku:
+            instance.sku.name = sku
+            instance.sku.tier = sku
+
+        if capacity:
+            instance.sku.capacity = capacity
+
+        if is_auto_inflate_enabled:
+            instance.is_auto_inflate_enabled = is_auto_inflate_enabled
+
+        if maximum_throughput_units:
+            instance.maximum_throughput_units = maximum_throughput_units
+
+        if is_kafka_enabled:
+            instance.kafka_enabled = is_kafka_enabled
+
+        if default_action:
+            resourcegroup = instance.id.split('/')[4]
+            netwrokruleset = client.get_network_rule_set(resourcegroup, 
instance.name)
+            netwrokruleset.default_action = default_action
+            client.create_or_update_network_rule_set(resourcegroup, 
instance.name, netwrokruleset)
 
     return instance
 
 
-def cli_namespace_list(client, resource_group_name=None):
-    if resource_group_name:
-        return 
client.list_by_resource_group(resource_group_name=resource_group_name)
+def cli_namespace_list(cmd, client, resource_group_name=None):
+    if cmd.supported_api_version(min_api='2017-04-01'):
+        if resource_group_name:
+            return 
client.list_by_resource_group(resource_group_name=resource_group_name)
 
     return client.list()
 
 
 # Namespace Authorization rule:
-def cli_autho_update(instance, rights):
-    from azure.cli.command_modules.eventhubs._utils import 
accessrights_converter
-    instance.rights = accessrights_converter(rights)
+def cli_autho_update(cmd, instance, rights):
+    if cmd.supported_api_version(resource_type=ResourceType.MGMT_EVENTHUB, 
min_api='2017-04-01'):
+        from azure.cli.command_modules.eventhubs._utils import 
accessrights_converter
+        instance.rights = accessrights_converter(rights)
     return instance
 
 
 # Eventhub Region
-def cli_eheventhub_create(client, resource_group_name, namespace_name, 
event_hub_name, message_retention_in_days=None, partition_count=None, 
status=None,
-                          enabled=None, capture_interval_seconds=None, 
capture_size_limit_bytes=None, destination_name=None, 
storage_account_resource_id=None, blob_container=None, 
archive_name_format=None):
-    from azure.mgmt.eventhub.models import Eventhub, CaptureDescription, 
Destination, EncodingCaptureDescription
-    eventhubparameter1 = Eventhub()
-    if message_retention_in_days:
-        eventhubparameter1.message_retention_in_days = 
message_retention_in_days
-
-    if partition_count:
-        eventhubparameter1.partition_count = partition_count
+def cli_eheventhub_create(cmd, client, resource_group_name, namespace_name, 
event_hub_name, message_retention_in_days=None, partition_count=None, 
status=None,
+                          enabled=None, skip_empty_archives=None, 
capture_interval_seconds=None, capture_size_limit_bytes=None, 
destination_name=None, storage_account_resource_id=None, blob_container=None, 
archive_name_format=None):
+    # from azure.mgmt.eventhub.models import Eventhub, CaptureDescription, 
Destination, EncodingCaptureDescription
+    Eventhub = cmd.get_models('Eventhub', 
resource_type=ResourceType.MGMT_EVENTHUB)
+    CaptureDescription = cmd.get_models('CaptureDescription', 
resource_type=ResourceType.MGMT_EVENTHUB)
+    Destination = cmd.get_models('Destination', 
resource_type=ResourceType.MGMT_EVENTHUB)
+    EncodingCaptureDescription = cmd.get_models('EncodingCaptureDescription', 
resource_type=ResourceType.MGMT_EVENTHUB)
 
-    if status:
-        eventhubparameter1.status = status
+    eventhubparameter1 = Eventhub()
 
-    if enabled and enabled is True:
-        eventhubparameter1.capture_description = CaptureDescription(
-            enabled=enabled,
-            encoding=EncodingCaptureDescription.avro,
-            interval_in_seconds=capture_interval_seconds,
-            size_limit_in_bytes=capture_size_limit_bytes,
-            destination=Destination(
-                name=destination_name,
-                storage_account_resource_id=storage_account_resource_id,
-                blob_container=blob_container,
-                archive_name_format=archive_name_format)
-        )
+    if cmd.supported_api_version(resource_type=ResourceType.MGMT_EVENTHUB, 
min_api='2017-04-01'):
+        if message_retention_in_days:
+            eventhubparameter1.message_retention_in_days = 
message_retention_in_days
+
+        if partition_count:
+            eventhubparameter1.partition_count = partition_count
+
+        if status:
+            eventhubparameter1.status = status
+
+        if enabled and enabled is True:
+            eventhubparameter1.capture_description = CaptureDescription(
+                enabled=enabled,
+                skip_empty_archives=skip_empty_archives,
+                encoding=EncodingCaptureDescription.avro,
+                interval_in_seconds=capture_interval_seconds,
+                size_limit_in_bytes=capture_size_limit_bytes,
+                destination=Destination(
+                    name=destination_name,
+                    storage_account_resource_id=storage_account_resource_id,
+                    blob_container=blob_container,
+                    archive_name_format=archive_name_format)
+            )
     return client.create_or_update(
         resource_group_name=resource_group_name,
         namespace_name=namespace_name,
@@ -94,39 +124,95 @@
         parameters=eventhubparameter1)
 
 
-def cli_eheventhub_update(instance, message_retention_in_days=None, 
partition_count=None, status=None,
-                          enabled=None, capture_interval_seconds=None,
+def cli_eheventhub_update(cmd, instance, message_retention_in_days=None, 
partition_count=None, status=None,
+                          enabled=None, skip_empty_archives=None, 
capture_interval_seconds=None,
                           capture_size_limit_bytes=None, 
destination_name=None, storage_account_resource_id=None,
                           blob_container=None, archive_name_format=None):
-    from azure.mgmt.eventhub.models import CaptureDescription, Destination, 
EncodingCaptureDescription
-    if message_retention_in_days:
-        instance.message_retention_in_days = message_retention_in_days
-
-    if partition_count:
-        instance.partition_count = partition_count
-
-    if status:
-        instance.status = status
-
-    if enabled:
-        instance.capture_description.enabled = enabled
-
-        if not instance.capture_description:
-            instance.capture_description = CaptureDescription()
-            instance.capture_description.destination = Destination()
-            instance.capture_description.encoding = 
EncodingCaptureDescription.avro
-
-        if capture_interval_seconds:
-            instance.interval_in_seconds = capture_interval_seconds
-        if capture_size_limit_bytes:
-            instance.size_limit_in_bytes = capture_size_limit_bytes
-        if destination_name:
-            instance.capture_description.destination.name = destination_name
-        if storage_account_resource_id:
-            
instance.capture_description.destination.storage_account_resource_id = 
storage_account_resource_id
-        if blob_container:
-            instance.capture_description.destination.blob_container = 
blob_container
-        if archive_name_format:
-            instance.capture_description.destination.archive_name_format = 
archive_name_format
+    # from azure.mgmt.eventhub.models import CaptureDescription, Destination, 
EncodingCaptureDescription
+    capturedescription, destination, encodingcapturedescription = 
cmd.get_models('CaptureDescription', 'Destination', 
'EncodingCaptureDescription')
+
+    if cmd.supported_api_version(resource_type=ResourceType.MGMT_EVENTHUB, 
min_api='2017-04-01'):
+        if message_retention_in_days:
+            instance.message_retention_in_days = message_retention_in_days
+
+        if partition_count:
+            instance.partition_count = partition_count
+
+        if status:
+            instance.status = status
+
+        if enabled and not instance.capture_description:
+            instance.capture_description = capturedescription()
+            instance.capture_description.destination = destination()
+            instance.capture_description.encoding = 
encodingcapturedescription.avro
+            instance.capture_description.enabled = enabled
+
+        if enabled and instance.capture_description:
+            instance.capture_description.enabled = enabled
+            if capture_interval_seconds:
+                instance.interval_in_seconds = capture_interval_seconds
+            if capture_size_limit_bytes:
+                instance.size_limit_in_bytes = capture_size_limit_bytes
+            if destination_name:
+                instance.capture_description.destination.name = 
destination_name
+            if storage_account_resource_id:
+                
instance.capture_description.destination.storage_account_resource_id = 
storage_account_resource_id
+            if blob_container:
+                instance.capture_description.destination.blob_container = 
blob_container
+            if archive_name_format:
+                instance.capture_description.destination.archive_name_format = 
archive_name_format
+            if skip_empty_archives:
+                instance.capture_description.skip_empty_archives = 
skip_empty_archives
 
     return instance
+
+
+# NetwrokRuleSet Region
+def cli_networkrule_createupdate(cmd, client, resource_group_name, 
namespace_name, subnet=None, ip_mask=None, 
ignore_missing_vnet_service_endpoint=False, action='Allow'):
+    NWRuleSetVirtualNetworkRules = 
cmd.get_models('NWRuleSetVirtualNetworkRules', 
resource_type=ResourceType.MGMT_EVENTHUB)
+    Subnet = cmd.get_models('Subnet', resource_type=ResourceType.MGMT_EVENTHUB)
+    NWRuleSetIpRules = cmd.get_models('NWRuleSetIpRules', 
resource_type=ResourceType.MGMT_EVENTHUB)
+
+    netwrokruleset = client.get_network_rule_set(resource_group_name, 
namespace_name)
+
+    if cmd.supported_api_version(resource_type=ResourceType.MGMT_EVENTHUB, 
min_api='2017-04-01'):
+        if netwrokruleset.virtual_network_rules is None:
+            netwrokruleset.virtual_network_rules = 
[NWRuleSetVirtualNetworkRules]
+
+        if netwrokruleset.ip_rules is None:
+            netwrokruleset.ip_rules = [NWRuleSetIpRules]
+
+        if subnet:
+            
netwrokruleset.virtual_network_rules.append(NWRuleSetVirtualNetworkRules(subnet=Subnet(id=subnet),
+                                                                               
      
ignore_missing_vnet_service_endpoint=ignore_missing_vnet_service_endpoint))
+
+        if ip_mask:
+            netwrokruleset.ip_rules.append(NWRuleSetIpRules(ip_mask=ip_mask, 
action=action))
+
+    return client.create_or_update_network_rule_set(resource_group_name, 
namespace_name, netwrokruleset)
+
+
+def cli_networkrule_delete(cmd, client, resource_group_name, namespace_name, 
subnet=None, ip_mask=None):
+    NWRuleSetVirtualNetworkRules = 
cmd.get_models('NWRuleSetVirtualNetworkRules', 
resource_type=ResourceType.MGMT_EVENTHUB)
+    NWRuleSetIpRules = cmd.get_models('NWRuleSetIpRules', 
resource_type=ResourceType.MGMT_EVENTHUB)
+    netwrokruleset = client.get_network_rule_set(resource_group_name, 
namespace_name)
+    if cmd.supported_api_version(resource_type=ResourceType.MGMT_EVENTHUB, 
min_api='2017-04-01'):
+        if subnet:
+            virtualnetworkrule = NWRuleSetVirtualNetworkRules()
+            virtualnetworkrule.subnet = subnet
+
+            for vnetruletodelete in netwrokruleset.virtual_network_rules:
+                if vnetruletodelete.subnet.id.lower() == subnet.lower():
+                    virtualnetworkrule.ignore_missing_vnet_service_endpoint = 
vnetruletodelete.ignore_missing_vnet_service_endpoint
+                    
netwrokruleset.virtual_network_rules.remove(vnetruletodelete)
+                    break
+
+        if ip_mask:
+            ipruletodelete = NWRuleSetIpRules()
+            ipruletodelete.ip_mask = ip_mask
+            ipruletodelete.action = "Allow"
+
+            if ipruletodelete in netwrokruleset.ip_rules:
+                netwrokruleset.ip_rules.remove(ipruletodelete)
+
+    return client.create_or_update_network_rule_set(resource_group_name, 
namespace_name, netwrokruleset)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/azure-cli-eventhubs-0.3.3/azure_cli_eventhubs.egg-info/PKG-INFO 
new/azure-cli-eventhubs-0.3.7/azure_cli_eventhubs.egg-info/PKG-INFO
--- old/azure-cli-eventhubs-0.3.3/azure_cli_eventhubs.egg-info/PKG-INFO 
2019-01-25 20:44:02.000000000 +0100
+++ new/azure-cli-eventhubs-0.3.7/azure_cli_eventhubs.egg-info/PKG-INFO 
2019-06-13 23:18:09.000000000 +0200
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: azure-cli-eventhubs
-Version: 0.3.3
+Version: 0.3.7
 Summary: Microsoft Azure Command-Line Tools Event Hubs Command Module
 Home-page: https://github.com/Azure/azure-cli
 Author: Microsoft Corporation
@@ -19,6 +19,24 @@
         
         Release History
         ===============
+        
+        0.3.7
+        +++++
+        * Minor fixes.
+        
+        0.3.6
+        +++++
+        * Minor fixes.
+        
+        0.3.5
+        +++++
+        * namespace: Added network-rule commands.
+        * namespace create/update: Added --default-action argument for network 
rules.
+        
+        0.3.4
+        +++++
+        * eventhubs eventhub create/update: Added --skip-empty-archives flag 
to support empty archives in capture.
+        
         0.3.3
         +++++
         * Minor fixes
@@ -29,7 +47,7 @@
         
         0.3.1
         +++++
-        * eventhub namespace create/update: Added --enable-kafka flag to 
support Kafka.
+        * eventhubs namespace create/update: Added --enable-kafka flag to 
support Kafka.
         
         0.3.0
         +++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/azure-cli-eventhubs-0.3.3/azure_cli_eventhubs.egg-info/requires.txt 
new/azure-cli-eventhubs-0.3.7/azure_cli_eventhubs.egg-info/requires.txt
--- old/azure-cli-eventhubs-0.3.3/azure_cli_eventhubs.egg-info/requires.txt     
2019-01-25 20:44:02.000000000 +0100
+++ new/azure-cli-eventhubs-0.3.7/azure_cli_eventhubs.egg-info/requires.txt     
2019-06-13 23:18:09.000000000 +0200
@@ -1,3 +1,3 @@
 azure-cli-core
 six
-azure-mgmt-eventhub==2.2.0
+azure-mgmt-eventhub==2.6.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/azure-cli-eventhubs-0.3.3/setup.py 
new/azure-cli-eventhubs-0.3.7/setup.py
--- old/azure-cli-eventhubs-0.3.3/setup.py      2019-01-25 20:43:40.000000000 
+0100
+++ new/azure-cli-eventhubs-0.3.7/setup.py      2019-06-13 23:17:46.000000000 
+0200
@@ -13,7 +13,7 @@
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
     cmdclass = {}
 
-VERSION = "0.3.3"
+VERSION = "0.3.7"
 
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers
@@ -34,7 +34,7 @@
 DEPENDENCIES = [
     'azure-cli-core',
     'six',
-    'azure-mgmt-eventhub==2.2.0',
+    'azure-mgmt-eventhub==2.6.0',
 ]
 
 with open('README.rst', 'r', encoding='utf-8') as f:


Reply via email to