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

[Hub Generated] Publish private branch 'RPSaaSMaster' #21518

Merged
Show file tree
Hide file tree
Changes from 27 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
a3555ec
add or modify files
shams11 Nov 11, 2022
bc64b96
Update FileSystems_CreateOrUpdate_MaximumSet_Gen.json
shams11 Nov 11, 2022
e58cc5a
Adding 2022-06-27 preview folder
Nov 11, 2022
2ca2cef
Adding custom-words.txt
Nov 11, 2022
4762484
Adding Qumulo.Storage in ./custom.txt file
Nov 11, 2022
7145849
Adding id in the response
Nov 11, 2022
7339054
Fixed ModelValidation errors
Nov 14, 2022
7e5b621
Fixed prettier issue
Nov 14, 2022
0c406b2
Reverting FileSystems_CreateOrUpdate_MaximumSet_Gen.json
Nov 14, 2022
84073cc
Fixed prettier issue
Nov 14, 2022
2353f42
Adding cadl file
Nov 20, 2022
4d7f8af
Adding examples for cadl
Nov 20, 2022
72cb9bd
Removing readme file
Nov 20, 2022
834ad78
Adding read me files
Nov 21, 2022
30a47a9
/Removing read me files
Nov 21, 2022
7b0bb9a
Adding Read me all supported languages
Nov 22, 2022
cda01c2
Changed python readme
Nov 22, 2022
96d45bb
Removing npmrc and cadl-project.yaml
Nov 22, 2022
7c71b49
Moved the cadl under resource-manager and added cadl to support both …
Nov 28, 2022
78f385f
Adding readme files
Nov 28, 2022
e2e33ff
Removing read me
Nov 28, 2022
a583043
Adding .gitignore file
Nov 28, 2022
c876df9
Removing examples
Nov 28, 2022
46a0a28
Renaming to cadl folder
Nov 28, 2022
467e644
Renaming cadl folder to Qumulo.Management
Nov 29, 2022
e2dd92e
Formatted cadl file
Nov 29, 2022
2c38812
Formatted cadl file
Nov 29, 2022
3933dd1
Adding examples in Qumulo.Management
Dec 3, 2022
0dc5b5f
adding cadl-project.yaml
Dec 3, 2022
70be8e1
Adding new package.json
Dec 4, 2022
27781a7
Reverting examples in Qumulo.Management
Dec 4, 2022
3884b95
Adding examples in Qumulo.Management
Dec 5, 2022
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
1 change: 1 addition & 0 deletions custom-words.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1718,6 +1718,7 @@ qnormal
qos
Qssw
Queretaro
Qumulo.Storage
querylogs
querypool
querystring
Expand Down
1 change: 1 addition & 0 deletions specification/liftrqumulo/Qumulo.Management/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
examples/
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please remove this file

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also needs a cadl-project.yaml to add the configuration which is needed by cadl-autorest, see the sample PR: https://github.com/Azure/azure-rest-api-specs/pull/21722/files

178 changes: 178 additions & 0 deletions specification/liftrqumulo/Qumulo.Management/main.cadl
Original file line number Diff line number Diff line change
@@ -0,0 +1,178 @@
import "@cadl-lang/rest";
import "@azure-tools/cadl-autorest";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could you add an 'examples' folder in this folder, which should contain the subfolder for each api-version, e.g.
examples/
2022-06-27-preview/
FileSystems_CreateOrUpdate.json
.....
2022-10-12-preview/
FileSystems_CreateOrUpdate.json
.....

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jianyexi - Provided cadl-project.yaml has issue at

Location: specification/liftrqumulo/Qumulo.Management/cadl-project.yaml#L1

Please suggest the right value

import "@cadl-lang/versioning";
import "@azure-tools/cadl-azure-resource-manager";
import "@azure-tools/cadl-providerhub";

using Cadl.Versioning;
using Azure.ResourceManager;
using Cadl.Http;
using Cadl.Rest;

@armProviderNamespace
@service({title:"Qumulo.Storage"})
@versionedDependency([[Versions.v2022_06_27_preview,Azure.ResourceManager.Versions.v1_0_Preview_1], [Versions.v2022_10_12_preview,Azure.ResourceManager.Versions.v1_0_Preview_1]])
@versioned(Versions)
namespace Qumulo.Storage;

@doc("Storage Sku")
enum StorageSku {

@doc("Standard Storage Sku")
"Standard",

@doc("Performance Storage Sku")
"Performance"
}

enum Versions {
v2022_06_27_preview: "2022-06-27-preview",
v2022_10_12_preview: "2022-10-12-preview",
}

@doc("Qumulo File System resource")
model FileSystemResource is TrackedResource<FileSystemResourceProperties> {

@key("fileSystemName")
@segment("fileSystems")

@doc("Name of the storage resource")
name: string;

...ManagedServiceIdentity
}

@armResourceOperations
interface FileSystems extends ResourceOperations<FileSystemResource,FileSystemResourceProperties> {
}

@doc("Properties specific to the Qumulo File System resource")
model FileSystemResourceProperties {

@doc("Azure Subscription Id")
subscriptionId: string;

@doc("Marketplace details")
marketplaceDetails? : MarketplaceDetails;

@doc("Provisioning State of the resource")
provisioningState: ProvisioningState;

@doc("User Details")
userDetails: UserDetails;

@doc("Company Details")
companyDetails: CompanyDetails;

@doc("Delegated subnet id for Vnet injection")
delegatedSubnetId: string;

@doc("Qumulo admin dashboard Url")
clusterLoginUrl: string;

@doc("List of eNIC IPs")
privateIPs: string[];

@added(Versions.v2022_10_12_preview)
@doc("Initial administrator password of the resource")
@secret
adminPassword: string;

@added(Versions.v2022_10_12_preview)
@doc("Storage capacity in TB")
initialCapacity: int32;

@added(Versions.v2022_10_12_preview)
@doc("Availability zone")
availabilityZone: string;

@added(Versions.v2022_10_12_preview)
@doc("Storage Sku")
storageSku: StorageSku;
}

@doc("MarketplaceDetails of Qumulo FileSystem resource")
model MarketplaceDetails{
@doc("Marketplace Subscription Id")
marketplaceSubscriptionId: string;

@doc("Plan Id")
planId: string;

@doc("Offer Id")
offerId: string;

@doc("Publisher Id")
publisherId: string;

@doc("Marketplace subscription status")
marketplaceSubscriptionStatus: MarketplaceSubscriptionStatus;
}

@doc("User Details of Qumulo FileSystem resource")
model UserDetails{

@doc("First name")
firstName?: string;

@doc("Last name")
lastName?: string;

@doc("User Email")
email: string;

@doc("Alternate Email address")
alternateEmail?: string;

@doc("UPN of user")
upn: string;

@doc("Address of user")
address?: string;

@doc("Contact phone number")
contactPhoneNumber?: string;
}

@doc("Company details of Qumulo FileSystem resource")
model CompanyDetails{

@doc("Company name")
companyName: string;

@doc("Office Address")
officeAddress?: string;

@doc("Country of operation")
country: string;

@doc("Domain of the company")
domain: string;

@doc("Business of the company")
business?: string;

@doc("Number of Employees")
numberOfEmployees: int32;
}

@doc("Marketplace subscription status of the storage resource")
enum MarketplaceSubscriptionStatus{
"PendingFulfillmentStart",
"Subscribed",
"Suspended",
"Unsubscribed",
}

@doc("Provisioning State of the storage resource")
enum ProvisioningState {
"Accepted",
"Creating",
"Updating",
"Deleting",
"Succeeded",
"Failed",
"Canceled",
"Deleted",
"NotSpecified"
}
24 changes: 24 additions & 0 deletions specification/liftrqumulo/Qumulo.Management/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"name": "cadl",
"version": "1.0.0",
"description": "npm packages required to run cadl",
"main": "index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"keywords": [],
"author": "",
"license": "ISC",
"dependencies": {
"@azure-tools/cadl-autorest": "^0.16.0",
"@azure-tools/cadl-azure-core": "^0.3.0",
"@azure-tools/cadl-azure-resource-manager": "^0.6.0",
"@azure-tools/cadl-providerhub": "^0.17.0",
"@azure-tools/cadl-providerhub-controller": "^0.12.0",
"@cadl-lang/openapi": "^0.9.0",
"@cadl-lang/openapi3": "^0.11.0",
"@cadl-lang/rest": "^0.14.0",
"@cadl-lang/versioning": "^0.5.0"
},
"devDependencies": {}
}
Loading