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

[AutoPR mgmt-v2020_07_01] [T2] containerservice python automation fix #6033

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions sdk/containerservice/mgmt-v2020_07_01/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-arm-parent</artifactId>
<version>1.3.2</version>
<relativePath>../../parents/azure-arm-parent/pom.xml</relativePath>
<version>1.1.0</version>
<relativePath>../../../pom.management.xml</relativePath>
</parent>
<artifactId>azure-mgmt-containerservice</artifactId>
<version>1.0.0-beta</version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,18 @@
* Type representing AgentPools.
*/
public interface AgentPools extends SupportsCreating<AgentPool.DefinitionStages.Blank>, HasInner<AgentPoolsInner> {
/**
* Upgrade node image version of an agent pool to the latest.
* Upgrade node image version of an agent pool to the latest.
*
* @param resourceGroupName The name of the resource group.
* @param resourceName The name of the managed cluster resource.
* @param agentPoolName The name of the agent pool.
* @throws IllegalArgumentException thrown if parameters fail the validation
* @return the observable for the request
*/
Observable<AgentPool> upgradeNodeImageVersionAsync(String resourceGroupName, String resourceName, String agentPoolName);

/**
* Gets the agent pool.
* Gets the details of the agent pool by managed cluster and resource group.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,28 @@
*/
public class ManagedClusterWindowsProfile {
/**
* The administrator username to use for Windows VMs.
* Specifies the name of the administrator account. &lt;br&gt;&lt;br&gt;
* **restriction:** Cannot end in "." &lt;br&gt;&lt;br&gt; **Disallowed
* values:** "administrator", "admin", "user", "user1", "test", "user2",
* "test1", "user3", "admin1", "1", "123", "a", "actuser", "adm", "admin2",
* "aspnet", "backup", "console", "david", "guest", "john", "owner",
* "root", "server", "sql", "support", "support_388945a0", "sys", "test2",
* "test3", "user4", "user5". &lt;br&gt;&lt;br&gt; **Minimum-length:** 1
* character &lt;br&gt;&lt;br&gt; **Max-length:** 20 characters.
*/
@JsonProperty(value = "adminUsername", required = true)
private String adminUsername;

/**
* The administrator password to use for Windows VMs.
* Specifies the password of the administrator account.
* &lt;br&gt;&lt;br&gt; **Minimum-length:** 8 characters
* &lt;br&gt;&lt;br&gt; **Max-length:** 123 characters &lt;br&gt;&lt;br&gt;
* **Complexity requirements:** 3 out of 4 conditions below need to be
* fulfilled &lt;br&gt; Has lower characters &lt;br&gt;Has upper characters
* &lt;br&gt; Has a digit &lt;br&gt; Has a special character (Regex match
* [\W_]) &lt;br&gt;&lt;br&gt; **Disallowed values:** "abc@123",
* "P@$$w0rd", "P@ssw0rd", "P@ssword123", "Pa$$word", "pass@word1",
* "Password!", "Password1", "Password22", "iloveyou!".
*/
@JsonProperty(value = "adminPassword")
private String adminPassword;
Expand All @@ -35,7 +50,7 @@ public class ManagedClusterWindowsProfile {
private LicenseType licenseType;

/**
* Get the administrator username to use for Windows VMs.
* Get specifies the name of the administrator account. &lt;br&gt;&lt;br&gt; **restriction:** Cannot end in "." &lt;br&gt;&lt;br&gt; **Disallowed values:** "administrator", "admin", "user", "user1", "test", "user2", "test1", "user3", "admin1", "1", "123", "a", "actuser", "adm", "admin2", "aspnet", "backup", "console", "david", "guest", "john", "owner", "root", "server", "sql", "support", "support_388945a0", "sys", "test2", "test3", "user4", "user5". &lt;br&gt;&lt;br&gt; **Minimum-length:** 1 character &lt;br&gt;&lt;br&gt; **Max-length:** 20 characters.
*
* @return the adminUsername value
*/
Expand All @@ -44,7 +59,7 @@ public String adminUsername() {
}

/**
* Set the administrator username to use for Windows VMs.
* Set specifies the name of the administrator account. &lt;br&gt;&lt;br&gt; **restriction:** Cannot end in "." &lt;br&gt;&lt;br&gt; **Disallowed values:** "administrator", "admin", "user", "user1", "test", "user2", "test1", "user3", "admin1", "1", "123", "a", "actuser", "adm", "admin2", "aspnet", "backup", "console", "david", "guest", "john", "owner", "root", "server", "sql", "support", "support_388945a0", "sys", "test2", "test3", "user4", "user5". &lt;br&gt;&lt;br&gt; **Minimum-length:** 1 character &lt;br&gt;&lt;br&gt; **Max-length:** 20 characters.
*
* @param adminUsername the adminUsername value to set
* @return the ManagedClusterWindowsProfile object itself.
Expand All @@ -55,7 +70,7 @@ public ManagedClusterWindowsProfile withAdminUsername(String adminUsername) {
}

/**
* Get the administrator password to use for Windows VMs.
* Get specifies the password of the administrator account. &lt;br&gt;&lt;br&gt; **Minimum-length:** 8 characters &lt;br&gt;&lt;br&gt; **Max-length:** 123 characters &lt;br&gt;&lt;br&gt; **Complexity requirements:** 3 out of 4 conditions below need to be fulfilled &lt;br&gt; Has lower characters &lt;br&gt;Has upper characters &lt;br&gt; Has a digit &lt;br&gt; Has a special character (Regex match [\W_]) &lt;br&gt;&lt;br&gt; **Disallowed values:** "abc@123", "P@$$w0rd", "P@ssw0rd", "P@ssword123", "Pa$$word", "pass@word1", "Password!", "Password1", "Password22", "iloveyou!".
*
* @return the adminPassword value
*/
Expand All @@ -64,7 +79,7 @@ public String adminPassword() {
}

/**
* Set the administrator password to use for Windows VMs.
* Set specifies the password of the administrator account. &lt;br&gt;&lt;br&gt; **Minimum-length:** 8 characters &lt;br&gt;&lt;br&gt; **Max-length:** 123 characters &lt;br&gt;&lt;br&gt; **Complexity requirements:** 3 out of 4 conditions below need to be fulfilled &lt;br&gt; Has lower characters &lt;br&gt;Has upper characters &lt;br&gt; Has a digit &lt;br&gt; Has a special character (Regex match [\W_]) &lt;br&gt;&lt;br&gt; **Disallowed values:** "abc@123", "P@$$w0rd", "P@ssw0rd", "P@ssword123", "Pa$$word", "pass@word1", "Password!", "Password1", "Password22", "iloveyou!".
*
* @param adminPassword the adminPassword value to set
* @return the ManagedClusterWindowsProfile object itself.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,16 +114,4 @@ public interface ManagedClusters extends SupportsCreating<ManagedCluster.Definit
*/
Observable<ManagedClusterAccessProfile> getAccessProfileAsync(String resourceGroupName, String resourceName, String roleName);

/**
* Upgrade node image version of an agent pool to the latest.
* Upgrade node image version of an agent pool to the latest.
*
* @param resourceGroupName The name of the resource group.
* @param resourceName The name of the managed cluster resource.
* @param agentPoolName The name of the agent pool.
* @throws IllegalArgumentException thrown if parameters fail the validation
* @return the observable for the request
*/
Observable<AgentPool> upgradeNodeImageVersionAsync(String resourceGroupName, String resourceName, String agentPoolName);

}
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,18 @@ private AgentPoolImpl wrapModel(String name) {
return new AgentPoolImpl(name, this.manager());
}

@Override
public Observable<AgentPool> upgradeNodeImageVersionAsync(String resourceGroupName, String resourceName, String agentPoolName) {
AgentPoolsInner client = this.inner();
return client.upgradeNodeImageVersionAsync(resourceGroupName, resourceName, agentPoolName)
.map(new Func1<AgentPoolInner, AgentPool>() {
@Override
public AgentPool call(AgentPoolInner inner) {
return new AgentPoolImpl(inner, manager());
}
});
}

@Override
public Observable<AgentPool> listAsync(final String resourceGroupName, final String resourceName) {
AgentPoolsInner client = this.inner();
Expand Down
Loading