diff --git a/pkg/apis/compute/cloudaccount_const.go b/pkg/apis/compute/cloudaccount_const.go index 2dc651d467..dc3a70c81c 100644 --- a/pkg/apis/compute/cloudaccount_const.go +++ b/pkg/apis/compute/cloudaccount_const.go @@ -36,24 +36,23 @@ const ( CLOUD_PROVIDER_SYNC_STATUS_IDLE = "idle" CLOUD_PROVIDER_SYNC_STATUS_ERROR = "error" - - CLOUD_PROVIDER_ONECLOUD = "OneCloud" - CLOUD_PROVIDER_VMWARE = "VMware" - CLOUD_PROVIDER_ALIYUN = "Aliyun" - CLOUD_PROVIDER_APSARA = "Apsara" - CLOUD_PROVIDER_QCLOUD = "Qcloud" - CLOUD_PROVIDER_AZURE = "Azure" - CLOUD_PROVIDER_AWS = "Aws" - CLOUD_PROVIDER_HUAWEI = "Huawei" + CLOUD_PROVIDER_ONECLOUD = "OneCloud" + CLOUD_PROVIDER_VMWARE = "VMware" + CLOUD_PROVIDER_ALIYUN = "Aliyun" + CLOUD_PROVIDER_APSARA = "Apsara" + CLOUD_PROVIDER_QCLOUD = "Qcloud" + CLOUD_PROVIDER_AZURE = "Azure" + CLOUD_PROVIDER_AWS = "Aws" + CLOUD_PROVIDER_HUAWEI = "Huawei" CLOUD_PROVIDER_HUAWEI_CLOUD_STACK = "HuaweiCloudStack" - CLOUD_PROVIDER_OPENSTACK = "OpenStack" - CLOUD_PROVIDER_UCLOUD = "Ucloud" - CLOUD_PROVIDER_ZSTACK = "ZStack" - CLOUD_PROVIDER_GOOGLE = "Google" - CLOUD_PROVIDER_CTYUN = "Ctyun" - CLOUD_PROVIDER_ECLOUD = "Ecloud" - CLOUD_PROVIDER_JDCLOUD = "JDcloud" - CLOUD_PROVIDER_CLOUDPODS = "Cloudpods" + CLOUD_PROVIDER_OPENSTACK = "OpenStack" + CLOUD_PROVIDER_UCLOUD = "Ucloud" + CLOUD_PROVIDER_ZSTACK = "ZStack" + CLOUD_PROVIDER_GOOGLE = "Google" + CLOUD_PROVIDER_CTYUN = "Ctyun" + CLOUD_PROVIDER_ECLOUD = "Ecloud" + CLOUD_PROVIDER_JDCLOUD = "JDcloud" + CLOUD_PROVIDER_CLOUDPODS = "Cloudpods" CLOUD_PROVIDER_GENERICS3 = "S3" CLOUD_PROVIDER_CEPH = "Ceph" diff --git a/pkg/apis/compute/guest_const.go b/pkg/apis/compute/guest_const.go index 2ee74d7ccb..7f5437d375 100644 --- a/pkg/apis/compute/guest_const.go +++ b/pkg/apis/compute/guest_const.go @@ -153,21 +153,21 @@ const ( HYPERVISOR_HYPERV = "hyperv" HYPERVISOR_XEN = "xen" - HYPERVISOR_ALIYUN = "aliyun" - HYPERVISOR_APSARA = "apsara" - HYPERVISOR_QCLOUD = "qcloud" - HYPERVISOR_AZURE = "azure" - HYPERVISOR_AWS = "aws" - HYPERVISOR_HUAWEI = "huawei" + HYPERVISOR_ALIYUN = "aliyun" + HYPERVISOR_APSARA = "apsara" + HYPERVISOR_QCLOUD = "qcloud" + HYPERVISOR_AZURE = "azure" + HYPERVISOR_AWS = "aws" + HYPERVISOR_HUAWEI = "huawei" HYPERVISOR_HUAWEI_CLOUD_STACK = "huaweicloudstack" - HYPERVISOR_OPENSTACK = "openstack" - HYPERVISOR_UCLOUD = "ucloud" - HYPERVISOR_ZSTACK = "zstack" - HYPERVISOR_GOOGLE = "google" - HYPERVISOR_CTYUN = "ctyun" - HYPERVISOR_ECLOUD = "ecloud" - HYPERVISOR_JDCLOUD = "jdcloud" - HYPERVISOR_CLOUDPODS = "cloudpods" + HYPERVISOR_OPENSTACK = "openstack" + HYPERVISOR_UCLOUD = "ucloud" + HYPERVISOR_ZSTACK = "zstack" + HYPERVISOR_GOOGLE = "google" + HYPERVISOR_CTYUN = "ctyun" + HYPERVISOR_ECLOUD = "ecloud" + HYPERVISOR_JDCLOUD = "jdcloud" + HYPERVISOR_CLOUDPODS = "cloudpods" // HYPERVISOR_DEFAULT = HYPERVISOR_KVM HYPERVISOR_DEFAULT = HYPERVISOR_KVM @@ -233,47 +233,47 @@ var PRIVATE_CLOUD_HYPERVISORS = []string{ // var HYPERVISORS = []string{HYPERVISOR_ALIYUN} var HYPERVISOR_HOSTTYPE = map[string]string{ - HYPERVISOR_KVM: HOST_TYPE_HYPERVISOR, - HYPERVISOR_BAREMETAL: HOST_TYPE_BAREMETAL, - HYPERVISOR_ESXI: HOST_TYPE_ESXI, - HYPERVISOR_CONTAINER: HOST_TYPE_KUBELET, - HYPERVISOR_ALIYUN: HOST_TYPE_ALIYUN, - HYPERVISOR_APSARA: HOST_TYPE_APSARA, - HYPERVISOR_AZURE: HOST_TYPE_AZURE, - HYPERVISOR_AWS: HOST_TYPE_AWS, - HYPERVISOR_QCLOUD: HOST_TYPE_QCLOUD, - HYPERVISOR_HUAWEI: HOST_TYPE_HUAWEI, + HYPERVISOR_KVM: HOST_TYPE_HYPERVISOR, + HYPERVISOR_BAREMETAL: HOST_TYPE_BAREMETAL, + HYPERVISOR_ESXI: HOST_TYPE_ESXI, + HYPERVISOR_CONTAINER: HOST_TYPE_KUBELET, + HYPERVISOR_ALIYUN: HOST_TYPE_ALIYUN, + HYPERVISOR_APSARA: HOST_TYPE_APSARA, + HYPERVISOR_AZURE: HOST_TYPE_AZURE, + HYPERVISOR_AWS: HOST_TYPE_AWS, + HYPERVISOR_QCLOUD: HOST_TYPE_QCLOUD, + HYPERVISOR_HUAWEI: HOST_TYPE_HUAWEI, HYPERVISOR_HUAWEI_CLOUD_STACK: HOST_TYPE_HUAWEI_CLOUD_STACK, - HYPERVISOR_OPENSTACK: HOST_TYPE_OPENSTACK, - HYPERVISOR_UCLOUD: HOST_TYPE_UCLOUD, - HYPERVISOR_ZSTACK: HOST_TYPE_ZSTACK, - HYPERVISOR_GOOGLE: HOST_TYPE_GOOGLE, - HYPERVISOR_CTYUN: HOST_TYPE_CTYUN, - HYPERVISOR_ECLOUD: HOST_TYPE_ECLOUD, - HYPERVISOR_JDCLOUD: HOST_TYPE_JDCLOUD, - HYPERVISOR_CLOUDPODS: HOST_TYPE_CLOUDPODS, + HYPERVISOR_OPENSTACK: HOST_TYPE_OPENSTACK, + HYPERVISOR_UCLOUD: HOST_TYPE_UCLOUD, + HYPERVISOR_ZSTACK: HOST_TYPE_ZSTACK, + HYPERVISOR_GOOGLE: HOST_TYPE_GOOGLE, + HYPERVISOR_CTYUN: HOST_TYPE_CTYUN, + HYPERVISOR_ECLOUD: HOST_TYPE_ECLOUD, + HYPERVISOR_JDCLOUD: HOST_TYPE_JDCLOUD, + HYPERVISOR_CLOUDPODS: HOST_TYPE_CLOUDPODS, } var HOSTTYPE_HYPERVISOR = map[string]string{ - HOST_TYPE_HYPERVISOR: HYPERVISOR_KVM, - HOST_TYPE_BAREMETAL: HYPERVISOR_BAREMETAL, - HOST_TYPE_ESXI: HYPERVISOR_ESXI, - HOST_TYPE_KUBELET: HYPERVISOR_CONTAINER, - HOST_TYPE_ALIYUN: HYPERVISOR_ALIYUN, - HOST_TYPE_APSARA: HYPERVISOR_APSARA, - HOST_TYPE_AZURE: HYPERVISOR_AZURE, - HOST_TYPE_AWS: HYPERVISOR_AWS, - HOST_TYPE_QCLOUD: HYPERVISOR_QCLOUD, - HOST_TYPE_HUAWEI: HYPERVISOR_HUAWEI, + HOST_TYPE_HYPERVISOR: HYPERVISOR_KVM, + HOST_TYPE_BAREMETAL: HYPERVISOR_BAREMETAL, + HOST_TYPE_ESXI: HYPERVISOR_ESXI, + HOST_TYPE_KUBELET: HYPERVISOR_CONTAINER, + HOST_TYPE_ALIYUN: HYPERVISOR_ALIYUN, + HOST_TYPE_APSARA: HYPERVISOR_APSARA, + HOST_TYPE_AZURE: HYPERVISOR_AZURE, + HOST_TYPE_AWS: HYPERVISOR_AWS, + HOST_TYPE_QCLOUD: HYPERVISOR_QCLOUD, + HOST_TYPE_HUAWEI: HYPERVISOR_HUAWEI, HOST_TYPE_HUAWEI_CLOUD_STACK: HYPERVISOR_HUAWEI_CLOUD_STACK, - HOST_TYPE_OPENSTACK: HYPERVISOR_OPENSTACK, - HOST_TYPE_UCLOUD: HYPERVISOR_UCLOUD, - HOST_TYPE_ZSTACK: HYPERVISOR_ZSTACK, - HOST_TYPE_GOOGLE: HYPERVISOR_GOOGLE, - HOST_TYPE_CTYUN: HYPERVISOR_CTYUN, - HOST_TYPE_ECLOUD: HYPERVISOR_ECLOUD, - HOST_TYPE_JDCLOUD: HYPERVISOR_JDCLOUD, - HOST_TYPE_CLOUDPODS: HYPERVISOR_CLOUDPODS, + HOST_TYPE_OPENSTACK: HYPERVISOR_OPENSTACK, + HOST_TYPE_UCLOUD: HYPERVISOR_UCLOUD, + HOST_TYPE_ZSTACK: HYPERVISOR_ZSTACK, + HOST_TYPE_GOOGLE: HYPERVISOR_GOOGLE, + HOST_TYPE_CTYUN: HYPERVISOR_CTYUN, + HOST_TYPE_ECLOUD: HYPERVISOR_ECLOUD, + HOST_TYPE_JDCLOUD: HYPERVISOR_JDCLOUD, + HOST_TYPE_CLOUDPODS: HYPERVISOR_CLOUDPODS, } const ( diff --git a/pkg/apis/compute/host_const.go b/pkg/apis/compute/host_const.go index a68b748415..157c9c9038 100644 --- a/pkg/apis/compute/host_const.go +++ b/pkg/apis/compute/host_const.go @@ -23,21 +23,21 @@ const ( HOST_TYPE_HYPERV = "hyperv" // # Microsoft Hyper-V HOST_TYPE_XEN = "xen" // # XenServer - HOST_TYPE_ALIYUN = "aliyun" - HOST_TYPE_APSARA = "apsara" - HOST_TYPE_AWS = "aws" - HOST_TYPE_QCLOUD = "qcloud" - HOST_TYPE_AZURE = "azure" - HOST_TYPE_HUAWEI = "huawei" + HOST_TYPE_ALIYUN = "aliyun" + HOST_TYPE_APSARA = "apsara" + HOST_TYPE_AWS = "aws" + HOST_TYPE_QCLOUD = "qcloud" + HOST_TYPE_AZURE = "azure" + HOST_TYPE_HUAWEI = "huawei" HOST_TYPE_HUAWEI_CLOUD_STACK = "huaweicloudstack" - HOST_TYPE_OPENSTACK = "openstack" - HOST_TYPE_UCLOUD = "ucloud" - HOST_TYPE_ZSTACK = "zstack" - HOST_TYPE_GOOGLE = "google" - HOST_TYPE_CTYUN = "ctyun" - HOST_TYPE_ECLOUD = "ecloud" - HOST_TYPE_JDCLOUD = "jdcloud" - HOST_TYPE_CLOUDPODS = "cloudpods" + HOST_TYPE_OPENSTACK = "openstack" + HOST_TYPE_UCLOUD = "ucloud" + HOST_TYPE_ZSTACK = "zstack" + HOST_TYPE_GOOGLE = "google" + HOST_TYPE_CTYUN = "ctyun" + HOST_TYPE_ECLOUD = "ecloud" + HOST_TYPE_JDCLOUD = "jdcloud" + HOST_TYPE_CLOUDPODS = "cloudpods" HOST_TYPE_DEFAULT = HOST_TYPE_HYPERVISOR