diff --git a/services/eventhub/mgmt/2017-04-01/eventhub/consumergroups.go b/services/eventhub/mgmt/2017-04-01/eventhub/consumergroups.go
index 386d0c64bee2..95869944dd81 100644
--- a/services/eventhub/mgmt/2017-04-01/eventhub/consumergroups.go
+++ b/services/eventhub/mgmt/2017-04-01/eventhub/consumergroups.go
@@ -322,12 +322,12 @@ func (client ConsumerGroupsClient) ListByEventHub(ctx context.Context, resourceG
 			Constraints: []validation.Constraint{{Target: "eventHubName", Name: validation.MinLength, Rule: 1, Chain: nil}}},
 		{TargetValue: skip,
 			Constraints: []validation.Constraint{{Target: "skip", Name: validation.Null, Rule: false,
-				Chain: []validation.Constraint{{Target: "skip", Name: validation.InclusiveMaximum, Rule: 1000, Chain: nil},
+				Chain: []validation.Constraint{{Target: "skip", Name: validation.InclusiveMaximum, Rule: int64(1000), Chain: nil},
 					{Target: "skip", Name: validation.InclusiveMinimum, Rule: 0, Chain: nil},
 				}}}},
 		{TargetValue: top,
 			Constraints: []validation.Constraint{{Target: "top", Name: validation.Null, Rule: false,
-				Chain: []validation.Constraint{{Target: "top", Name: validation.InclusiveMaximum, Rule: 1000, Chain: nil},
+				Chain: []validation.Constraint{{Target: "top", Name: validation.InclusiveMaximum, Rule: int64(1000), Chain: nil},
 					{Target: "top", Name: validation.InclusiveMinimum, Rule: 1, Chain: nil},
 				}}}}}); err != nil {
 		return result, validation.NewError("eventhub.ConsumerGroupsClient", "ListByEventHub", err.Error())
diff --git a/services/eventhub/mgmt/2017-04-01/eventhub/eventhubs.go b/services/eventhub/mgmt/2017-04-01/eventhub/eventhubs.go
index 7228f2e33213..4f553202a13e 100644
--- a/services/eventhub/mgmt/2017-04-01/eventhub/eventhubs.go
+++ b/services/eventhub/mgmt/2017-04-01/eventhub/eventhubs.go
@@ -64,11 +64,11 @@ func (client EventHubsClient) CreateOrUpdate(ctx context.Context, resourceGroupN
 						Chain: []validation.Constraint{{Target: "parameters.Properties.PartitionCount", Name: validation.InclusiveMinimum, Rule: 1, Chain: nil}}},
 					{Target: "parameters.Properties.CaptureDescription", Name: validation.Null, Rule: false,
 						Chain: []validation.Constraint{{Target: "parameters.Properties.CaptureDescription.IntervalInSeconds", Name: validation.Null, Rule: false,
-							Chain: []validation.Constraint{{Target: "parameters.Properties.CaptureDescription.IntervalInSeconds", Name: validation.InclusiveMaximum, Rule: 900, Chain: nil},
+							Chain: []validation.Constraint{{Target: "parameters.Properties.CaptureDescription.IntervalInSeconds", Name: validation.InclusiveMaximum, Rule: int64(900), Chain: nil},
 								{Target: "parameters.Properties.CaptureDescription.IntervalInSeconds", Name: validation.InclusiveMinimum, Rule: 60, Chain: nil},
 							}},
 							{Target: "parameters.Properties.CaptureDescription.SizeLimitInBytes", Name: validation.Null, Rule: false,
-								Chain: []validation.Constraint{{Target: "parameters.Properties.CaptureDescription.SizeLimitInBytes", Name: validation.InclusiveMaximum, Rule: 524288000, Chain: nil},
+								Chain: []validation.Constraint{{Target: "parameters.Properties.CaptureDescription.SizeLimitInBytes", Name: validation.InclusiveMaximum, Rule: int64(524288000), Chain: nil},
 									{Target: "parameters.Properties.CaptureDescription.SizeLimitInBytes", Name: validation.InclusiveMinimum, Rule: 10485760, Chain: nil},
 								}},
 						}},
@@ -689,12 +689,12 @@ func (client EventHubsClient) ListByNamespace(ctx context.Context, resourceGroup
 				{Target: "namespaceName", Name: validation.MinLength, Rule: 6, Chain: nil}}},
 		{TargetValue: skip,
 			Constraints: []validation.Constraint{{Target: "skip", Name: validation.Null, Rule: false,
-				Chain: []validation.Constraint{{Target: "skip", Name: validation.InclusiveMaximum, Rule: 1000, Chain: nil},
+				Chain: []validation.Constraint{{Target: "skip", Name: validation.InclusiveMaximum, Rule: int64(1000), Chain: nil},
 					{Target: "skip", Name: validation.InclusiveMinimum, Rule: 0, Chain: nil},
 				}}}},
 		{TargetValue: top,
 			Constraints: []validation.Constraint{{Target: "top", Name: validation.Null, Rule: false,
-				Chain: []validation.Constraint{{Target: "top", Name: validation.InclusiveMaximum, Rule: 1000, Chain: nil},
+				Chain: []validation.Constraint{{Target: "top", Name: validation.InclusiveMaximum, Rule: int64(1000), Chain: nil},
 					{Target: "top", Name: validation.InclusiveMinimum, Rule: 1, Chain: nil},
 				}}}}}); err != nil {
 		return result, validation.NewError("eventhub.EventHubsClient", "ListByNamespace", err.Error())
diff --git a/services/eventhub/mgmt/2017-04-01/eventhub/models.go b/services/eventhub/mgmt/2017-04-01/eventhub/models.go
index 30cfd7c93c37..e148c38cd981 100644
--- a/services/eventhub/mgmt/2017-04-01/eventhub/models.go
+++ b/services/eventhub/mgmt/2017-04-01/eventhub/models.go
@@ -403,6 +403,8 @@ type ArmDisasterRecoveryProperties struct {
 	AlternateName *string `json:"alternateName,omitempty"`
 	// Role - role of namespace in GEO DR - possible values 'Primary' or 'PrimaryNotReplicating' or 'Secondary'. Possible values include: 'Primary', 'PrimaryNotReplicating', 'Secondary'
 	Role RoleDisasterRecovery `json:"role,omitempty"`
+	// PendingReplicationOperationsCount - Number of entities pending to be replicated.
+	PendingReplicationOperationsCount *int64 `json:"pendingReplicationOperationsCount ,omitempty"`
 }
 
 // AuthorizationRule single item in a List or Get AuthorizationRule operation
diff --git a/services/eventhub/mgmt/2017-04-01/eventhub/namespaces.go b/services/eventhub/mgmt/2017-04-01/eventhub/namespaces.go
index ee8818989074..fb7ed1ddff53 100644
--- a/services/eventhub/mgmt/2017-04-01/eventhub/namespaces.go
+++ b/services/eventhub/mgmt/2017-04-01/eventhub/namespaces.go
@@ -129,13 +129,13 @@ func (client NamespacesClient) CreateOrUpdate(ctx context.Context, resourceGroup
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.Sku", Name: validation.Null, Rule: false,
 				Chain: []validation.Constraint{{Target: "parameters.Sku.Capacity", Name: validation.Null, Rule: false,
-					Chain: []validation.Constraint{{Target: "parameters.Sku.Capacity", Name: validation.InclusiveMaximum, Rule: 20, Chain: nil},
+					Chain: []validation.Constraint{{Target: "parameters.Sku.Capacity", Name: validation.InclusiveMaximum, Rule: int64(20), Chain: nil},
 						{Target: "parameters.Sku.Capacity", Name: validation.InclusiveMinimum, Rule: 0, Chain: nil},
 					}},
 				}},
 				{Target: "parameters.EHNamespaceProperties", Name: validation.Null, Rule: false,
 					Chain: []validation.Constraint{{Target: "parameters.EHNamespaceProperties.MaximumThroughputUnits", Name: validation.Null, Rule: false,
-						Chain: []validation.Constraint{{Target: "parameters.EHNamespaceProperties.MaximumThroughputUnits", Name: validation.InclusiveMaximum, Rule: 20, Chain: nil},
+						Chain: []validation.Constraint{{Target: "parameters.EHNamespaceProperties.MaximumThroughputUnits", Name: validation.InclusiveMaximum, Rule: int64(20), Chain: nil},
 							{Target: "parameters.EHNamespaceProperties.MaximumThroughputUnits", Name: validation.InclusiveMinimum, Rule: 0, Chain: nil},
 						}},
 					}}}}}); err != nil {