Skip to content

Commit

Permalink
.NET SDK Resource Provider:'ContainerService' (#5699)
Browse files Browse the repository at this point in the history
REST Spec PR 'Azure/azure-rest-api-specs#5557'
REST Spec PR Author 'amanohar'
REST Spec PR Last commit
  • Loading branch information
adxsdknet authored and dsgouda committed Apr 11, 2019
1 parent 37bd372 commit 36c2620
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 20 deletions.
2 changes: 1 addition & 1 deletion src/SDKs/ContainerService/AzSdk.RP.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!--This file and it's contents are updated at build time moving or editing might result in build failure. Take due deligence while editing this file-->
<PropertyGroup>
<AzureApiTag>ContainerService_2019-02-01;ContainerService_2017-07-01;ContainerService_2017-09-30;ContainerService_2018-09-30-preview;</AzureApiTag>
<AzureApiTag>ContainerService_2019-02-01;ContainerService_2017-07-01;ContainerService_2017-09-30;ContainerService_2019-04-30;</AzureApiTag>
<PackageTags>$(PackageTags);$(CommonTags);$(AzureApiTag);</PackageTags>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,13 @@ public NetworkProfile()
/// </summary>
/// <param name="vnetCidr">CIDR for the OpenShift Vnet.</param>
/// <param name="peerVnetId">CIDR of the Vnet to peer.</param>
public NetworkProfile(string vnetCidr = default(string), string peerVnetId = default(string))
/// <param name="vnetId">ID of the Vnet created for OSA
/// cluster.</param>
public NetworkProfile(string vnetCidr = default(string), string peerVnetId = default(string), string vnetId = default(string))
{
VnetCidr = vnetCidr;
PeerVnetId = peerVnetId;
VnetId = vnetId;
CustomInit();
}

Expand All @@ -55,5 +58,11 @@ public NetworkProfile()
[JsonProperty(PropertyName = "peerVnetId")]
public string PeerVnetId { get; set; }

/// <summary>
/// Gets or sets ID of the Vnet created for OSA cluster.
/// </summary>
[JsonProperty(PropertyName = "vnetId")]
public string VnetId { get; set; }

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,11 @@ public OpenShiftManagedCluster()
/// billing purposes</param>
/// <param name="provisioningState">The current deployment or
/// provisioning state, which only appears in the response.</param>
/// <param name="publicHostname">Optional user-specified FQDN for
/// OpenShift API server.</param>
/// <param name="fqdn">User-specified FQDN for OpenShift API server
/// <param name="clusterVersion">Version of OpenShift specified when
/// creating the cluster.</param>
/// <param name="publicHostname">Service generated FQDN for OpenShift
/// API server.</param>
/// <param name="fqdn">Service generated FQDN for OpenShift API server
/// loadbalancer internal hostname.</param>
/// <param name="networkProfile">Configuration for OpenShift
/// networking.</param>
Expand All @@ -59,12 +61,13 @@ public OpenShiftManagedCluster()
/// VMs.</param>
/// <param name="authProfile">Configures OpenShift
/// authentication.</param>
public OpenShiftManagedCluster(string location, string openShiftVersion, string id = default(string), string name = default(string), string type = default(string), IDictionary<string, string> tags = default(IDictionary<string, string>), PurchasePlan plan = default(PurchasePlan), string provisioningState = default(string), string publicHostname = default(string), string fqdn = default(string), NetworkProfile networkProfile = default(NetworkProfile), IList<OpenShiftRouterProfile> routerProfiles = default(IList<OpenShiftRouterProfile>), OpenShiftManagedClusterMasterPoolProfile masterPoolProfile = default(OpenShiftManagedClusterMasterPoolProfile), IList<OpenShiftManagedClusterAgentPoolProfile> agentPoolProfiles = default(IList<OpenShiftManagedClusterAgentPoolProfile>), OpenShiftManagedClusterAuthProfile authProfile = default(OpenShiftManagedClusterAuthProfile))
public OpenShiftManagedCluster(string location, string openShiftVersion, string id = default(string), string name = default(string), string type = default(string), IDictionary<string, string> tags = default(IDictionary<string, string>), PurchasePlan plan = default(PurchasePlan), string provisioningState = default(string), string clusterVersion = default(string), string publicHostname = default(string), string fqdn = default(string), NetworkProfile networkProfile = default(NetworkProfile), IList<OpenShiftRouterProfile> routerProfiles = default(IList<OpenShiftRouterProfile>), OpenShiftManagedClusterMasterPoolProfile masterPoolProfile = default(OpenShiftManagedClusterMasterPoolProfile), IList<OpenShiftManagedClusterAgentPoolProfile> agentPoolProfiles = default(IList<OpenShiftManagedClusterAgentPoolProfile>), OpenShiftManagedClusterAuthProfile authProfile = default(OpenShiftManagedClusterAuthProfile))
: base(location, id, name, type, tags)
{
Plan = plan;
ProvisioningState = provisioningState;
OpenShiftVersion = openShiftVersion;
ClusterVersion = clusterVersion;
PublicHostname = publicHostname;
Fqdn = fqdn;
NetworkProfile = networkProfile;
Expand Down Expand Up @@ -102,17 +105,23 @@ public OpenShiftManagedCluster()
public string OpenShiftVersion { get; set; }

/// <summary>
/// Gets or sets optional user-specified FQDN for OpenShift API server.
/// Gets version of OpenShift specified when creating the cluster.
/// </summary>
[JsonProperty(PropertyName = "properties.clusterVersion")]
public string ClusterVersion { get; private set; }

/// <summary>
/// Gets service generated FQDN for OpenShift API server.
/// </summary>
[JsonProperty(PropertyName = "properties.publicHostname")]
public string PublicHostname { get; set; }
public string PublicHostname { get; private set; }

/// <summary>
/// Gets or sets user-specified FQDN for OpenShift API server
/// loadbalancer internal hostname.
/// Gets service generated FQDN for OpenShift API server loadbalancer
/// internal hostname.
/// </summary>
[JsonProperty(PropertyName = "properties.fqdn")]
public string Fqdn { get; set; }
public string Fqdn { get; private set; }

/// <summary>
/// Gets or sets configuration for OpenShift networking.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@ public OpenShiftRouterProfile()
public string Name { get; set; }

/// <summary>
/// Gets or sets DNS subdomain for OpenShift router.
/// Gets DNS subdomain for OpenShift router.
/// </summary>
[JsonProperty(PropertyName = "publicSubdomain")]
public string PublicSubdomain { get; set; }
public string PublicSubdomain { get; private set; }

/// <summary>
/// Gets auto-allocated FQDN for the OpenShift router.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ internal OpenShiftManagedClustersOperations(ContainerServiceClient client)
{
throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
}
string apiVersion = "2018-09-30-preview";
string apiVersion = "2019-04-30";
// Tracing
bool _shouldTrace = ServiceClientTracing.IsEnabled;
string _invocationId = null;
Expand Down Expand Up @@ -279,7 +279,7 @@ internal OpenShiftManagedClustersOperations(ContainerServiceClient client)
throw new ValidationException(ValidationRules.MinLength, "resourceGroupName", 1);
}
}
string apiVersion = "2018-09-30-preview";
string apiVersion = "2019-04-30";
// Tracing
bool _shouldTrace = ServiceClientTracing.IsEnabled;
string _invocationId = null;
Expand Down Expand Up @@ -482,7 +482,7 @@ internal OpenShiftManagedClustersOperations(ContainerServiceClient client)
{
throw new ValidationException(ValidationRules.CannotBeNull, "resourceName");
}
string apiVersion = "2018-09-30-preview";
string apiVersion = "2019-04-30";
// Tracing
bool _shouldTrace = ServiceClientTracing.IsEnabled;
string _invocationId = null;
Expand Down Expand Up @@ -783,7 +783,7 @@ internal OpenShiftManagedClustersOperations(ContainerServiceClient client)
{
parameters.Validate();
}
string apiVersion = "2018-09-30-preview";
string apiVersion = "2019-04-30";
// Tracing
bool _shouldTrace = ServiceClientTracing.IsEnabled;
string _invocationId = null;
Expand Down Expand Up @@ -1015,7 +1015,7 @@ internal OpenShiftManagedClustersOperations(ContainerServiceClient client)
{
throw new ValidationException(ValidationRules.CannotBeNull, "resourceName");
}
string apiVersion = "2018-09-30-preview";
string apiVersion = "2019-04-30";
TagsObject parameters = new TagsObject();
if (tags != null)
{
Expand Down Expand Up @@ -1229,7 +1229,7 @@ internal OpenShiftManagedClustersOperations(ContainerServiceClient client)
{
throw new ValidationException(ValidationRules.CannotBeNull, "resourceName");
}
string apiVersion = "2018-09-30-preview";
string apiVersion = "2019-04-30";
// Tracing
bool _shouldTrace = ServiceClientTracing.IsEnabled;
string _invocationId = null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public static IEnumerable<Tuple<string, string, string>> ApiInfo_ContainerServic
new Tuple<string, string, string>("ContainerService", "ContainerServices", "2017-07-01"),
new Tuple<string, string, string>("ContainerService", "ContainerServices", "2017-09-30"),
new Tuple<string, string, string>("ContainerService", "ManagedClusters", "2019-02-01"),
new Tuple<string, string, string>("ContainerService", "OpenShiftManagedClusters", "2018-09-30-preview"),
new Tuple<string, string, string>("ContainerService", "OpenShiftManagedClusters", "2019-04-30"),
new Tuple<string, string, string>("ContainerService", "Operations", "2019-02-01"),
}.AsEnumerable();
}
Expand Down

0 comments on commit 36c2620

Please sign in to comment.