@daocloud-proto/virtnest 0.3.0-dev-5 → 0.3.0-dev-7

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@daocloud-proto/virtnest",
-    "version":"0.3.0-dev-5",
+    "version":"0.3.0-dev-7",
     "description": "",
     "author": "",
     "license": "ISC"

package/v1alpha1/vm.pb.ts

@@ -19,6 +19,16 @@ export enum AllowedOperation {
   allowed_operation_live_migration = "allowed_operation_live_migration",
 }
 
+export enum SortBy {
+  created_at = "created_at",
+  field_name = "field_name",
+}
+
+export enum SortDir {
+  desc = "desc",
+  asc = "asc",
+}
+
 export enum ImageSource {
   docker = "docker",
   http = "http",
@@ -86,10 +96,10 @@ export type ListClusterVmsInfo = {
   status?: VMStatus
   namespace?: string
   ips?: string[]
-  cpu?: string
+  cpu?: number
   memory?: string
   createdAt?: string
-  osFamily?: OSFamily
+  osFamily?: string
   vmErrorMessage?: VmErrorMessage
   allowedOperation?: AllowedOperation[]
   node?: string
@@ -100,6 +110,8 @@ export type ListClusterVMsRequest = {
   page?: number
   cluster?: string
   search?: string
+  sortBy?: SortBy
+  sortDir?: SortDir
 }
 
 export type ListClusterVmsResponse = {
@@ -117,10 +129,10 @@ export type CreateVMRequest = {
   imageSource?: ImageSource
   imageUrl?: string
   disks?: VMDisks
-  cpu?: Item
-  memory?: Item
+  cpu?: number
+  memory?: string
   ssh?: SSH
-  osFamily?: OSFamily
+  osFamily?: string
   osVersion?: string
   secret?: string
 }
@@ -131,11 +143,6 @@ export type SSH = {
   sshKey?: string
 }
 
-export type Item = {
-  request?: string
-  limit?: string
-}
-
 export type Network = {
   name?: string
   subnet?: string
@@ -161,8 +168,8 @@ export type UpdateVMRequest = {
   aliasName?: string
   labels?: {[key: string]: string}
   annotations?: {[key: string]: string}
-  cpu?: Item
-  memory?: Item
+  cpu?: number
+  memory?: string
   disks?: VMDisks
 }
 
@@ -199,11 +206,11 @@ export type GetVMResponse = {
   username?: string
   password?: string
   sshKey?: string
-  cpu?: Item
-  memory?: Item
+  cpu?: number
+  memory?: string
   vmErrorMessage?: VmErrorMessage
   imageSource?: ImageSource
-  osFamily?: OSFamily
+  osFamily?: string
   osVersion?: string
   imageUrl?: string
   node?: string
@@ -397,7 +404,7 @@ export type ListSystemImagesResponse = {
 }
 
 export type SystemImage = {
-  osFamily?: OSFamily
+  osFamily?: string
   version?: SystemImageVersion[]
 }
 
@@ -474,8 +481,8 @@ export type StorageClass = {
   supportAccessMode?: PersistentVolumeAccessMode[]
 }
 
-export type CreateVMWithTemplateRequest = {
-  templateName?: string
+export type CreateVMWithVMTemplateRequest = {
+  vmtemplateName?: string
   cluster?: string
   namespace?: string
   name?: string
@@ -483,11 +490,15 @@ export type CreateVMWithTemplateRequest = {
   cpu?: number
   memory?: string
   disks?: VMDisks
-  username?: string
-  password?: string
+  ssh?: SSH
+  imageSource?: ImageSource
+  imageUrl?: string
+  osFamily?: string
+  osVersion?: string
+  secret?: string
 }
 
-export type CreateVMWithTemplateResponse = {
+export type CreateVMWithVMTemplateResponse = {
 }
 
 export class VM {
@@ -566,7 +577,7 @@ export class VM {
   static ListClusterStorageClasses(req: ListClusterStorageClassesRequest, initReq?: fm.InitReq): Promise<ListClusterStorageClassesResponse> {
     return fm.fetchReq<ListClusterStorageClassesRequest, ListClusterStorageClassesResponse>(`/apis/virtnest.io/v1alpha1/clusters/${req["cluster"]}/storageclasses?${fm.renderURLSearchParams(req, ["cluster"])}`, {...initReq, method: "GET"})
   }
-  static CreateVMWithTemplate(req: CreateVMWithTemplateRequest, initReq?: fm.InitReq): Promise<CreateVMWithTemplateResponse> {
-    return fm.fetchReq<CreateVMWithTemplateRequest, CreateVMWithTemplateResponse>(`/apis/virtnest.io/v1alpha1/clusters/${req["cluster"]}/namespaces/${req["namespace"]}/vm-with-template/${req["templateName"]}`, {...initReq, method: "POST", body: JSON.stringify(req, fm.replacer)})
+  static CreateVMWithVMTemplate(req: CreateVMWithVMTemplateRequest, initReq?: fm.InitReq): Promise<CreateVMWithVMTemplateResponse> {
+    return fm.fetchReq<CreateVMWithVMTemplateRequest, CreateVMWithVMTemplateResponse>(`/apis/virtnest.io/v1alpha1/clusters/${req["cluster"]}/namespaces/${req["namespace"]}/vm-with-vmtemplate/${req["vmtemplateName"]}`, {...initReq, method: "POST", body: JSON.stringify(req, fm.replacer)})
   }
 }

package/v1alpha1/vmtemplate.pb.ts

@@ -11,13 +11,6 @@ export enum TemplateType {
   internal = "internal",
 }
 
-export enum OSFamily {
-  Unknown = "Unknown",
-  Debian = "Debian",
-  CentOS = "CentOS",
-  Ubuntu = "Ubuntu",
-}
-
 export type ListVMTemplatesRequest = {
   pageSize?: number
   page?: number
@@ -38,10 +31,10 @@ export type Pagination = {
 export type VMTemplateInfo = {
   name?: string
   type?: TemplateType
-  cpu?: string
+  cpu?: number
   memory?: string
   createdAt?: string
-  osFamily?: OSFamily
+  osFamily?: string
 }
 
 export type GetVMTemplateRequest = {
@@ -53,21 +46,33 @@ export type GetVMTemplateResponse = {
   description?: string
   labels?: {[key: string]: string}
   annotations?: {[key: string]: string}
-  cpu?: string
+  cpu?: number
   memory?: string
   createdAt?: string
-  osFamily?: OSFamily
+  osFamily?: string
   imageUrl?: string
+  type?: TemplateType
+  systemDiskCapacity?: string
 }
 
 export type CreateVMTemplateByVMRequest = {
+  cluster?: string
+  namespace?: string
   vmName?: string
-  templateName?: string
+  vmtemplateName?: string
+  description?: string
 }
 
 export type CreateVMTemplateByVMResponse = {
 }
 
+export type DeleteVMTemplateRequest = {
+  name?: string
+}
+
+export type DeleteVMTemplateResponse = {
+}
+
 export class VMTemplate {
   static ListVMTemplates(req: ListVMTemplatesRequest, initReq?: fm.InitReq): Promise<ListVMTemplatesResponse> {
     return fm.fetchReq<ListVMTemplatesRequest, ListVMTemplatesResponse>(`/apis/virtnest.io/v1alpha1/vmtemplates?${fm.renderURLSearchParams(req, [])}`, {...initReq, method: "GET"})
@@ -75,7 +80,10 @@ export class VMTemplate {
   static GetVMTemplate(req: GetVMTemplateRequest, initReq?: fm.InitReq): Promise<GetVMTemplateResponse> {
     return fm.fetchReq<GetVMTemplateRequest, GetVMTemplateResponse>(`/apis/virtnest.io/v1alpha1/vmtemplates/${req["name"]}?${fm.renderURLSearchParams(req, ["name"])}`, {...initReq, method: "GET"})
   }
-  static CreateTemplateByVM(req: CreateVMTemplateByVMRequest, initReq?: fm.InitReq): Promise<CreateVMTemplateByVMResponse> {
-    return fm.fetchReq<CreateVMTemplateByVMRequest, CreateVMTemplateByVMResponse>(`/apis/virtnest.io/v1alpha1/vmtemplatebyvm`, {...initReq, method: "POST", body: JSON.stringify(req, fm.replacer)})
+  static DeleteVMTemplate(req: DeleteVMTemplateRequest, initReq?: fm.InitReq): Promise<DeleteVMTemplateResponse> {
+    return fm.fetchReq<DeleteVMTemplateRequest, DeleteVMTemplateResponse>(`/apis/virtnest.io/v1alpha1/vmtemplates/${req["name"]}`, {...initReq, method: "DELETE"})
+  }
+  static CreateVMTemplateByVM(req: CreateVMTemplateByVMRequest, initReq?: fm.InitReq): Promise<CreateVMTemplateByVMResponse> {
+    return fm.fetchReq<CreateVMTemplateByVMRequest, CreateVMTemplateByVMResponse>(`/apis/virtnest.io/v1alpha1/vmtemplate-by-vm`, {...initReq, method: "POST", body: JSON.stringify(req, fm.replacer)})
   }
 }