Skip to content

Commit

Permalink
Generated from ad95dc3aa4cc2e6d9948b79432cf1ac9c0d50641 (#815)
Browse files Browse the repository at this point in the history
Update description to remove min and max limitations
  • Loading branch information
AutorestCI authored Dec 11, 2018
1 parent 7f4c376 commit 756e031
Show file tree
Hide file tree
Showing 14 changed files with 405 additions and 80 deletions.
61 changes: 19 additions & 42 deletions packages/@azure/arm-containerservice/README.md
Original file line number Diff line number Diff line change
@@ -1,42 +1,30 @@
## Azure ContainerServiceClient SDK for JavaScript

# Azure ContainerServiceClient SDK for JavaScript
This package contains an isomorphic SDK for ContainerServiceClient.

### Currently supported environments

## Currently supported environments
- Node.js version 6.x.x or higher
- Browser JavaScript

### How to Install

## How to Install
```
npm install @azure/arm-containerservice
```

### How to use

#### nodejs - Authentication, client creation and get openShiftManagedClusters as an example written in TypeScript.

##### Install @azure/ms-rest-nodeauth

```
npm install @azure/ms-rest-nodeauth
```
## How to use

##### Sample code
### nodejs - Authentication, client creation and list openShiftManagedClusters as an example written in TypeScript.

```ts
import * as msRest from "@azure/ms-rest-js";
import * as msRestAzure from "@azure/ms-rest-azure-js";
import * as msRestNodeAuth from "@azure/ms-rest-nodeauth";
import * as msRest from "ms-rest-js";
import * as msRestAzure from "ms-rest-azure-js";
import * as msRestNodeAuth from "ms-rest-nodeauth";
import { ContainerServiceClient, ContainerServiceModels, ContainerServiceMappers } from "@azure/arm-containerservice";
const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"];

msRestNodeAuth.interactiveLogin().then((creds) => {
const client = new ContainerServiceClient(creds, subscriptionId);
const resourceGroupName = "testresourceGroupName";
const resourceName = "testresourceName";
client.openShiftManagedClusters.get(resourceGroupName, resourceName).then((result) => {
client.openShiftManagedClusters.list().then((result) => {
console.log("The result is:");
console.log(result);
});
Expand All @@ -45,16 +33,7 @@ msRestNodeAuth.interactiveLogin().then((creds) => {
});
```

#### browser - Authentication, client creation and get openShiftManagedClusters as an example written in JavaScript.

##### Install @azure/ms-rest-browserauth

```
npm install @azure/ms-rest-browserauth
```

##### Sample code

### browser - Authentication, client creation and list openShiftManagedClusters as an example written in JavaScript.
See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to Azure in the browser.

- index.html
Expand All @@ -63,11 +42,11 @@ See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to
<html lang="en">
<head>
<title>@azure/arm-containerservice sample</title>
<script src="node_modules/@azure/ms-rest-js/dist/msRest.browser.js"></script>
<script src="node_modules/@azure/ms-rest-azure-js/dist/msRestAzure.js"></script>
<script src="node_modules/@azure/ms-rest-browserauth/dist/msAuth.js"></script>
<script src="node_modules/ms-rest-js/dist/msRest.browser.js"></script>
<script src="node_modules/ms-rest-azure-js/dist/msRestAzure.js"></script>
<script src="node_modules/ms-rest-browserauth/dist/msAuth.js"></script>
<script src="node_modules/@azure/arm-containerservice/dist/arm-containerservice.js"></script>
<script type="text/javascript">
<script>
const subscriptionId = "<Subscription_Id>";
const authManager = new msAuth.AuthManager({
clientId: "<client id for your Azure AD app>",
Expand All @@ -79,9 +58,7 @@ See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to
authManager.login();
}
const client = new Azure.ArmContainerservice.ContainerServiceClient(res.creds, subscriptionId);
const resourceGroupName = "testresourceGroupName";
const resourceName = "testresourceName";
client.openShiftManagedClusters.get(resourceGroupName, resourceName).then((result) => {
client.openShiftManagedClusters.list().then((result) => {
console.log("The result is:");
console.log(result);
}).catch((err) => {
Expand All @@ -91,10 +68,10 @@ See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to
});
</script>
</head>
<body></body>
<body>
</body>
</html>
```

## Related projects

- [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js)
# Related projects
- [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js)
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* regenerated.
*/

import * as msRest from "@azure/ms-rest-js";
import * as msRest from "ms-rest-js";
import * as Models from "./models";
import * as Mappers from "./models/mappers";
import * as operations from "./operations";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
*/

import * as Models from "./models";
import * as msRest from "@azure/ms-rest-js";
import * as msRestAzure from "@azure/ms-rest-azure-js";
import * as msRest from "ms-rest-js";
import * as msRestAzure from "ms-rest-azure-js";

const packageName = "@azure/arm-containerservice";
const packageVersion = "0.1.0";
Expand Down
136 changes: 127 additions & 9 deletions packages/@azure/arm-containerservice/lib/models/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
* regenerated.
*/

import { BaseResource, CloudError, AzureServiceClientOptions } from "@azure/ms-rest-azure-js";
import * as msRest from "@azure/ms-rest-js";
import { BaseResource, CloudError, AzureServiceClientOptions } from "ms-rest-azure-js";
import * as msRest from "ms-rest-js";

export { BaseResource, CloudError };

Expand Down Expand Up @@ -134,12 +134,22 @@ export interface OpenShiftManagedClusterMasterPoolProfile {
name?: string;
/**
* @member {number} count Number of masters (VMs) to host docker containers.
* The default value is 3. Default value: 3 .
* The default value is 3.
*/
count: number;
/**
* @member {OpenShiftContainerServiceVMSize} vmSize Size of agent VMs.
* Possible values include: 'Standard_D2s_v3', 'Standard_D4s_v3'
* Possible values include: 'Standard_D2s_v3', 'Standard_D4s_v3',
* 'Standard_D8s_v3', 'Standard_D16s_v3', 'Standard_D32s_v3',
* 'Standard_D64s_v3', 'Standard_DS4_v2', 'Standard_DS5_v2',
* 'Standard_F8s_v2', 'Standard_F16s_v2', 'Standard_F32s_v2',
* 'Standard_F64s_v2', 'Standard_F72s_v2', 'Standard_F8s', 'Standard_F16s',
* 'Standard_E4s_v3', 'Standard_E8s_v3', 'Standard_E16s_v3',
* 'Standard_E20s_v3', 'Standard_E32s_v3', 'Standard_E64s_v3',
* 'Standard_GS2', 'Standard_GS3', 'Standard_GS4', 'Standard_GS5',
* 'Standard_DS12_v2', 'Standard_DS13_v2', 'Standard_DS14_v2',
* 'Standard_DS15_v2', 'Standard_L4s', 'Standard_L8s', 'Standard_L16s',
* 'Standard_L32s'
*/
vmSize: OpenShiftContainerServiceVMSize;
/**
Expand Down Expand Up @@ -168,13 +178,21 @@ export interface OpenShiftManagedClusterAgentPoolProfile {
name: string;
/**
* @member {number} count Number of agents (VMs) to host docker containers.
* Allowed values must be in the range of 1 to 5 (inclusive). The default
* value is 2. . Default value: 2 .
*/
count: number;
/**
* @member {OpenShiftContainerServiceVMSize} vmSize Size of agent VMs.
* Possible values include: 'Standard_D2s_v3', 'Standard_D4s_v3'
* Possible values include: 'Standard_D2s_v3', 'Standard_D4s_v3',
* 'Standard_D8s_v3', 'Standard_D16s_v3', 'Standard_D32s_v3',
* 'Standard_D64s_v3', 'Standard_DS4_v2', 'Standard_DS5_v2',
* 'Standard_F8s_v2', 'Standard_F16s_v2', 'Standard_F32s_v2',
* 'Standard_F64s_v2', 'Standard_F72s_v2', 'Standard_F8s', 'Standard_F16s',
* 'Standard_E4s_v3', 'Standard_E8s_v3', 'Standard_E16s_v3',
* 'Standard_E20s_v3', 'Standard_E32s_v3', 'Standard_E64s_v3',
* 'Standard_GS2', 'Standard_GS3', 'Standard_GS4', 'Standard_GS5',
* 'Standard_DS12_v2', 'Standard_DS13_v2', 'Standard_DS14_v2',
* 'Standard_DS15_v2', 'Standard_L4s', 'Standard_L8s', 'Standard_L16s',
* 'Standard_L32s'
*/
vmSize: OpenShiftContainerServiceVMSize;
/**
Expand Down Expand Up @@ -1382,6 +1400,23 @@ export interface ContainerServiceClientOptions extends AzureServiceClientOptions
}


/**
* @interface
* An interface representing the OpenShiftManagedClusterListResult.
* The response from the List OpenShift Managed Clusters operation.
*
* @extends Array<OpenShiftManagedCluster>
*/
export interface OpenShiftManagedClusterListResult extends Array<OpenShiftManagedCluster> {
/**
* @member {string} [nextLink] The URL to get the next set of OpenShift
* managed cluster results.
* **NOTE: This property will not be serialized. It can only be populated by
* the server.**
*/
readonly nextLink?: string;
}

/**
* @interface
* An interface representing the ContainerServiceListResult.
Expand Down Expand Up @@ -1436,11 +1471,18 @@ export type OSType = 'Linux' | 'Windows';

/**
* Defines values for OpenShiftContainerServiceVMSize.
* Possible values include: 'Standard_D2s_v3', 'Standard_D4s_v3'
* Possible values include: 'Standard_D2s_v3', 'Standard_D4s_v3', 'Standard_D8s_v3',
* 'Standard_D16s_v3', 'Standard_D32s_v3', 'Standard_D64s_v3', 'Standard_DS4_v2',
* 'Standard_DS5_v2', 'Standard_F8s_v2', 'Standard_F16s_v2', 'Standard_F32s_v2',
* 'Standard_F64s_v2', 'Standard_F72s_v2', 'Standard_F8s', 'Standard_F16s', 'Standard_E4s_v3',
* 'Standard_E8s_v3', 'Standard_E16s_v3', 'Standard_E20s_v3', 'Standard_E32s_v3',
* 'Standard_E64s_v3', 'Standard_GS2', 'Standard_GS3', 'Standard_GS4', 'Standard_GS5',
* 'Standard_DS12_v2', 'Standard_DS13_v2', 'Standard_DS14_v2', 'Standard_DS15_v2', 'Standard_L4s',
* 'Standard_L8s', 'Standard_L16s', 'Standard_L32s'
* @readonly
* @enum {string}
*/
export type OpenShiftContainerServiceVMSize = 'Standard_D2s_v3' | 'Standard_D4s_v3';
export type OpenShiftContainerServiceVMSize = 'Standard_D2s_v3' | 'Standard_D4s_v3' | 'Standard_D8s_v3' | 'Standard_D16s_v3' | 'Standard_D32s_v3' | 'Standard_D64s_v3' | 'Standard_DS4_v2' | 'Standard_DS5_v2' | 'Standard_F8s_v2' | 'Standard_F16s_v2' | 'Standard_F32s_v2' | 'Standard_F64s_v2' | 'Standard_F72s_v2' | 'Standard_F8s' | 'Standard_F16s' | 'Standard_E4s_v3' | 'Standard_E8s_v3' | 'Standard_E16s_v3' | 'Standard_E20s_v3' | 'Standard_E32s_v3' | 'Standard_E64s_v3' | 'Standard_GS2' | 'Standard_GS3' | 'Standard_GS4' | 'Standard_GS5' | 'Standard_DS12_v2' | 'Standard_DS13_v2' | 'Standard_DS14_v2' | 'Standard_DS15_v2' | 'Standard_L4s' | 'Standard_L8s' | 'Standard_L16s' | 'Standard_L32s';

/**
* Defines values for OpenShiftAgentPoolProfileRole.
Expand Down Expand Up @@ -1535,6 +1577,44 @@ export type NetworkPlugin = 'azure' | 'kubenet';
*/
export type NetworkPolicy = 'calico';

/**
* Contains response data for the list operation.
*/
export type OpenShiftManagedClustersListResponse = OpenShiftManagedClusterListResult & {
/**
* The underlying HTTP response.
*/
_response: msRest.HttpResponse & {
/**
* The response body as text (string format)
*/
bodyAsText: string;
/**
* The response body as parsed JSON or XML
*/
parsedBody: OpenShiftManagedClusterListResult;
};
};

/**
* Contains response data for the listByResourceGroup operation.
*/
export type OpenShiftManagedClustersListByResourceGroupResponse = OpenShiftManagedClusterListResult & {
/**
* The underlying HTTP response.
*/
_response: msRest.HttpResponse & {
/**
* The response body as text (string format)
*/
bodyAsText: string;
/**
* The response body as parsed JSON or XML
*/
parsedBody: OpenShiftManagedClusterListResult;
};
};

/**
* Contains response data for the get operation.
*/
Expand Down Expand Up @@ -1630,6 +1710,44 @@ export type OpenShiftManagedClustersBeginUpdateTagsResponse = OpenShiftManagedCl
};
};

/**
* Contains response data for the listNext operation.
*/
export type OpenShiftManagedClustersListNextResponse = OpenShiftManagedClusterListResult & {
/**
* The underlying HTTP response.
*/
_response: msRest.HttpResponse & {
/**
* The response body as text (string format)
*/
bodyAsText: string;
/**
* The response body as parsed JSON or XML
*/
parsedBody: OpenShiftManagedClusterListResult;
};
};

/**
* Contains response data for the listByResourceGroupNext operation.
*/
export type OpenShiftManagedClustersListByResourceGroupNextResponse = OpenShiftManagedClusterListResult & {
/**
* The underlying HTTP response.
*/
_response: msRest.HttpResponse & {
/**
* The response body as text (string format)
*/
bodyAsText: string;
/**
* The response body as parsed JSON or XML
*/
parsedBody: OpenShiftManagedClusterListResult;
};
};

/**
* Contains response data for the list operation.
*/
Expand Down
Loading

0 comments on commit 756e031

Please sign in to comment.