diff --git a/services/servicebus/mgmt/2017-04-01/servicebus/models.go b/services/servicebus/mgmt/2017-04-01/servicebus/models.go
index b65c94052a4d..32e9a18f4433 100644
--- a/services/servicebus/mgmt/2017-04-01/servicebus/models.go
+++ b/services/servicebus/mgmt/2017-04-01/servicebus/models.go
@@ -427,6 +427,8 @@ func (page ArmDisasterRecoveryListResultPage) Values() []ArmDisasterRecovery {
 type ArmDisasterRecoveryProperties struct {
 	// ProvisioningState - Provisioning state of the Alias(Disaster Recovery configuration) - possible values 'Accepted' or 'Succeeded' or 'Failed'. Possible values include: 'Accepted', 'Succeeded', 'Failed'
 	ProvisioningState ProvisioningStateDR `json:"provisioningState,omitempty"`
+	// PendingReplicationOperationsCount - Number of entities pending to be replicated.
+	PendingReplicationOperationsCount *int64 `json:"pendingReplicationOperationsCount ,omitempty"`
 	// PartnerNamespace - ARM Id of the Primary/Secondary eventhub namespace name, which is part of GEO DR pairning
 	PartnerNamespace *string `json:"partnerNamespace,omitempty"`
 	// AlternateName - Primary/Secondary eventhub namespace name, which is part of GEO DR pairning
@@ -1008,6 +1010,8 @@ func (mcp *MigrationConfigProperties) UnmarshalJSON(body []byte) error {
 type MigrationConfigPropertiesProperties struct {
 	// ProvisioningState - Provisioning state of Migration Configuration
 	ProvisioningState *string `json:"provisioningState,omitempty"`
+	// PendingReplicationOperationsCount - Number of entities pending to be replicated.
+	PendingReplicationOperationsCount *int64 `json:"pendingReplicationOperationsCount ,omitempty"`
 	// TargetNamespace - Existing premium Namespace ARM Id name which has no entities, will be used for migration
 	TargetNamespace *string `json:"targetNamespace,omitempty"`
 	// PostMigrationName - Name to access Standard Namespace after migration
diff --git a/services/servicebus/mgmt/2017-04-01/servicebus/queues.go b/services/servicebus/mgmt/2017-04-01/servicebus/queues.go
index 63588cc1144b..78843ee98e1a 100644
--- a/services/servicebus/mgmt/2017-04-01/servicebus/queues.go
+++ b/services/servicebus/mgmt/2017-04-01/servicebus/queues.go
@@ -675,12 +675,12 @@ func (client QueuesClient) ListByNamespace(ctx context.Context, resourceGroupNam
 				{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("servicebus.QueuesClient", "ListByNamespace", err.Error())
diff --git a/services/servicebus/mgmt/2017-04-01/servicebus/rules.go b/services/servicebus/mgmt/2017-04-01/servicebus/rules.go
index ecd6ca245c25..4cbe705fada4 100644
--- a/services/servicebus/mgmt/2017-04-01/servicebus/rules.go
+++ b/services/servicebus/mgmt/2017-04-01/servicebus/rules.go
@@ -340,12 +340,12 @@ func (client RulesClient) ListBySubscriptions(ctx context.Context, resourceGroup
 				{Target: "subscriptionName", 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("servicebus.RulesClient", "ListBySubscriptions", err.Error())
diff --git a/services/servicebus/mgmt/2017-04-01/servicebus/subscriptions.go b/services/servicebus/mgmt/2017-04-01/servicebus/subscriptions.go
index c0b63ff12988..1a087cb81e4e 100644
--- a/services/servicebus/mgmt/2017-04-01/servicebus/subscriptions.go
+++ b/services/servicebus/mgmt/2017-04-01/servicebus/subscriptions.go
@@ -321,12 +321,12 @@ func (client SubscriptionsClient) ListByTopic(ctx context.Context, resourceGroup
 			Constraints: []validation.Constraint{{Target: "topicName", 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("servicebus.SubscriptionsClient", "ListByTopic", err.Error())
diff --git a/services/servicebus/mgmt/2017-04-01/servicebus/topics.go b/services/servicebus/mgmt/2017-04-01/servicebus/topics.go
index 85b93c8219f1..ce8b0c1a9240 100644
--- a/services/servicebus/mgmt/2017-04-01/servicebus/topics.go
+++ b/services/servicebus/mgmt/2017-04-01/servicebus/topics.go
@@ -675,12 +675,12 @@ func (client TopicsClient) ListByNamespace(ctx context.Context, resourceGroupNam
 				{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("servicebus.TopicsClient", "ListByNamespace", err.Error())