Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Combined prefix operations #7880

Merged
merged 11 commits into from
Oct 4, 2019
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# Service teams
/sdk/appconfiguration/ @annelo-msft

/sdk/batch/ @xingwu1 @matthchr @bgklein
/sdk/batch/ @matthchr

/sdk/cognitiveservices/language.textanalytics/ @assafi
/sdk/cognitiveservices/vision.computervision/ @toothache
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,6 @@ public partial interface IPeeringManagementClient : System.IDisposable
/// </summary>
IPeeringServiceLocationsOperations PeeringServiceLocations { get; }

/// <summary>
/// Gets the IPeeringServicePrefixesOperations.
/// </summary>
IPeeringServicePrefixesOperations PeeringServicePrefixes { get; }

/// <summary>
/// Gets the IPrefixesOperations.
/// </summary>
Expand All @@ -124,8 +119,8 @@ public partial interface IPeeringManagementClient : System.IDisposable
/// of customer's location
/// </summary>
/// <param name='checkServiceProviderAvailabilityInput'>
/// The CheckServiceProviderAvailabilityInput
/// indicating customer location and service provider.
/// The CheckServiceProviderAvailabilityInput indicating customer
/// location and service provider.
/// </param>
/// <param name='customHeaders'>
/// The headers that will be added to request.
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,107 @@ namespace Microsoft.Azure.Management.Peering
public partial interface IPrefixesOperations
{
/// <summary>
/// Lists the peerings prefix in the resource group.
/// Gets an existing prefix with the specified name under the given
/// subscription, resource group and peering service.
/// </summary>
/// <param name='resourceGroupName'>
/// The resource group name.
/// The name of the resource group.
/// </param>
/// <param name='peeringServiceName'>
/// The peering service name.
/// The name of the peering service.
/// </param>
/// <param name='prefixName'>
/// The name of the prefix.
/// </param>
/// <param name='expand'>
/// The properties to be expanded.
/// </param>
/// <param name='customHeaders'>
/// The headers that will be added to request.
/// </param>
/// <param name='cancellationToken'>
/// The cancellation token.
/// </param>
/// <exception cref="ErrorResponseException">
/// Thrown when the operation returned an invalid status code
/// </exception>
/// <exception cref="Microsoft.Rest.SerializationException">
/// Thrown when unable to deserialize the response
/// </exception>
/// <exception cref="Microsoft.Rest.ValidationException">
/// Thrown when a required parameter is null
/// </exception>
Task<AzureOperationResponse<PeeringServicePrefix>> GetWithHttpMessagesAsync(string resourceGroupName, string peeringServiceName, string prefixName, string expand = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
/// <summary>
/// Creates a new prefix with the specified name under the given
/// subscription, resource group and peering service.
/// </summary>
/// <param name='resourceGroupName'>
/// The name of the resource group.
/// </param>
/// <param name='peeringServiceName'>
/// The name of the peering service.
/// </param>
/// <param name='prefixName'>
/// The name of the prefix.
/// </param>
/// <param name='peeringServicePrefix'>
/// The properties needed to create a prefix.
/// </param>
/// <param name='customHeaders'>
/// The headers that will be added to request.
/// </param>
/// <param name='cancellationToken'>
/// The cancellation token.
/// </param>
/// <exception cref="ErrorResponseException">
/// Thrown when the operation returned an invalid status code
/// </exception>
/// <exception cref="Microsoft.Rest.SerializationException">
/// Thrown when unable to deserialize the response
/// </exception>
/// <exception cref="Microsoft.Rest.ValidationException">
/// Thrown when a required parameter is null
/// </exception>
Task<AzureOperationResponse<PeeringServicePrefix>> CreateOrUpdateWithHttpMessagesAsync(string resourceGroupName, string peeringServiceName, string prefixName, PeeringServicePrefix peeringServicePrefix, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
/// <summary>
/// Deletes an existing prefix with the specified name under the given
/// subscription, resource group and peering service.
/// </summary>
/// <param name='resourceGroupName'>
/// The name of the resource group.
/// </param>
/// <param name='peeringServiceName'>
/// The name of the peering service.
/// </param>
/// <param name='prefixName'>
/// The name of the prefix.
/// </param>
/// <param name='customHeaders'>
/// The headers that will be added to request.
/// </param>
/// <param name='cancellationToken'>
/// The cancellation token.
/// </param>
/// <exception cref="ErrorResponseException">
/// Thrown when the operation returned an invalid status code
/// </exception>
/// <exception cref="Microsoft.Rest.ValidationException">
/// Thrown when a required parameter is null
/// </exception>
Task<AzureOperationResponse> DeleteWithHttpMessagesAsync(string resourceGroupName, string peeringServiceName, string prefixName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
/// <summary>
/// Lists all prefixes under the given subscription, resource group and
/// peering service.
/// </summary>
/// <param name='resourceGroupName'>
/// The name of the resource group.
/// </param>
/// <param name='peeringServiceName'>
/// The name of the peering service.
/// </param>
/// <param name='expand'>
/// The properties to be expanded.
/// </param>
/// <param name='customHeaders'>
/// The headers that will be added to request.
Expand All @@ -43,9 +137,10 @@ public partial interface IPrefixesOperations
/// <exception cref="Microsoft.Rest.ValidationException">
/// Thrown when a required parameter is null
/// </exception>
Task<AzureOperationResponse<IPage<PeeringServicePrefix>>> ListByPeeringServiceWithHttpMessagesAsync(string resourceGroupName, string peeringServiceName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
Task<AzureOperationResponse<IPage<PeeringServicePrefix>>> ListByPeeringServiceWithHttpMessagesAsync(string resourceGroupName, string peeringServiceName, string expand = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
/// <summary>
/// Lists the peerings prefix in the resource group.
/// Lists all prefixes under the given subscription, resource group and
/// peering service.
/// </summary>
/// <param name='nextPageLink'>
/// The NextLink from the previous successful call to List operation.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@ public DirectConnection()
/// connection.</param>
/// <param name="connectionIdentifier">The unique identifier (GUID) for
/// the connection.</param>
public DirectConnection(int? bandwidthInMbps = default(int?), int? provisionedBandwidthInMbps = default(int?), string sessionAddressProvider = default(string), bool? useForPeeringService = default(bool?), int? peeringDBFacilityId = default(int?), string connectionState = default(string), BgpSession bgpSession = default(BgpSession), string connectionIdentifier = default(string))
/// <param name="errorMessage">The error message related to the
/// connection state, if any.</param>
public DirectConnection(int? bandwidthInMbps = default(int?), int? provisionedBandwidthInMbps = default(int?), string sessionAddressProvider = default(string), bool? useForPeeringService = default(bool?), int? peeringDBFacilityId = default(int?), string connectionState = default(string), BgpSession bgpSession = default(BgpSession), string connectionIdentifier = default(string), string errorMessage = default(string))
{
BandwidthInMbps = bandwidthInMbps;
ProvisionedBandwidthInMbps = provisionedBandwidthInMbps;
Expand All @@ -54,6 +56,7 @@ public DirectConnection()
ConnectionState = connectionState;
BgpSession = bgpSession;
ConnectionIdentifier = connectionIdentifier;
ErrorMessage = errorMessage;
CustomInit();
}

Expand All @@ -69,10 +72,10 @@ public DirectConnection()
public int? BandwidthInMbps { get; set; }

/// <summary>
/// Gets or sets the bandwidth that is actually provisioned.
/// Gets the bandwidth that is actually provisioned.
/// </summary>
[JsonProperty(PropertyName = "provisionedBandwidthInMbps")]
public int? ProvisionedBandwidthInMbps { get; set; }
public int? ProvisionedBandwidthInMbps { get; private set; }

/// <summary>
/// Gets or sets the field indicating if Microsoft provides session ip
Expand Down Expand Up @@ -116,5 +119,11 @@ public DirectConnection()
[JsonProperty(PropertyName = "connectionIdentifier")]
public string ConnectionIdentifier { get; set; }

/// <summary>
/// Gets the error message related to the connection state, if any.
/// </summary>
[JsonProperty(PropertyName = "errorMessage")]
public string ErrorMessage { get; private set; }

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,15 @@ public ExchangeConnection()
/// connection.</param>
/// <param name="connectionIdentifier">The unique identifier (GUID) for
/// the connection.</param>
public ExchangeConnection(int? peeringDBFacilityId = default(int?), string connectionState = default(string), BgpSession bgpSession = default(BgpSession), string connectionIdentifier = default(string))
/// <param name="errorMessage">The error message related to the
/// connection state, if any.</param>
public ExchangeConnection(int? peeringDBFacilityId = default(int?), string connectionState = default(string), BgpSession bgpSession = default(BgpSession), string connectionIdentifier = default(string), string errorMessage = default(string))
{
PeeringDBFacilityId = peeringDBFacilityId;
ConnectionState = connectionState;
BgpSession = bgpSession;
ConnectionIdentifier = connectionIdentifier;
ErrorMessage = errorMessage;
CustomInit();
}

Expand Down Expand Up @@ -77,5 +80,11 @@ public ExchangeConnection()
[JsonProperty(PropertyName = "connectionIdentifier")]
public string ConnectionIdentifier { get; set; }

/// <summary>
/// Gets the error message related to the connection state, if any.
/// </summary>
[JsonProperty(PropertyName = "errorMessage")]
public string ErrorMessage { get; private set; }

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace Microsoft.Azure.Management.Peering.Models
public static class LearnedType
{
public const string None = "None";
public const string ViaPartner = "ViaPartner";
public const string ViaServiceProvider = "ViaServiceProvider";
public const string ViaSession = "ViaSession";
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,16 @@ public PeerAsn()
/// <param name="validationState">The validation state of the ASN
/// associated with the peer. Possible values include: 'None',
/// 'Pending', 'Approved', 'Failed'</param>
public PeerAsn(string name = default(string), string id = default(string), string type = default(string), int? peerAsnProperty = default(int?), ContactInfo peerContactInfo = default(ContactInfo), string peerName = default(string), string validationState = default(string))
/// <param name="errorMessage">The error message for the validation
/// state</param>
public PeerAsn(string name = default(string), string id = default(string), string type = default(string), int? peerAsnProperty = default(int?), ContactInfo peerContactInfo = default(ContactInfo), string peerName = default(string), string validationState = default(string), string errorMessage = default(string))
: base(name, id, type)
{
PeerAsnProperty = peerAsnProperty;
PeerContactInfo = peerContactInfo;
PeerName = peerName;
ValidationState = validationState;
ErrorMessage = errorMessage;
CustomInit();
}

Expand Down Expand Up @@ -80,5 +83,11 @@ public PeerAsn()
[JsonProperty(PropertyName = "properties.validationState")]
public string ValidationState { get; set; }

/// <summary>
/// Gets the error message for the validation state
/// </summary>
[JsonProperty(PropertyName = "properties.errorMessage")]
public string ErrorMessage { get; private set; }

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ public PeeringPropertiesDirect()
public IList<DirectConnection> Connections { get; set; }

/// <summary>
/// Gets or sets the flag that indicates whether or not the peering is
/// used for peering service.
/// Gets the flag that indicates whether or not the peering is used for
/// peering service.
/// </summary>
[JsonProperty(PropertyName = "useForPeeringService")]
public bool? UseForPeeringService { get; set; }
public bool? UseForPeeringService { get; private set; }

/// <summary>
/// Gets or sets the reference of the peer ASN.
Expand Down
Loading