From 41861f68f832a62f464a727a2b5324b52a25f07b Mon Sep 17 00:00:00 2001 From: tb365 Date: Tue, 31 Aug 2021 10:54:13 +0800 Subject: [PATCH 1/3] syncRemoveCloudHost purge host --- pkg/compute/models/hosts.go | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkg/compute/models/hosts.go b/pkg/compute/models/hosts.go index 975e8be658..5de50b6b23 100644 --- a/pkg/compute/models/hosts.go +++ b/pkg/compute/models/hosts.go @@ -1735,19 +1735,9 @@ func (self *SHost) syncRemoveCloudHost(ctx context.Context, userCred mcclient.To err := self.ValidatePurgeCondition(ctx) if err != nil { - err = self.SetStatus(userCred, api.HOST_OFFLINE, "sync to delete") - if err == nil { - _, err = self.PerformDisable(ctx, userCred, nil, apis.PerformDisableInput{}) - } - guests, err := self.GetGuests() + err = self.purge(ctx, userCred) if err != nil { - return errors.Wrapf(err, "GetGuests") - } - for _, guest := range guests { - err = guest.SetStatus(userCred, api.VM_UNKNOWN, "sync to delete") - if err != nil { - return err - } + return errors.Wrap(err, "purge") } } else { err = self.RealDelete(ctx, userCred) From 907095670c3acb1f0c591d002106b7620b6ac20b Mon Sep 17 00:00:00 2001 From: tb365 Date: Tue, 31 Aug 2021 11:07:44 +0800 Subject: [PATCH 2/3] rename huaweicloudstack to hcso --- cmd/climc/shell/compute/cloudaccounts.go | 6 +- cmd/{huaweistackcli => hcsocli}/main.go | 8 +- pkg/apis/compute/cloudaccount_const.go | 10 +- pkg/apis/compute/guest_const.go | 10 +- pkg/apis/compute/host_const.go | 4 +- pkg/apis/compute/network_const.go | 2 +- pkg/cloudevent/models/cloudproviders.go | 6 +- pkg/cloudid/models/cloudaccount.go | 6 +- pkg/cloudid/models/huawei_driver.go | 2 +- pkg/cloudmon/collectors/cloudmoninit.go | 2 +- pkg/cloudmon/collectors/common/basemon.go | 6 +- .../collectors/common/multiCloudMonUtils.go | 2 +- .../collectors/huaweimon/huaweicloudreport.go | 2 +- .../collectors/huaweimon/hwservice.go | 6 +- pkg/cloudprovider/cloudprovider.go | 4 +- pkg/cloudprovider/endpoints.go | 6 +- pkg/compute/guestdrivers/huaweistack.go | 58 ++++----- pkg/compute/hostdrivers/huawei_stack.go | 16 +-- pkg/compute/hostdrivers/managedvirtual.go | 2 +- pkg/compute/models/cloudaccounts.go | 24 ++-- pkg/compute/models/cloudproviders.go | 6 +- pkg/compute/models/disks.go | 4 +- pkg/compute/models/elasticips.go | 2 +- pkg/compute/models/loadbalancercachedacls.go | 6 +- .../models/loadbalancerlistenerrules.go | 4 +- pkg/compute/models/loadbalancerlisteners.go | 8 +- pkg/compute/models/loadbalancers.go | 4 +- pkg/compute/models/mount_targets.go | 2 +- pkg/compute/models/purge.go | 4 +- pkg/compute/models/secgroupcache.go | 2 +- pkg/compute/regiondrivers/huaweistack.go | 10 +- .../loadbalancer_listener_create_task.go | 2 +- .../loadbalancer_listener_rule_create_task.go | 2 +- pkg/mcclient/options/cloudaccounts.go | 18 +-- .../{huaweistack => hcso}/bucket.go | 2 +- .../client/auth/credential.go | 0 .../auth/credentials/access_key_credential.go | 0 .../client/auth/credentials/doc.go | 2 +- .../shell => hcso/client/auth}/doc.go | 2 +- .../client/auth/signer.go | 6 +- .../client/auth/signers/doc.go | 2 +- .../client/auth/signers/signer_access_key.go | 2 +- .../{huaweistack => hcso}/client/client.go | 14 +-- .../{huaweistack => hcso}/client/doc.go | 2 +- .../client/manager/doc.go | 2 +- .../client/manager/manager.go | 6 +- .../client/modules/doc.go | 2 +- .../client/modules/manager_base.go | 8 +- .../client/modules/manager_resource.go | 6 +- .../client/modules/mod_bandwidths.go | 2 +- .../client/modules/mod_ces.go | 4 +- .../client/modules/mod_credential.go | 2 +- .../client/modules/mod_dbinstance.go | 4 +- .../client/modules/mod_dbinstance_backup.go | 2 +- .../modules/mod_dbinstance_datastore.go | 2 +- .../client/modules/mod_dbinstance_flavor.go | 2 +- .../client/modules/mod_dbinstance_job.go | 2 +- .../client/modules/mod_dbinstance_storage.go | 2 +- .../client/modules/mod_disks.go | 4 +- .../client/modules/mod_dnat_rules.go | 2 +- .../client/modules/mod_domains.go | 2 +- .../client/modules/mod_eips.go | 2 +- .../client/modules/mod_elasticcache.go | 4 +- .../client/modules/mod_endpoints.go | 2 +- .../client/modules/mod_enterpriceprojects.go | 2 +- .../client/modules/mod_flavors.go | 2 +- .../client/modules/mod_groups.go | 4 +- .../client/modules/mod_images.go | 4 +- .../client/modules/mod_interface.go | 2 +- .../client/modules/mod_jobs.go | 4 +- .../client/modules/mod_keypairs.go | 2 +- .../modules/mod_loadbalancer_backend.go | 2 +- .../modules/mod_loadbalancer_backend_group.go | 2 +- .../modules/mod_loadbalancer_certificates.go | 2 +- .../modules/mod_loadbalancer_healthcheck.go | 2 +- .../modules/mod_loadbalancer_listeners.go | 2 +- .../modules/mod_loadbalancer_policies.go | 2 +- .../client/modules/mod_loadbalancer_rules.go | 2 +- .../modules/mod_loadbalancer_whitelists.go | 2 +- .../client/modules/mod_loadbalancers.go | 2 +- .../client/modules/mod_mapping.go | 2 +- .../client/modules/mod_natgateway.go | 4 +- .../client/modules/mod_port.go | 4 +- .../client/modules/mod_projects.go | 2 +- .../client/modules/mod_quotas.go | 2 +- .../client/modules/mod_regions.go | 2 +- .../client/modules/mod_roles.go | 2 +- .../client/modules/mod_saml_provider.go | 2 +- .../client/modules/mod_secgroup_rules.go | 2 +- .../client/modules/mod_secgroups.go | 2 +- .../client/modules/mod_servers.go | 4 +- .../client/modules/mod_services.go | 2 +- .../client/modules/mod_sfs.go | 4 +- .../client/modules/mod_snapshots.go | 4 +- .../client/modules/mod_snat_rules.go | 2 +- .../client/modules/mod_subnets.go | 2 +- .../client/modules/mod_traces.go | 2 +- .../client/modules/mod_users.go | 4 +- .../client/modules/mod_vpc_peerings.go | 2 +- .../client/modules/mod_vpc_routes.go | 2 +- .../client/modules/mod_vpcs.go | 2 +- .../client/modules/mod_zones.go | 2 +- .../client/requests/doc.go | 2 +- .../client/requests/requests.go | 0 .../client/responses/doc.go | 2 +- .../client/responses/responses.go | 0 .../client/responses/responses_test.go | 0 .../{huaweistack => hcso}/cloudgroup.go | 2 +- .../{huaweistack => hcso}/clouduser.go | 4 +- .../{huaweistack => hcso}/consts.go | 2 +- .../{huaweistack => hcso}/dbinstance.go | 2 +- .../dbinstance_account.go | 2 +- .../dbinstance_backup.go | 2 +- .../dbinstance_database.go | 2 +- .../dbinstance_parameter.go | 2 +- .../dbinstance_privilege.go | 2 +- .../{huaweistack => hcso}/dbinstance_skus.go | 2 +- pkg/multicloud/{huaweistack => hcso}/disk.go | 2 +- .../{huaweistack => hcso}/disktype.go | 2 +- .../{huaweistack/client/auth => hcso}/doc.go | 2 +- .../{huaweistack => hcso}/domain.go | 2 +- pkg/multicloud/{huaweistack => hcso}/eip.go | 2 +- .../elasticcache_account.go | 2 +- .../{huaweistack => hcso}/elasticcache_acl.go | 2 +- .../elasticcache_backup.go | 2 +- .../elasticcache_instance.go | 2 +- .../elasticcache_parameter.go | 2 +- .../enterpriceprojects.go | 2 +- pkg/multicloud/{huaweistack => hcso}/host.go | 4 +- .../{huaweistack => hcso}/huawei.go | 18 +-- pkg/multicloud/{huaweistack => hcso}/image.go | 2 +- .../{huaweistack => hcso}/instance.go | 6 +- .../{huaweistack => hcso}/instancenic.go | 4 +- .../{huaweistack => hcso}/instancetype.go | 2 +- .../{huaweistack => hcso}/keypair.go | 2 +- .../latitud_and_longitude.go | 2 +- .../{huaweistack => hcso}/loadbalancer.go | 2 +- .../{huaweistack => hcso}/loadbalancer_acl.go | 2 +- .../loadbalancer_backend.go | 2 +- .../loadbalancer_backendgroup.go | 2 +- .../loadbalancer_cert.go | 2 +- .../loadbalancer_healthcheck.go | 2 +- .../loadbalancer_listener.go | 2 +- .../loadbalancer_listener_rule.go | 2 +- .../{huaweistack => hcso}/monitor.go | 2 +- .../{huaweistack => hcso}/nat_skus.go | 2 +- .../{huaweistack => hcso}/natdtable.go | 2 +- .../{huaweistack => hcso}/natgateway.go | 2 +- .../{huaweistack => hcso}/natstable.go | 2 +- .../{huaweistack => hcso}/network.go | 4 +- .../{huaweistack => hcso}/object.go | 2 +- pkg/multicloud/{huaweistack => hcso}/order.go | 2 +- pkg/multicloud/{huaweistack => hcso}/port.go | 2 +- .../{huaweistack => hcso}/project.go | 2 +- .../{huaweistack => hcso}/provider/doc.go | 2 +- .../provider/provider.go | 114 +++++++++--------- pkg/multicloud/{huaweistack => hcso}/quota.go | 2 +- .../{huaweistack => hcso}/region.go | 6 +- pkg/multicloud/{huaweistack => hcso}/roles.go | 2 +- .../{huaweistack => hcso}/routetable.go | 2 +- .../{huaweistack => hcso}/saml_provider.go | 4 +- .../{huaweistack => hcso}/securitygroup.go | 2 +- .../{huaweistack => hcso}/sfs-turbo.go | 2 +- .../{huaweistack => hcso}/shell/bucket.go | 2 +- .../{huaweistack => hcso}/shell/cloudgroup.go | 2 +- .../{huaweistack => hcso}/shell/clouduser.go | 2 +- .../{huaweistack => hcso}/shell/dbinstance.go | 2 +- .../shell/dbinstance_account.go | 2 +- .../shell/dbinstance_database.go | 2 +- .../shell/dbinstance_skus.go | 2 +- .../{huaweistack => hcso}/shell/disk.go | 2 +- pkg/multicloud/hcso/shell/doc.go | 15 +++ .../{huaweistack => hcso}/shell/eip.go | 2 +- .../shell/elasticcache.go | 2 +- .../{huaweistack => hcso}/shell/endpoints.go | 2 +- .../shell/enterpriseprojects.go | 2 +- .../{huaweistack => hcso}/shell/events.go | 2 +- .../{huaweistack => hcso}/shell/filesystem.go | 2 +- .../{huaweistack => hcso}/shell/hosts.go | 2 +- .../{huaweistack => hcso}/shell/iam.go | 2 +- .../{huaweistack => hcso}/shell/image.go | 2 +- .../{huaweistack => hcso}/shell/instance.go | 2 +- .../shell/instancetype.go | 2 +- .../{huaweistack => hcso}/shell/keypair.go | 2 +- .../shell/loadbalancer.go | 2 +- .../{huaweistack => hcso}/shell/monitor.go | 2 +- .../{huaweistack => hcso}/shell/natdtable.go | 2 +- .../{huaweistack => hcso}/shell/natgateway.go | 2 +- .../{huaweistack => hcso}/shell/natstable.go | 2 +- .../{huaweistack => hcso}/shell/network.go | 2 +- .../{huaweistack => hcso}/shell/obs.go | 2 +- .../{huaweistack => hcso}/shell/port.go | 2 +- .../{huaweistack => hcso}/shell/printutils.go | 0 .../{huaweistack => hcso}/shell/quota.go | 2 +- .../{huaweistack => hcso}/shell/region.go | 2 +- .../{huaweistack => hcso}/shell/role.go | 8 +- .../{huaweistack => hcso}/shell/routetable.go | 2 +- .../shell/saml_provider.go | 2 +- .../{huaweistack => hcso}/shell/secgroup.go | 2 +- .../{huaweistack => hcso}/shell/service.go | 2 +- .../{huaweistack => hcso}/shell/skus.go | 2 +- .../{huaweistack => hcso}/shell/snapshot.go | 2 +- .../{huaweistack => hcso}/shell/vpc.go | 2 +- .../{huaweistack => hcso}/shell/zone.go | 2 +- .../{huaweistack => hcso}/snapshot.go | 2 +- .../{huaweistack => hcso}/storage.go | 2 +- .../{huaweistack => hcso}/storagecache.go | 2 +- pkg/multicloud/{huaweistack => hcso}/task.go | 2 +- .../{huaweistack => hcso}/traces.go | 2 +- pkg/multicloud/{huaweistack => hcso}/utils.go | 6 +- pkg/multicloud/{huaweistack => hcso}/vpc.go | 2 +- .../{huaweistack => hcso}/vpc_peering.go | 2 +- pkg/multicloud/{huaweistack => hcso}/wire.go | 6 +- pkg/multicloud/{huaweistack => hcso}/zone.go | 2 +- pkg/multicloud/huaweistack/doc.go | 15 --- pkg/multicloud/loader/loader.go | 2 +- 216 files changed, 425 insertions(+), 425 deletions(-) rename cmd/{huaweistackcli => hcsocli}/main.go (94%) rename pkg/multicloud/{huaweistack => hcso}/bucket.go (99%) rename pkg/multicloud/{huaweistack => hcso}/client/auth/credential.go (100%) rename pkg/multicloud/{huaweistack => hcso}/client/auth/credentials/access_key_credential.go (100%) rename pkg/multicloud/{huaweistack => hcso}/client/auth/credentials/doc.go (94%) rename pkg/multicloud/{huaweistack/shell => hcso/client/auth}/doc.go (87%) rename pkg/multicloud/{huaweistack => hcso}/client/auth/signer.go (96%) rename pkg/multicloud/{huaweistack => hcso}/client/auth/signers/doc.go (95%) rename pkg/multicloud/{huaweistack => hcso}/client/auth/signers/signer_access_key.go (95%) rename pkg/multicloud/{huaweistack => hcso}/client/client.go (95%) rename pkg/multicloud/{huaweistack => hcso}/client/doc.go (87%) rename pkg/multicloud/{huaweistack => hcso}/client/manager/doc.go (96%) rename pkg/multicloud/{huaweistack => hcso}/client/manager/manager.go (95%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/doc.go (96%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/manager_base.go (96%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/manager_resource.go (98%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_bandwidths.go (94%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_ces.go (96%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_credential.go (94%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_dbinstance.go (96%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_dbinstance_backup.go (94%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_dbinstance_datastore.go (94%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_dbinstance_flavor.go (94%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_dbinstance_job.go (95%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_dbinstance_storage.go (94%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_disks.go (94%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_dnat_rules.go (94%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_domains.go (94%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_eips.go (95%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_elasticcache.go (96%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_endpoints.go (94%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_enterpriceprojects.go (94%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_flavors.go (94%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_groups.go (96%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_images.go (95%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_interface.go (94%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_jobs.go (93%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_keypairs.go (94%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_loadbalancer_backend.go (96%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_loadbalancer_backend_group.go (94%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_loadbalancer_certificates.go (94%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_loadbalancer_healthcheck.go (95%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_loadbalancer_listeners.go (94%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_loadbalancer_policies.go (94%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_loadbalancer_rules.go (96%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_loadbalancer_whitelists.go (94%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_loadbalancers.go (94%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_mapping.go (94%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_natgateway.go (90%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_port.go (92%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_projects.go (94%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_quotas.go (94%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_regions.go (94%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_roles.go (94%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_saml_provider.go (94%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_secgroup_rules.go (94%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_secgroups.go (95%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_servers.go (96%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_services.go (94%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_sfs.go (91%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_snapshots.go (93%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_snat_rules.go (94%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_subnets.go (94%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_traces.go (94%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_users.go (93%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_vpc_peerings.go (94%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_vpc_routes.go (94%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_vpcs.go (93%) rename pkg/multicloud/{huaweistack => hcso}/client/modules/mod_zones.go (94%) rename pkg/multicloud/{huaweistack => hcso}/client/requests/doc.go (95%) rename pkg/multicloud/{huaweistack => hcso}/client/requests/requests.go (100%) rename pkg/multicloud/{huaweistack => hcso}/client/responses/doc.go (95%) rename pkg/multicloud/{huaweistack => hcso}/client/responses/responses.go (100%) rename pkg/multicloud/{huaweistack => hcso}/client/responses/responses_test.go (100%) rename pkg/multicloud/{huaweistack => hcso}/cloudgroup.go (99%) rename pkg/multicloud/{huaweistack => hcso}/clouduser.go (98%) rename pkg/multicloud/{huaweistack => hcso}/consts.go (99%) rename pkg/multicloud/{huaweistack => hcso}/dbinstance.go (99%) rename pkg/multicloud/{huaweistack => hcso}/dbinstance_account.go (99%) rename pkg/multicloud/{huaweistack => hcso}/dbinstance_backup.go (99%) rename pkg/multicloud/{huaweistack => hcso}/dbinstance_database.go (99%) rename pkg/multicloud/{huaweistack => hcso}/dbinstance_parameter.go (98%) rename pkg/multicloud/{huaweistack => hcso}/dbinstance_privilege.go (98%) rename pkg/multicloud/{huaweistack => hcso}/dbinstance_skus.go (99%) rename pkg/multicloud/{huaweistack => hcso}/disk.go (99%) rename pkg/multicloud/{huaweistack => hcso}/disktype.go (98%) rename pkg/multicloud/{huaweistack/client/auth => hcso}/doc.go (87%) rename pkg/multicloud/{huaweistack => hcso}/domain.go (98%) rename pkg/multicloud/{huaweistack => hcso}/eip.go (99%) rename pkg/multicloud/{huaweistack => hcso}/elasticcache_account.go (99%) rename pkg/multicloud/{huaweistack => hcso}/elasticcache_acl.go (96%) rename pkg/multicloud/{huaweistack => hcso}/elasticcache_backup.go (99%) rename pkg/multicloud/{huaweistack => hcso}/elasticcache_instance.go (99%) rename pkg/multicloud/{huaweistack => hcso}/elasticcache_parameter.go (99%) rename pkg/multicloud/{huaweistack => hcso}/enterpriceprojects.go (99%) rename pkg/multicloud/{huaweistack => hcso}/host.go (99%) rename pkg/multicloud/{huaweistack => hcso}/huawei.go (96%) rename pkg/multicloud/{huaweistack => hcso}/image.go (99%) rename pkg/multicloud/{huaweistack => hcso}/instance.go (99%) rename pkg/multicloud/{huaweistack => hcso}/instancenic.go (97%) rename pkg/multicloud/{huaweistack => hcso}/instancetype.go (99%) rename pkg/multicloud/{huaweistack => hcso}/keypair.go (99%) rename pkg/multicloud/{huaweistack => hcso}/latitud_and_longitude.go (99%) rename pkg/multicloud/{huaweistack => hcso}/loadbalancer.go (99%) rename pkg/multicloud/{huaweistack => hcso}/loadbalancer_acl.go (99%) rename pkg/multicloud/{huaweistack => hcso}/loadbalancer_backend.go (99%) rename pkg/multicloud/{huaweistack => hcso}/loadbalancer_backendgroup.go (99%) rename pkg/multicloud/{huaweistack => hcso}/loadbalancer_cert.go (99%) rename pkg/multicloud/{huaweistack => hcso}/loadbalancer_healthcheck.go (98%) rename pkg/multicloud/{huaweistack => hcso}/loadbalancer_listener.go (99%) rename pkg/multicloud/{huaweistack => hcso}/loadbalancer_listener_rule.go (99%) rename pkg/multicloud/{huaweistack => hcso}/monitor.go (97%) rename pkg/multicloud/{huaweistack => hcso}/nat_skus.go (99%) rename pkg/multicloud/{huaweistack => hcso}/natdtable.go (99%) rename pkg/multicloud/{huaweistack => hcso}/natgateway.go (99%) rename pkg/multicloud/{huaweistack => hcso}/natstable.go (99%) rename pkg/multicloud/{huaweistack => hcso}/network.go (98%) rename pkg/multicloud/{huaweistack => hcso}/object.go (99%) rename pkg/multicloud/{huaweistack => hcso}/order.go (99%) rename pkg/multicloud/{huaweistack => hcso}/port.go (99%) rename pkg/multicloud/{huaweistack => hcso}/project.go (99%) rename pkg/multicloud/{huaweistack => hcso}/provider/doc.go (96%) rename pkg/multicloud/{huaweistack => hcso}/provider/provider.go (50%) rename pkg/multicloud/{huaweistack => hcso}/quota.go (98%) rename pkg/multicloud/{huaweistack => hcso}/region.go (99%) rename pkg/multicloud/{huaweistack => hcso}/roles.go (99%) rename pkg/multicloud/{huaweistack => hcso}/routetable.go (99%) rename pkg/multicloud/{huaweistack => hcso}/saml_provider.go (99%) rename pkg/multicloud/{huaweistack => hcso}/securitygroup.go (99%) rename pkg/multicloud/{huaweistack => hcso}/sfs-turbo.go (99%) rename pkg/multicloud/{huaweistack => hcso}/shell/bucket.go (95%) rename pkg/multicloud/{huaweistack => hcso}/shell/cloudgroup.go (98%) rename pkg/multicloud/{huaweistack => hcso}/shell/clouduser.go (97%) rename pkg/multicloud/{huaweistack => hcso}/shell/dbinstance.go (98%) rename pkg/multicloud/{huaweistack => hcso}/shell/dbinstance_account.go (97%) rename pkg/multicloud/{huaweistack => hcso}/shell/dbinstance_database.go (96%) rename pkg/multicloud/{huaweistack => hcso}/shell/dbinstance_skus.go (96%) rename pkg/multicloud/{huaweistack => hcso}/shell/disk.go (96%) create mode 100644 pkg/multicloud/hcso/shell/doc.go rename pkg/multicloud/{huaweistack => hcso}/shell/eip.go (97%) rename pkg/multicloud/{huaweistack => hcso}/shell/elasticcache.go (97%) rename pkg/multicloud/{huaweistack => hcso}/shell/endpoints.go (94%) rename pkg/multicloud/{huaweistack => hcso}/shell/enterpriseprojects.go (96%) rename pkg/multicloud/{huaweistack => hcso}/shell/events.go (94%) rename pkg/multicloud/{huaweistack => hcso}/shell/filesystem.go (96%) rename pkg/multicloud/{huaweistack => hcso}/shell/hosts.go (94%) rename pkg/multicloud/{huaweistack => hcso}/shell/iam.go (94%) rename pkg/multicloud/{huaweistack => hcso}/shell/image.go (97%) rename pkg/multicloud/{huaweistack => hcso}/shell/instance.go (99%) rename pkg/multicloud/{huaweistack => hcso}/shell/instancetype.go (95%) rename pkg/multicloud/{huaweistack => hcso}/shell/keypair.go (96%) rename pkg/multicloud/{huaweistack => hcso}/shell/loadbalancer.go (99%) rename pkg/multicloud/{huaweistack => hcso}/shell/monitor.go (96%) rename pkg/multicloud/{huaweistack => hcso}/shell/natdtable.go (94%) rename pkg/multicloud/{huaweistack => hcso}/shell/natgateway.go (98%) rename pkg/multicloud/{huaweistack => hcso}/shell/natstable.go (94%) rename pkg/multicloud/{huaweistack => hcso}/shell/network.go (94%) rename pkg/multicloud/{huaweistack => hcso}/shell/obs.go (97%) rename pkg/multicloud/{huaweistack => hcso}/shell/port.go (94%) rename pkg/multicloud/{huaweistack => hcso}/shell/printutils.go (100%) rename pkg/multicloud/{huaweistack => hcso}/shell/quota.go (94%) rename pkg/multicloud/{huaweistack => hcso}/shell/region.go (97%) rename pkg/multicloud/{huaweistack => hcso}/shell/role.go (89%) rename pkg/multicloud/{huaweistack => hcso}/shell/routetable.go (94%) rename pkg/multicloud/{huaweistack => hcso}/shell/saml_provider.go (98%) rename pkg/multicloud/{huaweistack => hcso}/shell/secgroup.go (98%) rename pkg/multicloud/{huaweistack => hcso}/shell/service.go (94%) rename pkg/multicloud/{huaweistack => hcso}/shell/skus.go (94%) rename pkg/multicloud/{huaweistack => hcso}/shell/snapshot.go (96%) rename pkg/multicloud/{huaweistack => hcso}/shell/vpc.go (98%) rename pkg/multicloud/{huaweistack => hcso}/shell/zone.go (94%) rename pkg/multicloud/{huaweistack => hcso}/snapshot.go (99%) rename pkg/multicloud/{huaweistack => hcso}/storage.go (99%) rename pkg/multicloud/{huaweistack => hcso}/storagecache.go (99%) rename pkg/multicloud/{huaweistack => hcso}/task.go (99%) rename pkg/multicloud/{huaweistack => hcso}/traces.go (99%) rename pkg/multicloud/{huaweistack => hcso}/utils.go (98%) rename pkg/multicloud/{huaweistack => hcso}/vpc.go (99%) rename pkg/multicloud/{huaweistack => hcso}/vpc_peering.go (99%) rename pkg/multicloud/{huaweistack => hcso}/wire.go (96%) rename pkg/multicloud/{huaweistack => hcso}/zone.go (99%) delete mode 100644 pkg/multicloud/huaweistack/doc.go diff --git a/cmd/climc/shell/compute/cloudaccounts.go b/cmd/climc/shell/compute/cloudaccounts.go index d90de16a6c..6ccaba3799 100644 --- a/cmd/climc/shell/compute/cloudaccounts.go +++ b/cmd/climc/shell/compute/cloudaccounts.go @@ -37,7 +37,7 @@ func init() { cmd.CreateWithKeyword("create-aws", &options.SAWSCloudAccountCreateOptions{}) cmd.CreateWithKeyword("create-openstack", &options.SOpenStackCloudAccountCreateOptions{}) cmd.CreateWithKeyword("create-huawei", &options.SHuaweiCloudAccountCreateOptions{}) - cmd.CreateWithKeyword("create-huaweicloudstack", &options.SHuaweiCloudStackAccountCreateOptions{}) + cmd.CreateWithKeyword("create-hcso", &options.SHCSOAccountCreateOptions{}) cmd.CreateWithKeyword("create-ucloud", &options.SUcloudCloudAccountCreateOptions{}) cmd.CreateWithKeyword("create-zstack", &options.SZStackCloudAccountCreateOptions{}) cmd.CreateWithKeyword("create-s3", &options.SS3CloudAccountCreateOptions{}) @@ -57,7 +57,7 @@ func init() { cmd.UpdateWithKeyword("update-aws", &options.SAWSCloudAccountUpdateOptions{}) cmd.UpdateWithKeyword("update-openstack", &options.SOpenStackCloudAccountUpdateOptions{}) cmd.UpdateWithKeyword("update-huawei", &options.SHuaweiCloudAccountUpdateOptions{}) - cmd.UpdateWithKeyword("update-huaweicloudstack", &options.SHuaweiCloudStackAccountUpdateOptions{}) + cmd.UpdateWithKeyword("update-hcso", &options.SHCSOAccountUpdateOptions{}) cmd.UpdateWithKeyword("update-ucloud", &options.SUcloudCloudAccountUpdateOptions{}) cmd.UpdateWithKeyword("update-zstack", &options.SZStackCloudAccountUpdateOptions{}) cmd.UpdateWithKeyword("update-s3", &options.SS3CloudAccountUpdateOptions{}) @@ -75,7 +75,7 @@ func init() { cmd.PerformWithKeyword("update-credential-aws", "update-credential", &options.SAWSCloudAccountUpdateCredentialOptions{}) cmd.PerformWithKeyword("update-credential-openstack", "update-credential", &options.SOpenStackCloudAccountUpdateCredentialOptions{}) cmd.PerformWithKeyword("update-credential-huawei", "update-credential", &options.SHuaweiCloudAccountUpdateCredentialOptions{}) - cmd.PerformWithKeyword("update-credential-huaweicloudstack", "update-credential", &options.SHuaweiCloudStackAccountUpdateCredentialOptions{}) + cmd.PerformWithKeyword("update-credential-hcso", "update-credential", &options.SHCSOAccountUpdateCredentialOptions{}) cmd.PerformWithKeyword("update-credential-ucloud", "update-credential", &options.SUcloudCloudAccountUpdateCredentialOptions{}) cmd.PerformWithKeyword("update-credential-zstack", "update-credential", &options.SZStackCloudAccountUpdateCredentialOptions{}) cmd.PerformWithKeyword("update-credential-s3", "update-credential", &options.SS3CloudAccountUpdateCredentialOptions{}) diff --git a/cmd/huaweistackcli/main.go b/cmd/hcsocli/main.go similarity index 94% rename from cmd/huaweistackcli/main.go rename to cmd/hcsocli/main.go index 1533bebf75..1327d3e459 100644 --- a/cmd/huaweistackcli/main.go +++ b/cmd/hcsocli/main.go @@ -21,13 +21,13 @@ import ( "yunion.io/x/structarg" "yunion.io/x/onecloud/pkg/cloudprovider" - huawei "yunion.io/x/onecloud/pkg/multicloud/huaweistack" - _ "yunion.io/x/onecloud/pkg/multicloud/huaweistack/shell" + huawei "yunion.io/x/onecloud/pkg/multicloud/hcso" + _ "yunion.io/x/onecloud/pkg/multicloud/hcso/shell" "yunion.io/x/onecloud/pkg/util/shellutils" ) type BaseOptions struct { - cloudprovider.SHuaweiCloudStackEndpoints + cloudprovider.SHCSOEndpoints Help bool `help:"Show help" default:"false"` Debug bool `help:"Show debug" default:"false"` AccessKey string `help:"Access key" default:"$HUAWEI_ACCESS_KEY" metavar:"HUAWEI_ACCESS_KEY"` @@ -92,7 +92,7 @@ func newClient(options *BaseOptions) (*huawei.SRegion, error) { options.AccessKey, options.Secret, options.ProjectId, - &options.SHuaweiCloudStackEndpoints, + &options.SHCSOEndpoints, ).Debug(options.Debug), ) if err != nil { diff --git a/pkg/apis/compute/cloudaccount_const.go b/pkg/apis/compute/cloudaccount_const.go index dc3a70c81c..00bbf2503d 100644 --- a/pkg/apis/compute/cloudaccount_const.go +++ b/pkg/apis/compute/cloudaccount_const.go @@ -44,7 +44,7 @@ const ( CLOUD_PROVIDER_AZURE = "Azure" CLOUD_PROVIDER_AWS = "Aws" CLOUD_PROVIDER_HUAWEI = "Huawei" - CLOUD_PROVIDER_HUAWEI_CLOUD_STACK = "HuaweiCloudStack" + CLOUD_PROVIDER_HCSO = "HCSO" CLOUD_PROVIDER_OPENSTACK = "OpenStack" CLOUD_PROVIDER_UCLOUD = "Ucloud" CLOUD_PROVIDER_ZSTACK = "ZStack" @@ -98,7 +98,7 @@ const ( var ( CLOUD_PROVIDER_VALID_STATUS = []string{CLOUD_PROVIDER_CONNECTED} CLOUD_PROVIDER_VALID_HEALTH_STATUS = []string{CLOUD_PROVIDER_HEALTH_NORMAL, CLOUD_PROVIDER_HEALTH_NO_PERMISSION} - PRIVATE_CLOUD_PROVIDERS = []string{CLOUD_PROVIDER_ZSTACK, CLOUD_PROVIDER_OPENSTACK, CLOUD_PROVIDER_APSARA, CLOUD_PROVIDER_HUAWEI_CLOUD_STACK} + PRIVATE_CLOUD_PROVIDERS = []string{CLOUD_PROVIDER_ZSTACK, CLOUD_PROVIDER_OPENSTACK, CLOUD_PROVIDER_APSARA, CLOUD_PROVIDER_HCSO} CLOUD_PROVIDERS = []string{ CLOUD_PROVIDER_ONECLOUD, @@ -109,7 +109,7 @@ var ( CLOUD_PROVIDER_AZURE, CLOUD_PROVIDER_AWS, CLOUD_PROVIDER_HUAWEI, - CLOUD_PROVIDER_HUAWEI_CLOUD_STACK, + CLOUD_PROVIDER_HCSO, CLOUD_PROVIDER_OPENSTACK, CLOUD_PROVIDER_UCLOUD, CLOUD_PROVIDER_ZSTACK, @@ -147,8 +147,8 @@ var ( CLOUD_PROVIDER_HUAWEI: []string{ HOST_TYPE_HUAWEI, }, - CLOUD_PROVIDER_HUAWEI_CLOUD_STACK: { - HOST_TYPE_HUAWEI_CLOUD_STACK, + CLOUD_PROVIDER_HCSO: { + HOST_TYPE_HCSO, }, CLOUD_PROVIDER_OPENSTACK: []string{ HOST_TYPE_OPENSTACK, diff --git a/pkg/apis/compute/guest_const.go b/pkg/apis/compute/guest_const.go index 7f5437d375..6d5080bfff 100644 --- a/pkg/apis/compute/guest_const.go +++ b/pkg/apis/compute/guest_const.go @@ -159,7 +159,7 @@ const ( HYPERVISOR_AZURE = "azure" HYPERVISOR_AWS = "aws" HYPERVISOR_HUAWEI = "huawei" - HYPERVISOR_HUAWEI_CLOUD_STACK = "huaweicloudstack" + HYPERVISOR_HCSO = "hcso" HYPERVISOR_OPENSTACK = "openstack" HYPERVISOR_UCLOUD = "ucloud" HYPERVISOR_ZSTACK = "zstack" @@ -192,7 +192,7 @@ var HYPERVISORS = []string{ HYPERVISOR_AWS, HYPERVISOR_QCLOUD, HYPERVISOR_HUAWEI, - HYPERVISOR_HUAWEI_CLOUD_STACK, + HYPERVISOR_HCSO, HYPERVISOR_OPENSTACK, HYPERVISOR_UCLOUD, HYPERVISOR_ZSTACK, @@ -227,7 +227,7 @@ var PRIVATE_CLOUD_HYPERVISORS = []string{ HYPERVISOR_OPENSTACK, HYPERVISOR_APSARA, HYPERVISOR_CLOUDPODS, - HYPERVISOR_HUAWEI_CLOUD_STACK, + HYPERVISOR_HCSO, } // var HYPERVISORS = []string{HYPERVISOR_ALIYUN} @@ -243,7 +243,7 @@ var HYPERVISOR_HOSTTYPE = map[string]string{ 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_HCSO: HOST_TYPE_HCSO, HYPERVISOR_OPENSTACK: HOST_TYPE_OPENSTACK, HYPERVISOR_UCLOUD: HOST_TYPE_UCLOUD, HYPERVISOR_ZSTACK: HOST_TYPE_ZSTACK, @@ -265,7 +265,7 @@ var HOSTTYPE_HYPERVISOR = map[string]string{ 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_HCSO: HYPERVISOR_HCSO, HOST_TYPE_OPENSTACK: HYPERVISOR_OPENSTACK, HOST_TYPE_UCLOUD: HYPERVISOR_UCLOUD, HOST_TYPE_ZSTACK: HYPERVISOR_ZSTACK, diff --git a/pkg/apis/compute/host_const.go b/pkg/apis/compute/host_const.go index 157c9c9038..604610c2e8 100644 --- a/pkg/apis/compute/host_const.go +++ b/pkg/apis/compute/host_const.go @@ -29,7 +29,7 @@ const ( HOST_TYPE_QCLOUD = "qcloud" HOST_TYPE_AZURE = "azure" HOST_TYPE_HUAWEI = "huawei" - HOST_TYPE_HUAWEI_CLOUD_STACK = "huaweicloudstack" + HOST_TYPE_HCSO = "hcso" HOST_TYPE_OPENSTACK = "openstack" HOST_TYPE_UCLOUD = "ucloud" HOST_TYPE_ZSTACK = "zstack" @@ -112,7 +112,7 @@ var HOST_TYPES = []string{ HOST_TYPE_AWS, HOST_TYPE_QCLOUD, HOST_TYPE_HUAWEI, - HOST_TYPE_HUAWEI_CLOUD_STACK, + HOST_TYPE_HCSO, HOST_TYPE_OPENSTACK, HOST_TYPE_UCLOUD, HOST_TYPE_ZSTACK, diff --git a/pkg/apis/compute/network_const.go b/pkg/apis/compute/network_const.go index 130ee06a61..6145f77984 100644 --- a/pkg/apis/compute/network_const.go +++ b/pkg/apis/compute/network_const.go @@ -59,7 +59,7 @@ var ( REGIONAL_NETWORK_PROVIDERS = []string{ CLOUD_PROVIDER_HUAWEI, - CLOUD_PROVIDER_HUAWEI_CLOUD_STACK, + CLOUD_PROVIDER_HCSO, CLOUD_PROVIDER_CTYUN, CLOUD_PROVIDER_UCLOUD, CLOUD_PROVIDER_GOOGLE, diff --git a/pkg/cloudevent/models/cloudproviders.go b/pkg/cloudevent/models/cloudproviders.go index 18245a80d5..abda47507c 100644 --- a/pkg/cloudevent/models/cloudproviders.go +++ b/pkg/cloudevent/models/cloudproviders.go @@ -320,7 +320,7 @@ type SCloudproviderDelegate struct { Options struct { cloudprovider.SApsaraEndpoints - cloudprovider.SHuaweiCloudStackEndpoints + cloudprovider.SHCSOEndpoints } ProxySetting proxyapi.SProxySetting @@ -337,7 +337,7 @@ func (self *SCloudprovider) GetDelegate() (*SCloudproviderDelegate, error) { if err != nil { return nil, errors.Wrap(err, "result.Unmarshal") } - if provider.Provider == api.CLOUD_PROVIDER_APSARA || provider.Provider == api.CLOUD_PROVIDER_HUAWEI_CLOUD_STACK { + if provider.Provider == api.CLOUD_PROVIDER_APSARA || provider.Provider == api.CLOUD_PROVIDER_HCSO { result, err := modules.Cloudaccounts.Get(s, provider.CloudaccountId, nil) if err != nil { return nil, errors.Wrapf(err, "modules.Cloudaccounts.Get") @@ -408,7 +408,7 @@ func (self *SCloudprovider) GetProvider() (cloudprovider.ICloudProvider, error) ProxyFunc: proxyFunc, - SHuaweiCloudStackEndpoints: delegate.Options.SHuaweiCloudStackEndpoints, + SHCSOEndpoints: delegate.Options.SHCSOEndpoints, SApsaraEndpoints: delegate.Options.SApsaraEndpoints, }, ) diff --git a/pkg/cloudid/models/cloudaccount.go b/pkg/cloudid/models/cloudaccount.go index 9fbd3b61c5..65abe56d00 100644 --- a/pkg/cloudid/models/cloudaccount.go +++ b/pkg/cloudid/models/cloudaccount.go @@ -355,7 +355,7 @@ func (manager *SCloudaccountManager) newFromICloudaccount(ctx context.Context, u } func (self *SCloudaccount) registerHuaweSaml(ctx context.Context) error { - if self.Provider != computeapi.CLOUD_PROVIDER_HUAWEI_CLOUD_STACK { + if self.Provider != computeapi.CLOUD_PROVIDER_HCSO { return nil } delegate, err := self.getCloudDelegate(ctx) @@ -482,7 +482,7 @@ type SCloudDelegate struct { Brand string Options struct { - cloudprovider.SHuaweiCloudStackEndpoints + cloudprovider.SHCSOEndpoints cloudprovider.SApsaraEndpoints } ProxySetting proxyapi.SProxySetting @@ -569,7 +569,7 @@ func (account *SCloudDelegate) GetProvider() (cloudprovider.ICloudProvider, erro ProxyFunc: proxyFunc, SApsaraEndpoints: account.Options.SApsaraEndpoints, - SHuaweiCloudStackEndpoints: account.Options.SHuaweiCloudStackEndpoints, + SHCSOEndpoints: account.Options.SHCSOEndpoints, AccountId: account.Id, }) diff --git a/pkg/cloudid/models/huawei_driver.go b/pkg/cloudid/models/huawei_driver.go index 181347e5b0..d203064d76 100644 --- a/pkg/cloudid/models/huawei_driver.go +++ b/pkg/cloudid/models/huawei_driver.go @@ -45,7 +45,7 @@ func (d *SHuaweiSAMLDriver) GetSpInitiatedLoginData(ctx context.Context, userCre return data, httperrors.NewGeneralError(err) } account := _account.(*SCloudaccount) - if account.Provider != api.CLOUD_PROVIDER_HUAWEI && account.Provider != api.CLOUD_PROVIDER_HUAWEI_CLOUD_STACK { + if account.Provider != api.CLOUD_PROVIDER_HUAWEI && account.Provider != api.CLOUD_PROVIDER_HCSO { return data, httperrors.NewClientError("cloudaccount %s is %s not %s", account.Id, account.Provider, api.CLOUD_PROVIDER_HUAWEI) } if account.SAMLAuth.IsFalse() { diff --git a/pkg/cloudmon/collectors/cloudmoninit.go b/pkg/cloudmon/collectors/cloudmoninit.go index 344d94a869..4b005a0cbb 100644 --- a/pkg/cloudmon/collectors/cloudmoninit.go +++ b/pkg/cloudmon/collectors/cloudmoninit.go @@ -35,7 +35,7 @@ import ( _ "yunion.io/x/onecloud/pkg/multicloud/esxi/provider" _ "yunion.io/x/onecloud/pkg/multicloud/google/provider" _ "yunion.io/x/onecloud/pkg/multicloud/huawei/provider" - _ "yunion.io/x/onecloud/pkg/multicloud/huaweistack/provider" + _ "yunion.io/x/onecloud/pkg/multicloud/hcso/provider" _ "yunion.io/x/onecloud/pkg/multicloud/jdcloud/provider" _ "yunion.io/x/onecloud/pkg/multicloud/qcloud/provider" _ "yunion.io/x/onecloud/pkg/multicloud/zstack/provider" diff --git a/pkg/cloudmon/collectors/common/basemon.go b/pkg/cloudmon/collectors/common/basemon.go index 5fcceb3da6..069ab0ec5c 100644 --- a/pkg/cloudmon/collectors/common/basemon.go +++ b/pkg/cloudmon/collectors/common/basemon.go @@ -124,7 +124,7 @@ func (self *CloudReportBase) InitProviderInstance() (cloudprovider.ICloudProvide return nil, errors.Wrap(err, "getCloudAccount error") } endpoints := cloudprovider.SApsaraEndpoints{} - hwendpoints := cloudprovider.SHuaweiCloudStackEndpoints{} + hwendpoints := cloudprovider.SHCSOEndpoints{} options, err := cloudAccout.Get("options") if err == nil { err := options.Unmarshal(&endpoints) @@ -133,7 +133,7 @@ func (self *CloudReportBase) InitProviderInstance() (cloudprovider.ICloudProvide } err = options.Unmarshal(&hwendpoints) if err != nil { - log.Errorf("Unmarshal SHuaweiCloudStackEndpoints err:%v", err) + log.Errorf("Unmarshal SHCSOEndpoints err:%v", err) } } else { log.Errorf("get cloudAccout options err:%v", err) @@ -147,7 +147,7 @@ func (self *CloudReportBase) InitProviderInstance() (cloudprovider.ICloudProvide Vendor: self.SProvider.Provider, ProxyFunc: proxyFunc, SApsaraEndpoints: endpoints, - SHuaweiCloudStackEndpoints: hwendpoints, + SHCSOEndpoints: hwendpoints, } return cloudprovider.GetProvider(cfg) } diff --git a/pkg/cloudmon/collectors/common/multiCloudMonUtils.go b/pkg/cloudmon/collectors/common/multiCloudMonUtils.go index 87e697ce25..888a785216 100644 --- a/pkg/cloudmon/collectors/common/multiCloudMonUtils.go +++ b/pkg/cloudmon/collectors/common/multiCloudMonUtils.go @@ -81,7 +81,7 @@ type ReportOptions struct { Timeout int64 `help:"command timeout unit:second" default:"10"` SinceTime string `help:"sinceTime"` EndTime string `help:"endTime"` - Provider []string `help:"List objects from the provider" choices:"VMware|Aliyun|Qcloud|Azure|Aws|Huawei|ZStack|Google|Apsara|JDcloud|Ecloud|HuaweiCloudStack" json:"provider,omitempty"` + Provider []string `help:"List objects from the provider" choices:"VMware|Aliyun|Qcloud|Azure|Aws|Huawei|ZStack|Google|Apsara|JDcloud|Ecloud|HCSO" json:"provider,omitempty"` PingProbeOptions } diff --git a/pkg/cloudmon/collectors/huaweimon/huaweicloudreport.go b/pkg/cloudmon/collectors/huaweimon/huaweicloudreport.go index b04d29da56..df2e0652f1 100644 --- a/pkg/cloudmon/collectors/huaweimon/huaweicloudreport.go +++ b/pkg/cloudmon/collectors/huaweimon/huaweicloudreport.go @@ -108,5 +108,5 @@ type SHwStackCloudReportFactory struct { } func (self *SHwStackCloudReportFactory) GetId() string { - return compute.CLOUD_PROVIDER_HUAWEI_CLOUD_STACK + return compute.CLOUD_PROVIDER_HCSO } diff --git a/pkg/cloudmon/collectors/huaweimon/hwservice.go b/pkg/cloudmon/collectors/huaweimon/hwservice.go index 6b0ffc10ab..55ac0fe86c 100644 --- a/pkg/cloudmon/collectors/huaweimon/hwservice.go +++ b/pkg/cloudmon/collectors/huaweimon/hwservice.go @@ -27,7 +27,7 @@ import ( "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/multicloud/huawei" hw_moudules "yunion.io/x/onecloud/pkg/multicloud/huawei/client/modules" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack" + "yunion.io/x/onecloud/pkg/multicloud/hcso" "yunion.io/x/onecloud/pkg/util/influxdb" ) @@ -343,8 +343,8 @@ func (self *SHwCloudReport) collectMetricFromThisServer(server jsonutils.JSONObj func (self *SHwCloudReport) GetMetricData(region cloudprovider.ICloudRegion, metrics []hw_moudules.SMetricMeta, since time.Time, until time.Time) ([]hw_moudules.SMetricData, error) { switch self.SProvider.Provider { - case compute.CLOUD_PROVIDER_HUAWEI_CLOUD_STACK: - hwReg := region.(*huaweistack.SRegion) + case compute.CLOUD_PROVIDER_HCSO: + hwReg := region.(*hcso.SRegion) return hwReg.GetMetricsData(metrics, since, until) default: hwReg := region.(*huawei.SRegion) diff --git a/pkg/cloudprovider/cloudprovider.go b/pkg/cloudprovider/cloudprovider.go index 3b76a87b31..0fc466fea1 100644 --- a/pkg/cloudprovider/cloudprovider.go +++ b/pkg/cloudprovider/cloudprovider.go @@ -98,7 +98,7 @@ type SCloudaccountCredential struct { *SApsaraEndpoints // Huawei Cloud Stack Online - *SHuaweiCloudStackEndpoints + *SHCSOEndpoints } type SCloudaccount struct { @@ -161,7 +161,7 @@ type ProviderConfig struct { AccountId string SApsaraEndpoints - SHuaweiCloudStackEndpoints + SHCSOEndpoints ProxyFunc httputils.TransportProxyFunc } diff --git a/pkg/cloudprovider/endpoints.go b/pkg/cloudprovider/endpoints.go index ad9e769249..5f4de55e94 100644 --- a/pkg/cloudprovider/endpoints.go +++ b/pkg/cloudprovider/endpoints.go @@ -35,12 +35,12 @@ type SApsaraEndpoints struct { ResourcemanagerEndpoint string `default:"$APSARA_RESOURCEMANAGER_ENDPOINT"` } -// SHuaweiCloudStackEndpoints 华为私有云endpoints配置 +// SHCSOEndpoints 华为私有云endpoints配置 /* endpoint获取方式优先级： 通过参数明确指定使用指定endpoint。否则，程序根据华为云endpoint命名规则自动拼接endpoint */ -type SHuaweiCloudStackEndpoints struct { +type SHCSOEndpoints struct { caches map[string]string // 华为私有云Endpoint域名 @@ -102,7 +102,7 @@ type SHuaweiCloudStackEndpoints struct { SfsTurbo string `default:"$HUAWEI_SFS_TURBO_ENDPOINT"` } -func (self *SHuaweiCloudStackEndpoints) GetEndpoint(serviceName string, region string) string { +func (self *SHCSOEndpoints) GetEndpoint(serviceName string, region string) string { sn := utils.Kebab2Camel(serviceName, "-") if self.caches == nil { self.caches = make(map[string]string, 0) diff --git a/pkg/compute/guestdrivers/huaweistack.go b/pkg/compute/guestdrivers/huaweistack.go index 603fceda45..2963de0d46 100644 --- a/pkg/compute/guestdrivers/huaweistack.go +++ b/pkg/compute/guestdrivers/huaweistack.go @@ -34,74 +34,74 @@ import ( "yunion.io/x/onecloud/pkg/util/rbacutils" ) -type SHuaweiCloudStackGuestDriver struct { +type SHCSOGuestDriver struct { SManagedVirtualizedGuestDriver } func init() { - driver := SHuaweiCloudStackGuestDriver{} + driver := SHCSOGuestDriver{} models.RegisterGuestDriver(&driver) } -func (self *SHuaweiCloudStackGuestDriver) GetHypervisor() string { - return api.HYPERVISOR_HUAWEI_CLOUD_STACK +func (self *SHCSOGuestDriver) GetHypervisor() string { + return api.HYPERVISOR_HCSO } -func (self *SHuaweiCloudStackGuestDriver) GetProvider() string { - return api.CLOUD_PROVIDER_HUAWEI_CLOUD_STACK +func (self *SHCSOGuestDriver) GetProvider() string { + return api.CLOUD_PROVIDER_HCSO } -func (self *SHuaweiCloudStackGuestDriver) DoScheduleSKUFilter() bool { +func (self *SHCSOGuestDriver) DoScheduleSKUFilter() bool { return false } -func (self *SHuaweiCloudStackGuestDriver) GetComputeQuotaKeys(scope rbacutils.TRbacScope, ownerId mcclient.IIdentityProvider, brand string) models.SComputeResourceKeys { +func (self *SHCSOGuestDriver) GetComputeQuotaKeys(scope rbacutils.TRbacScope, ownerId mcclient.IIdentityProvider, brand string) models.SComputeResourceKeys { keys := models.SComputeResourceKeys{} keys.SBaseProjectQuotaKeys = quotas.OwnerIdProjectQuotaKeys(scope, ownerId) keys.CloudEnv = api.CLOUD_ENV_PRIVATE_CLOUD - keys.Provider = api.CLOUD_PROVIDER_HUAWEI_CLOUD_STACK - keys.Brand = api.CLOUD_PROVIDER_HUAWEI_CLOUD_STACK - keys.Hypervisor = api.HYPERVISOR_HUAWEI_CLOUD_STACK + keys.Provider = api.CLOUD_PROVIDER_HCSO + keys.Brand = api.CLOUD_PROVIDER_HCSO + keys.Hypervisor = api.HYPERVISOR_HCSO return keys } -func (self *SHuaweiCloudStackGuestDriver) GetDefaultSysDiskBackend() string { +func (self *SHCSOGuestDriver) GetDefaultSysDiskBackend() string { return api.STORAGE_HUAWEI_SAS } -func (self *SHuaweiCloudStackGuestDriver) GetMinimalSysDiskSizeGb() int { +func (self *SHCSOGuestDriver) GetMinimalSysDiskSizeGb() int { return 40 } -func (self *SHuaweiCloudStackGuestDriver) GetStorageTypes() []string { +func (self *SHCSOGuestDriver) GetStorageTypes() []string { return []string{api.STORAGE_HUAWEI_SATA, api.STORAGE_HUAWEI_SAS, api.STORAGE_HUAWEI_SSD} } -func (self *SHuaweiCloudStackGuestDriver) ChooseHostStorage(host *models.SHost, guest *models.SGuest, diskConfig *api.DiskConfig, storageIds []string) (*models.SStorage, error) { +func (self *SHCSOGuestDriver) ChooseHostStorage(host *models.SHost, guest *models.SGuest, diskConfig *api.DiskConfig, storageIds []string) (*models.SStorage, error) { return self.chooseHostStorage(self, host, diskConfig.Backend, storageIds), nil } -func (self *SHuaweiCloudStackGuestDriver) GetDetachDiskStatus() ([]string, error) { +func (self *SHCSOGuestDriver) GetDetachDiskStatus() ([]string, error) { return []string{api.VM_READY, api.VM_RUNNING}, nil } -func (self *SHuaweiCloudStackGuestDriver) GetAttachDiskStatus() ([]string, error) { +func (self *SHCSOGuestDriver) GetAttachDiskStatus() ([]string, error) { return []string{api.VM_READY, api.VM_RUNNING}, nil } -func (self *SHuaweiCloudStackGuestDriver) GetRebuildRootStatus() ([]string, error) { +func (self *SHCSOGuestDriver) GetRebuildRootStatus() ([]string, error) { return []string{api.VM_READY, api.VM_RUNNING}, nil } -func (self *SHuaweiCloudStackGuestDriver) GetChangeConfigStatus(guest *models.SGuest) ([]string, error) { +func (self *SHCSOGuestDriver) GetChangeConfigStatus(guest *models.SGuest) ([]string, error) { return []string{api.VM_READY}, nil } -func (self *SHuaweiCloudStackGuestDriver) GetDeployStatus() ([]string, error) { +func (self *SHCSOGuestDriver) GetDeployStatus() ([]string, error) { return []string{api.VM_READY, api.VM_RUNNING}, nil } -func (self *SHuaweiCloudStackGuestDriver) ValidateResizeDisk(guest *models.SGuest, disk *models.SDisk, storage *models.SStorage) error { +func (self *SHCSOGuestDriver) ValidateResizeDisk(guest *models.SGuest, disk *models.SDisk, storage *models.SStorage) error { if !utils.IsInStringArray(guest.Status, []string{api.VM_RUNNING, api.VM_READY}) { return fmt.Errorf("Cannot resize disk when guest in status %s", guest.Status) } @@ -112,15 +112,15 @@ func (self *SHuaweiCloudStackGuestDriver) ValidateResizeDisk(guest *models.SGues return nil } -func (self *SHuaweiCloudStackGuestDriver) GetGuestInitialStateAfterCreate() string { +func (self *SHCSOGuestDriver) GetGuestInitialStateAfterCreate() string { return api.VM_RUNNING } -func (self *SHuaweiCloudStackGuestDriver) GetGuestInitialStateAfterRebuild() string { +func (self *SHCSOGuestDriver) GetGuestInitialStateAfterRebuild() string { return api.VM_RUNNING } -func (self *SHuaweiCloudStackGuestDriver) GetInstanceCapability() cloudprovider.SInstanceCapability { +func (self *SHCSOGuestDriver) GetInstanceCapability() cloudprovider.SInstanceCapability { return cloudprovider.SInstanceCapability{ Hypervisor: self.GetHypervisor(), Provider: self.GetProvider(), @@ -149,7 +149,7 @@ func (self *SHuaweiCloudStackGuestDriver) GetInstanceCapability() cloudprovider. } } -func (self *SHuaweiCloudStackGuestDriver) RemoteDeployGuestSyncHost(ctx context.Context, userCred mcclient.TokenCredential, guest *models.SGuest, host *models.SHost, iVM cloudprovider.ICloudVM) (cloudprovider.ICloudHost, error) { +func (self *SHCSOGuestDriver) RemoteDeployGuestSyncHost(ctx context.Context, userCred mcclient.TokenCredential, guest *models.SGuest, host *models.SHost, iVM cloudprovider.ICloudVM) (cloudprovider.ICloudHost, error) { if hostId := iVM.GetIHostId(); len(hostId) > 0 { nh, err := db.FetchByExternalIdAndManagerId(models.HostManager, hostId, func(q *sqlchemy.SQuery) *sqlchemy.SQuery { return q.Equals("manager_id", host.ManagerId) @@ -160,7 +160,7 @@ func (self *SHuaweiCloudStackGuestDriver) RemoteDeployGuestSyncHost(ctx context. return nil, errors.Wrap(err, "FetchByExternalIdAndManagerId") } - // HYPERVISOR_HUAWEI_CLOUD_STACK VM被部署到一台全新的宿主机 + // HYPERVISOR_HCSO VM被部署到一台全新的宿主机 zone, err := host.GetZone() if err != nil { log.Warningf("host %s GetZone: %s", host.GetId(), err) @@ -184,7 +184,7 @@ func (self *SHuaweiCloudStackGuestDriver) RemoteDeployGuestSyncHost(ctx context. return host.GetIHost() } -func (self *SHuaweiCloudStackGuestDriver) IsSupportedBillingCycle(bc billing.SBillingCycle) bool { +func (self *SHCSOGuestDriver) IsSupportedBillingCycle(bc billing.SBillingCycle) bool { months := bc.GetMonths() if (months >= 1 && months <= 9) || (months == 12) || (months == 24) || (months == 36) { return true @@ -193,10 +193,10 @@ func (self *SHuaweiCloudStackGuestDriver) IsSupportedBillingCycle(bc billing.SBi return false } -func (self *SHuaweiCloudStackGuestDriver) IsNeedInjectPasswordByCloudInit(desc *cloudprovider.SManagedVMCreateConfig) bool { +func (self *SHCSOGuestDriver) IsNeedInjectPasswordByCloudInit(desc *cloudprovider.SManagedVMCreateConfig) bool { return true } -func (self *SHuaweiCloudStackGuestDriver) IsSupportSetAutoRenew() bool { +func (self *SHCSOGuestDriver) IsSupportSetAutoRenew() bool { return false } diff --git a/pkg/compute/hostdrivers/huawei_stack.go b/pkg/compute/hostdrivers/huawei_stack.go index 271c231ea6..e69b6d553c 100644 --- a/pkg/compute/hostdrivers/huawei_stack.go +++ b/pkg/compute/hostdrivers/huawei_stack.go @@ -26,25 +26,25 @@ import ( "yunion.io/x/onecloud/pkg/mcclient" ) -type SHuaweiCloudStackHostDriver struct { +type SHCSOHostDriver struct { SManagedVirtualizationHostDriver } func init() { - driver := SHuaweiCloudStackHostDriver{} + driver := SHCSOHostDriver{} models.RegisterHostDriver(&driver) } -func (self *SHuaweiCloudStackHostDriver) GetHostType() string { - return api.HOST_TYPE_HUAWEI_CLOUD_STACK +func (self *SHCSOHostDriver) GetHostType() string { + return api.HOST_TYPE_HCSO } -func (self *SHuaweiCloudStackHostDriver) GetHypervisor() string { - return api.HYPERVISOR_HUAWEI_CLOUD_STACK +func (self *SHCSOHostDriver) GetHypervisor() string { + return api.HYPERVISOR_HCSO } // 系统盘必须至少40G -func (self *SHuaweiCloudStackHostDriver) ValidateDiskSize(storage *models.SStorage, sizeGb int) error { +func (self *SHCSOHostDriver) ValidateDiskSize(storage *models.SStorage, sizeGb int) error { switch storage.StorageType { case api.STORAGE_HUAWEI_SSD, api.STORAGE_HUAWEI_SATA, api.STORAGE_HUAWEI_SAS: if sizeGb < 10 || sizeGb > 32768 { @@ -57,7 +57,7 @@ func (self *SHuaweiCloudStackHostDriver) ValidateDiskSize(storage *models.SStora return nil } -func (self *SHuaweiCloudStackHostDriver) ValidateResetDisk(ctx context.Context, userCred mcclient.TokenCredential, disk *models.SDisk, snapshot *models.SSnapshot, guests []models.SGuest, data *jsonutils.JSONDict) (*jsonutils.JSONDict, error) { +func (self *SHCSOHostDriver) ValidateResetDisk(ctx context.Context, userCred mcclient.TokenCredential, disk *models.SDisk, snapshot *models.SSnapshot, guests []models.SGuest, data *jsonutils.JSONDict) (*jsonutils.JSONDict, error) { if len(guests) >= 1 { if disk.DiskType == api.DISK_TYPE_SYS { for _, g := range guests { diff --git a/pkg/compute/hostdrivers/managedvirtual.go b/pkg/compute/hostdrivers/managedvirtual.go index f7b929a6d1..494e79ff0f 100644 --- a/pkg/compute/hostdrivers/managedvirtual.go +++ b/pkg/compute/hostdrivers/managedvirtual.go @@ -54,7 +54,7 @@ func (self *SManagedVirtualizationHostDriver) CheckAndSetCacheImage(ctx context. } providerName := storageCache.GetProviderName() - if utils.IsInStringArray(providerName, []string{api.CLOUD_PROVIDER_HUAWEI, api.CLOUD_PROVIDER_HUAWEI_CLOUD_STACK, api.CLOUD_PROVIDER_UCLOUD}) { + if utils.IsInStringArray(providerName, []string{api.CLOUD_PROVIDER_HUAWEI, api.CLOUD_PROVIDER_HCSO, api.CLOUD_PROVIDER_UCLOUD}) { image.OsVersion, _ = params.GetString("os_full_version") } diff --git a/pkg/compute/models/cloudaccounts.go b/pkg/compute/models/cloudaccounts.go index 8803961dbe..3785b2ed9f 100644 --- a/pkg/compute/models/cloudaccounts.go +++ b/pkg/compute/models/cloudaccounts.go @@ -443,10 +443,10 @@ func (manager *SCloudaccountManager) validateCreateData( endpointOptions = jsonutils.Marshal(input.SCloudaccountCredential.SApsaraEndpoints) } - hcsoEndpoints := cloudprovider.SHuaweiCloudStackEndpoints{} - if input.SCloudaccountCredential.SHuaweiCloudStackEndpoints != nil { - hcsoEndpoints = *input.SCloudaccountCredential.SHuaweiCloudStackEndpoints - endpointOptions = jsonutils.Marshal(input.SCloudaccountCredential.SHuaweiCloudStackEndpoints) + hcsoEndpoints := cloudprovider.SHCSOEndpoints{} + if input.SCloudaccountCredential.SHCSOEndpoints != nil { + hcsoEndpoints = *input.SCloudaccountCredential.SHCSOEndpoints + endpointOptions = jsonutils.Marshal(input.SCloudaccountCredential.SHCSOEndpoints) } if endpointOptions != nil { @@ -512,7 +512,7 @@ func (manager *SCloudaccountManager) validateCreateData( ProxyFunc: proxyFunc, SApsaraEndpoints: endpoints, - SHuaweiCloudStackEndpoints: hcsoEndpoints, + SHCSOEndpoints: hcsoEndpoints, }) if err != nil { if err == cloudprovider.ErrNoSuchProvder { @@ -718,13 +718,13 @@ func (self *SCloudaccount) PerformUpdateCredential(ctx context.Context, userCred originSecret, _ := self.getPassword() - hcsoEndpoints := cloudprovider.SHuaweiCloudStackEndpoints{} - if self.Provider == api.CLOUD_PROVIDER_HUAWEI_CLOUD_STACK && input.SHuaweiCloudStackEndpoints != nil { + hcsoEndpoints := cloudprovider.SHCSOEndpoints{} + if self.Provider == api.CLOUD_PROVIDER_HCSO && input.SHCSOEndpoints != nil { if self.Options == nil { self.Options = jsonutils.NewDict() } - newOptions := jsonutils.Marshal(input.SHuaweiCloudStackEndpoints) + newOptions := jsonutils.Marshal(input.SHCSOEndpoints) _, err = db.UpdateWithLock(ctx, self, func() error { self.Options.Update(newOptions) return nil @@ -744,7 +744,7 @@ func (self *SCloudaccount) PerformUpdateCredential(ctx context.Context, userCred URL: self.AccessUrl, Account: account.Account, Secret: account.Secret, - SHuaweiCloudStackEndpoints: hcsoEndpoints, + SHCSOEndpoints: hcsoEndpoints, ProxyFunc: self.proxyFunc(), }) if err != nil { @@ -938,9 +938,9 @@ func (self *SCloudaccount) getProviderInternal() (cloudprovider.ICloudProvider, return nil, fmt.Errorf("Invalid password %s", err) } endpoints := cloudprovider.SApsaraEndpoints{} - hcsoEndpoints := cloudprovider.SHuaweiCloudStackEndpoints{} + hcsoEndpoints := cloudprovider.SHCSOEndpoints{} if self.Options != nil { - if self.Provider == api.CLOUD_PROVIDER_HUAWEI_CLOUD_STACK { + if self.Provider == api.CLOUD_PROVIDER_HCSO { self.Options.Unmarshal(&hcsoEndpoints) } else if self.Provider == api.CLOUD_PROVIDER_APSARA { self.Options.Unmarshal(&endpoints) @@ -955,7 +955,7 @@ func (self *SCloudaccount) getProviderInternal() (cloudprovider.ICloudProvider, Secret: secret, SApsaraEndpoints: endpoints, - SHuaweiCloudStackEndpoints: hcsoEndpoints, + SHCSOEndpoints: hcsoEndpoints, ProxyFunc: self.proxyFunc(), }) } diff --git a/pkg/compute/models/cloudproviders.go b/pkg/compute/models/cloudproviders.go index 24a1d772d3..7c83181637 100644 --- a/pkg/compute/models/cloudproviders.go +++ b/pkg/compute/models/cloudproviders.go @@ -875,9 +875,9 @@ func (self *SCloudprovider) GetProvider() (cloudprovider.ICloudProvider, error) account := self.GetCloudaccount() endpoints := cloudprovider.SApsaraEndpoints{} - hscsoEndpoints := cloudprovider.SHuaweiCloudStackEndpoints{} + hscsoEndpoints := cloudprovider.SHCSOEndpoints{} if account.Options != nil { - if self.Provider == api.CLOUD_PROVIDER_HUAWEI_CLOUD_STACK { + if self.Provider == api.CLOUD_PROVIDER_HCSO { account.Options.Unmarshal(&hscsoEndpoints) } else if self.Provider == api.CLOUD_PROVIDER_APSARA { account.Options.Unmarshal(&endpoints) @@ -894,7 +894,7 @@ func (self *SCloudprovider) GetProvider() (cloudprovider.ICloudProvider, error) ProxyFunc: account.proxyFunc(), SApsaraEndpoints: endpoints, - SHuaweiCloudStackEndpoints: hscsoEndpoints, + SHCSOEndpoints: hscsoEndpoints, }) } diff --git a/pkg/compute/models/disks.go b/pkg/compute/models/disks.go index e85cafda19..ade9d77788 100644 --- a/pkg/compute/models/disks.go +++ b/pkg/compute/models/disks.go @@ -1898,7 +1898,7 @@ func (self *SDisk) PerformPurge(ctx context.Context, userCred mcclient.TokenCred } provider := self.GetCloudprovider() - if provider != nil && utils.IsInStringArray(provider.Provider, []string{api.CLOUD_PROVIDER_HUAWEI, api.CLOUD_PROVIDER_HUAWEI_CLOUD_STACK}) { + if provider != nil && utils.IsInStringArray(provider.Provider, []string{api.CLOUD_PROVIDER_HUAWEI, api.CLOUD_PROVIDER_HCSO}) { cnt, err := self.GetSnapshotCount() if err != nil { return nil, httperrors.NewInternalServerError("GetSnapshotCount fail %s", err) @@ -1913,7 +1913,7 @@ func (self *SDisk) PerformPurge(ctx context.Context, userCred mcclient.TokenCred func (self *SDisk) CustomizeDelete(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) error { if !jsonutils.QueryBoolean(query, "delete_snapshots", false) { - if provider := self.GetCloudprovider(); provider != nil && utils.IsInStringArray(provider.Provider, []string{api.CLOUD_PROVIDER_HUAWEI, api.CLOUD_PROVIDER_HUAWEI_CLOUD_STACK}) { + if provider := self.GetCloudprovider(); provider != nil && utils.IsInStringArray(provider.Provider, []string{api.CLOUD_PROVIDER_HUAWEI, api.CLOUD_PROVIDER_HCSO}) { cnt, err := self.GetSnapshotCount() if err != nil { return httperrors.NewInternalServerError("GetSnapshotCount fail %s", err) diff --git a/pkg/compute/models/elasticips.go b/pkg/compute/models/elasticips.go index 272b83d279..8ee24e79d2 100644 --- a/pkg/compute/models/elasticips.go +++ b/pkg/compute/models/elasticips.go @@ -152,7 +152,7 @@ func (manager *SElasticipManager) ListItemFilter( return nil, httperrors.NewGeneralError(err) } guest := serverObj.(*SGuest) - if guest.Hypervisor == api.HYPERVISOR_KVM || (utils.IsInStringArray(guest.Hypervisor, api.PRIVATE_CLOUD_HYPERVISORS) && guest.Hypervisor != api.HYPERVISOR_HUAWEI_CLOUD_STACK) { + if guest.Hypervisor == api.HYPERVISOR_KVM || (utils.IsInStringArray(guest.Hypervisor, api.PRIVATE_CLOUD_HYPERVISORS) && guest.Hypervisor != api.HYPERVISOR_HCSO) { zone, _ := guest.getZone() networks := NetworkManager.Query().SubQuery() wires := WireManager.Query().SubQuery() diff --git a/pkg/compute/models/loadbalancercachedacls.go b/pkg/compute/models/loadbalancercachedacls.go index dc29bd7c81..808deda242 100644 --- a/pkg/compute/models/loadbalancercachedacls.go +++ b/pkg/compute/models/loadbalancercachedacls.go @@ -130,7 +130,7 @@ func (man *SCachedLoadbalancerAclManager) ValidateCreateData(ctx context.Context } } - if utils.IsInStringArray(providerV.Model.(*SCloudprovider).Provider, []string{api.CLOUD_PROVIDER_HUAWEI, api.CLOUD_PROVIDER_HUAWEI_CLOUD_STACK}) { + if utils.IsInStringArray(providerV.Model.(*SCloudprovider).Provider, []string{api.CLOUD_PROVIDER_HUAWEI, api.CLOUD_PROVIDER_HCSO}) { listenerV := validators.NewModelIdOrNameValidator("listener", "loadbalancerlistener", ownerId) if err := listenerV.Validate(data); err != nil { return nil, err @@ -319,7 +319,7 @@ func (self *SCachedLoadbalancerAcl) syncRemoveCloudLoadbalanceAcl(ctx context.Co func (acl *SCachedLoadbalancerAcl) SyncWithCloudLoadbalancerAcl(ctx context.Context, userCred mcclient.TokenCredential, extAcl cloudprovider.ICloudLoadbalancerAcl, projectId mcclient.IIdentityProvider) error { diff, err := db.UpdateWithLock(ctx, acl, func() error { // todo: 华为云acl没有name字段应此不需要同步名称 - if !utils.IsInStringArray(acl.GetProviderName(), []string{api.CLOUD_PROVIDER_HUAWEI, api.CLOUD_PROVIDER_HUAWEI_CLOUD_STACK}) { + if !utils.IsInStringArray(acl.GetProviderName(), []string{api.CLOUD_PROVIDER_HUAWEI, api.CLOUD_PROVIDER_HCSO}) { acl.Name = extAcl.GetName() } else { ext_listener_id := extAcl.GetAclListenerID() @@ -355,7 +355,7 @@ func (man *SCachedLoadbalancerAclManager) GetOrCreateCachedAcl(ctx context.Conte defer lockman.ReleaseClass(ctx, man, ownerProjId) listenerId := "" - if utils.IsInStringArray(lblis.GetProviderName(), []string{api.CLOUD_PROVIDER_HUAWEI, api.CLOUD_PROVIDER_HUAWEI_CLOUD_STACK}) { + if utils.IsInStringArray(lblis.GetProviderName(), []string{api.CLOUD_PROVIDER_HUAWEI, api.CLOUD_PROVIDER_HCSO}) { listenerId = lblis.Id } if lblis.GetProviderName() == api.CLOUD_PROVIDER_OPENSTACK { diff --git a/pkg/compute/models/loadbalancerlistenerrules.go b/pkg/compute/models/loadbalancerlistenerrules.go index 26f5b814c5..6b13c1d401 100644 --- a/pkg/compute/models/loadbalancerlistenerrules.go +++ b/pkg/compute/models/loadbalancerlistenerrules.go @@ -732,7 +732,7 @@ func (lbr *SLoadbalancerListenerRule) constructFieldsFromCloudListenerRule(userC } if groupId := extRule.GetBackendGroupId(); len(groupId) > 0 { - if utils.IsInStringArray(lbr.GetProviderName(), []string{api.CLOUD_PROVIDER_HUAWEI, api.CLOUD_PROVIDER_HUAWEI_CLOUD_STACK}) { + if utils.IsInStringArray(lbr.GetProviderName(), []string{api.CLOUD_PROVIDER_HUAWEI, api.CLOUD_PROVIDER_HCSO}) { group, err := db.FetchByExternalId(HuaweiCachedLbbgManager, groupId) if err != nil { if err == sql.ErrNoRows { @@ -774,7 +774,7 @@ func (lbr *SLoadbalancerListenerRule) updateCachedLoadbalancerBackendGroupAssoci } switch lbr.GetProviderName() { - case api.CLOUD_PROVIDER_HUAWEI, api.CLOUD_PROVIDER_HUAWEI_CLOUD_STACK: + case api.CLOUD_PROVIDER_HUAWEI, api.CLOUD_PROVIDER_HCSO: _group, err := db.FetchByExternalId(HuaweiCachedLbbgManager, exteralLbbgId) if err != nil { if err == sql.ErrNoRows { diff --git a/pkg/compute/models/loadbalancerlisteners.go b/pkg/compute/models/loadbalancerlisteners.go index 52902d5d49..71d8c07443 100644 --- a/pkg/compute/models/loadbalancerlisteners.go +++ b/pkg/compute/models/loadbalancerlisteners.go @@ -369,7 +369,7 @@ func (man *SLoadbalancerListenerManager) ValidateAcl(aclStatusV *validators.Vali return httperrors.NewMissingParameterError("acl_type") } } else { - if !utils.IsInStringArray(providerName, []string{api.CLOUD_PROVIDER_HUAWEI, api.CLOUD_PROVIDER_HUAWEI_CLOUD_STACK}) { + if !utils.IsInStringArray(providerName, []string{api.CLOUD_PROVIDER_HUAWEI, api.CLOUD_PROVIDER_HCSO}) { data.Set("acl_id", jsonutils.NewString("")) data.Set("cached_acl_id", jsonutils.NewString("")) } @@ -1013,7 +1013,7 @@ func (lblis *SLoadbalancerListener) constructFieldsFromCloudListener(userCred mc switch lblis.ListenerType { case api.LB_LISTENER_TYPE_UDP: - if !utils.IsInStringArray(lblis.GetProviderName(), []string{api.CLOUD_PROVIDER_HUAWEI, api.CLOUD_PROVIDER_HUAWEI_CLOUD_STACK}) { + if !utils.IsInStringArray(lblis.GetProviderName(), []string{api.CLOUD_PROVIDER_HUAWEI, api.CLOUD_PROVIDER_HCSO}) { lblis.HealthCheckExp = extListener.GetHealthCheckExp() lblis.HealthCheckReq = extListener.GetHealthCheckReq() } @@ -1056,7 +1056,7 @@ func (lblis *SLoadbalancerListener) constructFieldsFromCloudListener(userCred mc groupId := extListener.GetBackendGroupId() switch lblis.GetProviderName() { - case api.CLOUD_PROVIDER_HUAWEI, api.CLOUD_PROVIDER_HUAWEI_CLOUD_STACK: + case api.CLOUD_PROVIDER_HUAWEI, api.CLOUD_PROVIDER_HCSO: if len(groupId) > 0 { group, err := db.FetchByExternalIdAndManagerId(HuaweiCachedLbbgManager, groupId, func(q *sqlchemy.SQuery) *sqlchemy.SQuery { return q.Equals("manager_id", lb.ManagerId) @@ -1148,7 +1148,7 @@ func (lblis *SLoadbalancerListener) updateCachedLoadbalancerBackendGroupAssociat } switch lblis.GetProviderName() { - case api.CLOUD_PROVIDER_HUAWEI, api.CLOUD_PROVIDER_HUAWEI_CLOUD_STACK: + case api.CLOUD_PROVIDER_HUAWEI, api.CLOUD_PROVIDER_HCSO: _group, err := db.FetchByExternalIdAndManagerId(HuaweiCachedLbbgManager, exteralLbbgId, func(q *sqlchemy.SQuery) *sqlchemy.SQuery { return q.Equals("manager_id", managerId) }) diff --git a/pkg/compute/models/loadbalancers.go b/pkg/compute/models/loadbalancers.go index b72b0abd94..4dcabcae09 100644 --- a/pkg/compute/models/loadbalancers.go +++ b/pkg/compute/models/loadbalancers.go @@ -505,7 +505,7 @@ func (lb *SLoadbalancer) GetCreateLoadbalancerParams(iRegion cloudprovider.IClou params.EgressMbps = lb.EgressMbps } - if lb.AddressType == api.LB_ADDR_TYPE_INTRANET || utils.IsInStringArray(lb.SManagedResourceBase.GetProviderName(), []string{api.CLOUD_PROVIDER_HUAWEI_CLOUD_STACK, api.CLOUD_PROVIDER_HUAWEI, api.CLOUD_PROVIDER_AWS, api.CLOUD_PROVIDER_QCLOUD}) { + if lb.AddressType == api.LB_ADDR_TYPE_INTRANET || utils.IsInStringArray(lb.SManagedResourceBase.GetProviderName(), []string{api.CLOUD_PROVIDER_HCSO, api.CLOUD_PROVIDER_HUAWEI, api.CLOUD_PROVIDER_AWS, api.CLOUD_PROVIDER_QCLOUD}) { vpc, err := lb.GetVpc() if err != nil { return nil, err @@ -517,7 +517,7 @@ func (lb *SLoadbalancer) GetCreateLoadbalancerParams(iRegion cloudprovider.IClou params.VpcID = iVpc.GetId() } - if lb.AddressType == api.LB_ADDR_TYPE_INTRANET || utils.IsInStringArray(lb.SManagedResourceBase.GetProviderName(), []string{api.CLOUD_PROVIDER_HUAWEI_CLOUD_STACK, api.CLOUD_PROVIDER_HUAWEI, api.CLOUD_PROVIDER_AWS}) { + if lb.AddressType == api.LB_ADDR_TYPE_INTRANET || utils.IsInStringArray(lb.SManagedResourceBase.GetProviderName(), []string{api.CLOUD_PROVIDER_HCSO, api.CLOUD_PROVIDER_HUAWEI, api.CLOUD_PROVIDER_AWS}) { networks, err := lb.GetNetworks() if err != nil { return nil, fmt.Errorf("failed to find network for lb %s: %s", lb.Name, err) diff --git a/pkg/compute/models/mount_targets.go b/pkg/compute/models/mount_targets.go index 273ac38c36..f8981f249d 100644 --- a/pkg/compute/models/mount_targets.go +++ b/pkg/compute/models/mount_targets.go @@ -362,7 +362,7 @@ func (self *SMountTarget) ValidateDeleteCondition(ctx context.Context) error { if err != nil { return httperrors.NewGeneralError(errors.Wrapf(err, "GetRegion")) } - if utils.IsInStringArray(region.Provider, []string{api.CLOUD_PROVIDER_HUAWEI, api.CLOUD_PROVIDER_HUAWEI_CLOUD_STACK}) { + if utils.IsInStringArray(region.Provider, []string{api.CLOUD_PROVIDER_HUAWEI, api.CLOUD_PROVIDER_HCSO}) { return httperrors.NewNotSupportedError("not allow to delete") } return self.SStatusStandaloneResourceBase.ValidateDeleteCondition(ctx) diff --git a/pkg/compute/models/purge.go b/pkg/compute/models/purge.go index c5effca85d..62f68d6166 100644 --- a/pkg/compute/models/purge.go +++ b/pkg/compute/models/purge.go @@ -551,7 +551,7 @@ func (lbbg *SLoadbalancerBackendGroup) purgeCachedlbbg(ctx context.Context, user switch lbbg.GetProviderName() { case api.CLOUD_PROVIDER_AWS: return lbbg.purgeAwsCachedlbbg(ctx, userCred) - case api.CLOUD_PROVIDER_HUAWEI, api.CLOUD_PROVIDER_HUAWEI_CLOUD_STACK: + case api.CLOUD_PROVIDER_HUAWEI, api.CLOUD_PROVIDER_HCSO: return lbbg.purgeHuaweiCachedlbbg(ctx, userCred) } @@ -632,7 +632,7 @@ func (lbb *SLoadbalancerBackend) purgeCachedlbb(ctx context.Context, userCred mc switch lbb.GetProviderName() { case api.CLOUD_PROVIDER_AWS: return lbb.purgeAwsCachedlbb(ctx, userCred) - case api.CLOUD_PROVIDER_HUAWEI, api.CLOUD_PROVIDER_HUAWEI_CLOUD_STACK: + case api.CLOUD_PROVIDER_HUAWEI, api.CLOUD_PROVIDER_HCSO: return lbb.purgeHuaweiCachedlbb(ctx, userCred) } diff --git a/pkg/compute/models/secgroupcache.go b/pkg/compute/models/secgroupcache.go index a3f6cbbc19..a876042136 100644 --- a/pkg/compute/models/secgroupcache.go +++ b/pkg/compute/models/secgroupcache.go @@ -606,7 +606,7 @@ func (self *SSecurityGroupCache) StartSecurityGroupCacheDeleteTask(ctx context.C } func (manager *SSecurityGroupCacheManager) InitializeData() error { - providerIds := CloudproviderManager.Query("id").In("provider", []string{api.CLOUD_PROVIDER_HUAWEI, api.CLOUD_PROVIDER_HUAWEI_CLOUD_STACK, api.CLOUD_PROVIDER_CTYUN, api.CLOUD_PROVIDER_QCLOUD}).SubQuery() + providerIds := CloudproviderManager.Query("id").In("provider", []string{api.CLOUD_PROVIDER_HUAWEI, api.CLOUD_PROVIDER_HCSO, api.CLOUD_PROVIDER_CTYUN, api.CLOUD_PROVIDER_QCLOUD}).SubQuery() deprecatedSecgroups := []SSecurityGroupCache{} q := manager.Query().In("manager_id", providerIds).NotEquals("vpc_id", api.NORMAL_VPC_ID) diff --git a/pkg/compute/regiondrivers/huaweistack.go b/pkg/compute/regiondrivers/huaweistack.go index 3c6b88c7b4..fe93ce5be5 100644 --- a/pkg/compute/regiondrivers/huaweistack.go +++ b/pkg/compute/regiondrivers/huaweistack.go @@ -19,19 +19,19 @@ import ( "yunion.io/x/onecloud/pkg/compute/models" ) -type SHuaweiCloudStackRegionDriver struct { +type SHCSORegionDriver struct { SHuaWeiRegionDriver } func init() { - driver := SHuaweiCloudStackRegionDriver{} + driver := SHCSORegionDriver{} models.RegisterRegionDriver(&driver) } -func (self *SHuaweiCloudStackRegionDriver) GetProvider() string { - return api.CLOUD_PROVIDER_HUAWEI_CLOUD_STACK +func (self *SHCSORegionDriver) GetProvider() string { + return api.CLOUD_PROVIDER_HCSO } -func (self *SHuaweiCloudStackRegionDriver) IsSupportedElasticcache() bool { +func (self *SHCSORegionDriver) IsSupportedElasticcache() bool { return false } diff --git a/pkg/compute/tasks/loadbalancer_listener_create_task.go b/pkg/compute/tasks/loadbalancer_listener_create_task.go index 89ab83de30..12121a144e 100644 --- a/pkg/compute/tasks/loadbalancer_listener_create_task.go +++ b/pkg/compute/tasks/loadbalancer_listener_create_task.go @@ -38,7 +38,7 @@ func init() { func getOnLoadbalancerListenerCreateCompleteFunc(provider string) func(ctx context.Context, lblis *models.SLoadbalancerListener, data jsonutils.JSONObject, self *LoadbalancerListenerCreateTask) { switch provider { - case api.CLOUD_PROVIDER_HUAWEI, api.CLOUD_PROVIDER_HUAWEI_CLOUD_STACK: + case api.CLOUD_PROVIDER_HUAWEI, api.CLOUD_PROVIDER_HCSO: return onHuaweiLoadbalancerListenerCreateComplete case api.CLOUD_PROVIDER_OPENSTACK: return onOpenstackLoadbalancerListenerCreateComplete diff --git a/pkg/compute/tasks/loadbalancer_listener_rule_create_task.go b/pkg/compute/tasks/loadbalancer_listener_rule_create_task.go index dea06e11b2..6a9b2e3e5e 100644 --- a/pkg/compute/tasks/loadbalancer_listener_rule_create_task.go +++ b/pkg/compute/tasks/loadbalancer_listener_rule_create_task.go @@ -37,7 +37,7 @@ func init() { func getOnPrepareLoadbalancerBackendgroupFunc(provider string) func(ctx context.Context, region *models.SCloudregion, lbr *models.SLoadbalancerListenerRule, data jsonutils.JSONObject, self *LoadbalancerListenerRuleCreateTask) { switch provider { - case api.CLOUD_PROVIDER_HUAWEI, api.CLOUD_PROVIDER_HUAWEI_CLOUD_STACK: + case api.CLOUD_PROVIDER_HUAWEI, api.CLOUD_PROVIDER_HCSO: return onHuaiweiPrepareLoadbalancerBackendgroup case api.CLOUD_PROVIDER_AWS: return onAwsPrepareLoadbalancerBackendgroup diff --git a/pkg/mcclient/options/cloudaccounts.go b/pkg/mcclient/options/cloudaccounts.go index 8663313f41..5d4ec112a1 100644 --- a/pkg/mcclient/options/cloudaccounts.go +++ b/pkg/mcclient/options/cloudaccounts.go @@ -271,15 +271,15 @@ func (opts *SHuaweiCloudAccountCreateOptions) Params() (jsonutils.JSONObject, er return params, nil } -type SHuaweiCloudStackAccountCreateOptions struct { +type SHCSOAccountCreateOptions struct { SCloudAccountCreateBaseOptions - cloudprovider.SHuaweiCloudStackEndpoints + cloudprovider.SHCSOEndpoints SAccessKeyCredential } -func (opts *SHuaweiCloudStackAccountCreateOptions) Params() (jsonutils.JSONObject, error) { +func (opts *SHCSOAccountCreateOptions) Params() (jsonutils.JSONObject, error) { params := jsonutils.Marshal(opts) - params.(*jsonutils.JSONDict).Add(jsonutils.NewString("HuaweiCloudStack"), "provider") + params.(*jsonutils.JSONDict).Add(jsonutils.NewString("HCSO"), "provider") return params, nil } @@ -460,13 +460,13 @@ func (opts *SHuaweiCloudAccountUpdateCredentialOptions) Params() (jsonutils.JSON return jsonutils.Marshal(opts), nil } -type SHuaweiCloudStackAccountUpdateCredentialOptions struct { +type SHCSOAccountUpdateCredentialOptions struct { SCloudAccountIdOptions - cloudprovider.SHuaweiCloudStackEndpoints + cloudprovider.SHCSOEndpoints SAccessKeyCredential } -func (opts *SHuaweiCloudStackAccountUpdateCredentialOptions) Params() (jsonutils.JSONObject, error) { +func (opts *SHCSOAccountUpdateCredentialOptions) Params() (jsonutils.JSONObject, error) { return jsonutils.Marshal(opts), nil } @@ -791,11 +791,11 @@ func (opts *SHuaweiCloudAccountUpdateOptions) Params() (jsonutils.JSONObject, er return params, nil } -type SHuaweiCloudStackAccountUpdateOptions struct { +type SHCSOAccountUpdateOptions struct { SCloudAccountUpdateBaseOptions } -func (opts *SHuaweiCloudStackAccountUpdateOptions) Params() (jsonutils.JSONObject, error) { +func (opts *SHCSOAccountUpdateOptions) Params() (jsonutils.JSONObject, error) { return jsonutils.Marshal(opts), nil } diff --git a/pkg/multicloud/huaweistack/bucket.go b/pkg/multicloud/hcso/bucket.go similarity index 99% rename from pkg/multicloud/huaweistack/bucket.go rename to pkg/multicloud/hcso/bucket.go index 3ff8bef53a..4f96bdf7df 100644 --- a/pkg/multicloud/huaweistack/bucket.go +++ b/pkg/multicloud/hcso/bucket.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "context" diff --git a/pkg/multicloud/huaweistack/client/auth/credential.go b/pkg/multicloud/hcso/client/auth/credential.go similarity index 100% rename from pkg/multicloud/huaweistack/client/auth/credential.go rename to pkg/multicloud/hcso/client/auth/credential.go diff --git a/pkg/multicloud/huaweistack/client/auth/credentials/access_key_credential.go b/pkg/multicloud/hcso/client/auth/credentials/access_key_credential.go similarity index 100% rename from pkg/multicloud/huaweistack/client/auth/credentials/access_key_credential.go rename to pkg/multicloud/hcso/client/auth/credentials/access_key_credential.go diff --git a/pkg/multicloud/huaweistack/client/auth/credentials/doc.go b/pkg/multicloud/hcso/client/auth/credentials/doc.go similarity index 94% rename from pkg/multicloud/huaweistack/client/auth/credentials/doc.go rename to pkg/multicloud/hcso/client/auth/credentials/doc.go index 07ceaa786b..31f6d5e737 100644 --- a/pkg/multicloud/huaweistack/client/auth/credentials/doc.go +++ b/pkg/multicloud/hcso/client/auth/credentials/doc.go @@ -12,4 +12,4 @@ // See the License for the specific language governing permissions and // limitations under the License. -package credentials // import "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/auth/credentials" +package credentials // import "yunion.io/x/onecloud/pkg/multicloud/hcso/client/auth/credentials" diff --git a/pkg/multicloud/huaweistack/shell/doc.go b/pkg/multicloud/hcso/client/auth/doc.go similarity index 87% rename from pkg/multicloud/huaweistack/shell/doc.go rename to pkg/multicloud/hcso/client/auth/doc.go index c9938dad78..20494bbc20 100644 --- a/pkg/multicloud/huaweistack/shell/doc.go +++ b/pkg/multicloud/hcso/client/auth/doc.go @@ -12,4 +12,4 @@ // See the License for the specific language governing permissions and // limitations under the License. -package shell // import "yunion.io/x/onecloud/pkg/multicloud/huaweistack/shell" +package auth // import "yunion.io/x/onecloud/pkg/multicloud/hcso/client/auth" diff --git a/pkg/multicloud/huaweistack/client/auth/signer.go b/pkg/multicloud/hcso/client/auth/signer.go similarity index 96% rename from pkg/multicloud/huaweistack/client/auth/signer.go rename to pkg/multicloud/hcso/client/auth/signer.go index 496fdefa45..123eadc2f9 100644 --- a/pkg/multicloud/huaweistack/client/auth/signer.go +++ b/pkg/multicloud/hcso/client/auth/signer.go @@ -24,9 +24,9 @@ import ( "strings" "time" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/auth/credentials" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/auth/signers" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/requests" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/auth/credentials" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/auth/signers" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/requests" ) type Signer interface { diff --git a/pkg/multicloud/huaweistack/client/auth/signers/doc.go b/pkg/multicloud/hcso/client/auth/signers/doc.go similarity index 95% rename from pkg/multicloud/huaweistack/client/auth/signers/doc.go rename to pkg/multicloud/hcso/client/auth/signers/doc.go index de32305c3f..af594488de 100644 --- a/pkg/multicloud/huaweistack/client/auth/signers/doc.go +++ b/pkg/multicloud/hcso/client/auth/signers/doc.go @@ -12,4 +12,4 @@ // See the License for the specific language governing permissions and // limitations under the License. -package signers // import "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/auth/signers" +package signers // import "yunion.io/x/onecloud/pkg/multicloud/hcso/client/auth/signers" diff --git a/pkg/multicloud/huaweistack/client/auth/signers/signer_access_key.go b/pkg/multicloud/hcso/client/auth/signers/signer_access_key.go similarity index 95% rename from pkg/multicloud/huaweistack/client/auth/signers/signer_access_key.go rename to pkg/multicloud/hcso/client/auth/signers/signer_access_key.go index ec0372491a..32fe76084d 100644 --- a/pkg/multicloud/huaweistack/client/auth/signers/signer_access_key.go +++ b/pkg/multicloud/hcso/client/auth/signers/signer_access_key.go @@ -19,7 +19,7 @@ import ( "crypto/sha256" "encoding/hex" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/auth/credentials" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/auth/credentials" ) type AccessKeySigner struct { diff --git a/pkg/multicloud/huaweistack/client/client.go b/pkg/multicloud/hcso/client/client.go similarity index 95% rename from pkg/multicloud/huaweistack/client/client.go rename to pkg/multicloud/hcso/client/client.go index d808e837bc..6897d9835c 100644 --- a/pkg/multicloud/huaweistack/client/client.go +++ b/pkg/multicloud/hcso/client/client.go @@ -18,9 +18,9 @@ import ( "net/http" "yunion.io/x/onecloud/pkg/cloudprovider" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/auth" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/auth/credentials" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/modules" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/auth" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/auth/credentials" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/modules" ) type Client struct { @@ -91,7 +91,7 @@ type Client struct { type SClientConfig struct { signer auth.Signer - endpoints *cloudprovider.SHuaweiCloudStackEndpoints + endpoints *cloudprovider.SHCSOEndpoints regionId string domainId string projectId string @@ -103,7 +103,7 @@ func (self *SClientConfig) GetSigner() auth.Signer { return self.signer } -func (self *SClientConfig) GetEndpoints() *cloudprovider.SHuaweiCloudStackEndpoints { +func (self *SClientConfig) GetEndpoints() *cloudprovider.SHCSOEndpoints { return self.endpoints } @@ -181,7 +181,7 @@ func (self *Client) SetHttpClient(httpClient *http.Client) { self.Services.SetHttpClient(httpClient) } -func (self *Client) InitWithAccessKey(regionId, domainId, projectId, accessKey, secretKey string, debug bool, endpoints *cloudprovider.SHuaweiCloudStackEndpoints) error { +func (self *Client) InitWithAccessKey(regionId, domainId, projectId, accessKey, secretKey string, debug bool, endpoints *cloudprovider.SHCSOEndpoints) error { // accessKey signer credential := &credentials.AccessKeyCredential{ AccessKeyId: accessKey, @@ -273,7 +273,7 @@ func (self *Client) initManagers() { self.init = true } -func NewClientWithAccessKey(regionId, domainId, projectId, accessKey, secretKey string, debug bool, endpoints *cloudprovider.SHuaweiCloudStackEndpoints) (*Client, error) { +func NewClientWithAccessKey(regionId, domainId, projectId, accessKey, secretKey string, debug bool, endpoints *cloudprovider.SHCSOEndpoints) (*Client, error) { c := &Client{} err := c.InitWithAccessKey(regionId, domainId, projectId, accessKey, secretKey, debug, endpoints) return c, err diff --git a/pkg/multicloud/huaweistack/client/doc.go b/pkg/multicloud/hcso/client/doc.go similarity index 87% rename from pkg/multicloud/huaweistack/client/doc.go rename to pkg/multicloud/hcso/client/doc.go index 5c1eec10d3..4461387962 100644 --- a/pkg/multicloud/huaweistack/client/doc.go +++ b/pkg/multicloud/hcso/client/doc.go @@ -12,4 +12,4 @@ // See the License for the specific language governing permissions and // limitations under the License. -package client // import "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client" +package client // import "yunion.io/x/onecloud/pkg/multicloud/hcso/client" diff --git a/pkg/multicloud/huaweistack/client/manager/doc.go b/pkg/multicloud/hcso/client/manager/doc.go similarity index 96% rename from pkg/multicloud/huaweistack/client/manager/doc.go rename to pkg/multicloud/hcso/client/manager/doc.go index ffbd763d3a..78e2f6d077 100644 --- a/pkg/multicloud/huaweistack/client/manager/doc.go +++ b/pkg/multicloud/hcso/client/manager/doc.go @@ -12,4 +12,4 @@ // See the License for the specific language governing permissions and // limitations under the License. -package manager // import "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" +package manager // import "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" diff --git a/pkg/multicloud/huaweistack/client/manager/manager.go b/pkg/multicloud/hcso/client/manager/manager.go similarity index 95% rename from pkg/multicloud/huaweistack/client/manager/manager.go rename to pkg/multicloud/hcso/client/manager/manager.go index 97a3e222f2..f8f4e1cbf6 100644 --- a/pkg/multicloud/huaweistack/client/manager/manager.go +++ b/pkg/multicloud/hcso/client/manager/manager.go @@ -18,8 +18,8 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/onecloud/pkg/cloudprovider" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/auth" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/responses" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/auth" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/responses" ) type IManagerContext interface { @@ -74,7 +74,7 @@ type IManager interface { type IManagerConfig interface { GetSigner() auth.Signer - GetEndpoints() *cloudprovider.SHuaweiCloudStackEndpoints + GetEndpoints() *cloudprovider.SHCSOEndpoints GetRegionId() string GetDomainId() string GetProjectId() string diff --git a/pkg/multicloud/huaweistack/client/modules/doc.go b/pkg/multicloud/hcso/client/modules/doc.go similarity index 96% rename from pkg/multicloud/huaweistack/client/modules/doc.go rename to pkg/multicloud/hcso/client/modules/doc.go index 1cdbd7921d..5be57ed8fc 100644 --- a/pkg/multicloud/huaweistack/client/modules/doc.go +++ b/pkg/multicloud/hcso/client/modules/doc.go @@ -12,4 +12,4 @@ // See the License for the specific language governing permissions and // limitations under the License. -package modules // import "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/modules" +package modules // import "yunion.io/x/onecloud/pkg/multicloud/hcso/client/modules" diff --git a/pkg/multicloud/huaweistack/client/modules/manager_base.go b/pkg/multicloud/hcso/client/modules/manager_base.go similarity index 96% rename from pkg/multicloud/huaweistack/client/modules/manager_base.go rename to pkg/multicloud/hcso/client/modules/manager_base.go index 57622b279e..4741976b10 100644 --- a/pkg/multicloud/huaweistack/client/modules/manager_base.go +++ b/pkg/multicloud/hcso/client/modules/manager_base.go @@ -28,10 +28,10 @@ import ( "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/httperrors" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/auth" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/requests" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/responses" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/auth" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/requests" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/responses" "yunion.io/x/onecloud/pkg/util/httputils" ) diff --git a/pkg/multicloud/huaweistack/client/modules/manager_resource.go b/pkg/multicloud/hcso/client/modules/manager_resource.go similarity index 98% rename from pkg/multicloud/huaweistack/client/modules/manager_resource.go rename to pkg/multicloud/hcso/client/modules/manager_resource.go index b50c322aba..e550e46aec 100644 --- a/pkg/multicloud/huaweistack/client/modules/manager_resource.go +++ b/pkg/multicloud/hcso/client/modules/manager_resource.go @@ -21,9 +21,9 @@ import ( "yunion.io/x/jsonutils" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/requests" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/responses" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/requests" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/responses" ) type ServiceNameType string diff --git a/pkg/multicloud/huaweistack/client/modules/mod_bandwidths.go b/pkg/multicloud/hcso/client/modules/mod_bandwidths.go similarity index 94% rename from pkg/multicloud/huaweistack/client/modules/mod_bandwidths.go rename to pkg/multicloud/hcso/client/modules/mod_bandwidths.go index 4a9f8f2940..068804e681 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_bandwidths.go +++ b/pkg/multicloud/hcso/client/modules/mod_bandwidths.go @@ -15,7 +15,7 @@ package modules import ( - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" ) type SBandwidthManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_ces.go b/pkg/multicloud/hcso/client/modules/mod_ces.go similarity index 96% rename from pkg/multicloud/huaweistack/client/modules/mod_ces.go rename to pkg/multicloud/hcso/client/modules/mod_ces.go index 6872f65590..a6c691b689 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_ces.go +++ b/pkg/multicloud/hcso/client/modules/mod_ces.go @@ -22,8 +22,8 @@ import ( "yunion.io/x/onecloud/pkg/httperrors" hw_mod "yunion.io/x/onecloud/pkg/multicloud/huawei/client/modules" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/requests" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/requests" ) type SCloudEyeManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_credential.go b/pkg/multicloud/hcso/client/modules/mod_credential.go similarity index 94% rename from pkg/multicloud/huaweistack/client/modules/mod_credential.go rename to pkg/multicloud/hcso/client/modules/mod_credential.go index cb8ce9016a..4614920e5f 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_credential.go +++ b/pkg/multicloud/hcso/client/modules/mod_credential.go @@ -15,7 +15,7 @@ package modules import ( - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" ) type SCredentialManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_dbinstance.go b/pkg/multicloud/hcso/client/modules/mod_dbinstance.go similarity index 96% rename from pkg/multicloud/huaweistack/client/modules/mod_dbinstance.go rename to pkg/multicloud/hcso/client/modules/mod_dbinstance.go index 924283fe78..d70e82bdf1 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_dbinstance.go +++ b/pkg/multicloud/hcso/client/modules/mod_dbinstance.go @@ -20,8 +20,8 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/onecloud/pkg/cloudprovider" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/responses" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/responses" ) type SDBInstanceManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_dbinstance_backup.go b/pkg/multicloud/hcso/client/modules/mod_dbinstance_backup.go similarity index 94% rename from pkg/multicloud/huaweistack/client/modules/mod_dbinstance_backup.go rename to pkg/multicloud/hcso/client/modules/mod_dbinstance_backup.go index 5b3c50ffd3..bd290b60b5 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_dbinstance_backup.go +++ b/pkg/multicloud/hcso/client/modules/mod_dbinstance_backup.go @@ -15,7 +15,7 @@ package modules import ( - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" ) type SDBInstanceBackupManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_dbinstance_datastore.go b/pkg/multicloud/hcso/client/modules/mod_dbinstance_datastore.go similarity index 94% rename from pkg/multicloud/huaweistack/client/modules/mod_dbinstance_datastore.go rename to pkg/multicloud/hcso/client/modules/mod_dbinstance_datastore.go index 48e3934445..28e1deac85 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_dbinstance_datastore.go +++ b/pkg/multicloud/hcso/client/modules/mod_dbinstance_datastore.go @@ -15,7 +15,7 @@ package modules import ( - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" ) type SDBInstanceDatastoreManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_dbinstance_flavor.go b/pkg/multicloud/hcso/client/modules/mod_dbinstance_flavor.go similarity index 94% rename from pkg/multicloud/huaweistack/client/modules/mod_dbinstance_flavor.go rename to pkg/multicloud/hcso/client/modules/mod_dbinstance_flavor.go index e440f69a87..e9a1b26501 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_dbinstance_flavor.go +++ b/pkg/multicloud/hcso/client/modules/mod_dbinstance_flavor.go @@ -15,7 +15,7 @@ package modules import ( - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" ) type SDBInstanceFlavorManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_dbinstance_job.go b/pkg/multicloud/hcso/client/modules/mod_dbinstance_job.go similarity index 95% rename from pkg/multicloud/huaweistack/client/modules/mod_dbinstance_job.go rename to pkg/multicloud/hcso/client/modules/mod_dbinstance_job.go index 44a8705ad4..8617a1e96b 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_dbinstance_job.go +++ b/pkg/multicloud/hcso/client/modules/mod_dbinstance_job.go @@ -17,7 +17,7 @@ package modules import ( "yunion.io/x/jsonutils" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" ) type SDBInstanceJobManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_dbinstance_storage.go b/pkg/multicloud/hcso/client/modules/mod_dbinstance_storage.go similarity index 94% rename from pkg/multicloud/huaweistack/client/modules/mod_dbinstance_storage.go rename to pkg/multicloud/hcso/client/modules/mod_dbinstance_storage.go index fee6922a65..e6519c79c7 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_dbinstance_storage.go +++ b/pkg/multicloud/hcso/client/modules/mod_dbinstance_storage.go @@ -15,7 +15,7 @@ package modules import ( - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" ) type SDBInstanceStorageManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_disks.go b/pkg/multicloud/hcso/client/modules/mod_disks.go similarity index 94% rename from pkg/multicloud/huaweistack/client/modules/mod_disks.go rename to pkg/multicloud/hcso/client/modules/mod_disks.go index 7e739bea3a..a664ea67b1 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_disks.go +++ b/pkg/multicloud/hcso/client/modules/mod_disks.go @@ -18,8 +18,8 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/responses" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/responses" ) type SDiskManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_dnat_rules.go b/pkg/multicloud/hcso/client/modules/mod_dnat_rules.go similarity index 94% rename from pkg/multicloud/huaweistack/client/modules/mod_dnat_rules.go rename to pkg/multicloud/hcso/client/modules/mod_dnat_rules.go index ac9a5ba5e6..8e9f9323b3 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_dnat_rules.go +++ b/pkg/multicloud/hcso/client/modules/mod_dnat_rules.go @@ -15,7 +15,7 @@ package modules import ( - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" ) type SNatDRuleManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_domains.go b/pkg/multicloud/hcso/client/modules/mod_domains.go similarity index 94% rename from pkg/multicloud/huaweistack/client/modules/mod_domains.go rename to pkg/multicloud/hcso/client/modules/mod_domains.go index e3daedfa1d..8daa63c3b1 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_domains.go +++ b/pkg/multicloud/hcso/client/modules/mod_domains.go @@ -15,7 +15,7 @@ package modules import ( - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" ) type SDomainManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_eips.go b/pkg/multicloud/hcso/client/modules/mod_eips.go similarity index 95% rename from pkg/multicloud/huaweistack/client/modules/mod_eips.go rename to pkg/multicloud/hcso/client/modules/mod_eips.go index 4f2bb59d1d..489ec813f8 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_eips.go +++ b/pkg/multicloud/hcso/client/modules/mod_eips.go @@ -17,7 +17,7 @@ package modules import ( "yunion.io/x/jsonutils" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" ) type SEipManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_elasticcache.go b/pkg/multicloud/hcso/client/modules/mod_elasticcache.go similarity index 96% rename from pkg/multicloud/huaweistack/client/modules/mod_elasticcache.go rename to pkg/multicloud/hcso/client/modules/mod_elasticcache.go index 3cdfb3f86f..351a93f09f 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_elasticcache.go +++ b/pkg/multicloud/hcso/client/modules/mod_elasticcache.go @@ -19,8 +19,8 @@ import ( "yunion.io/x/jsonutils" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/responses" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/responses" ) type SElasticcacheManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_endpoints.go b/pkg/multicloud/hcso/client/modules/mod_endpoints.go similarity index 94% rename from pkg/multicloud/huaweistack/client/modules/mod_endpoints.go rename to pkg/multicloud/hcso/client/modules/mod_endpoints.go index 5d31458b5a..0351fe36c2 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_endpoints.go +++ b/pkg/multicloud/hcso/client/modules/mod_endpoints.go @@ -15,7 +15,7 @@ package modules import ( - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" ) type SEndpointManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_enterpriceprojects.go b/pkg/multicloud/hcso/client/modules/mod_enterpriceprojects.go similarity index 94% rename from pkg/multicloud/huaweistack/client/modules/mod_enterpriceprojects.go rename to pkg/multicloud/hcso/client/modules/mod_enterpriceprojects.go index 8a2c9b0e3b..e169ece474 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_enterpriceprojects.go +++ b/pkg/multicloud/hcso/client/modules/mod_enterpriceprojects.go @@ -15,7 +15,7 @@ package modules import ( - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" ) type SEnterpriseProjectManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_flavors.go b/pkg/multicloud/hcso/client/modules/mod_flavors.go similarity index 94% rename from pkg/multicloud/huaweistack/client/modules/mod_flavors.go rename to pkg/multicloud/hcso/client/modules/mod_flavors.go index 7d44dcfffd..88ba90a6d8 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_flavors.go +++ b/pkg/multicloud/hcso/client/modules/mod_flavors.go @@ -15,7 +15,7 @@ package modules import ( - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" ) type SFlavorManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_groups.go b/pkg/multicloud/hcso/client/modules/mod_groups.go similarity index 96% rename from pkg/multicloud/huaweistack/client/modules/mod_groups.go rename to pkg/multicloud/hcso/client/modules/mod_groups.go index e56cd9ae89..71923f4380 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_groups.go +++ b/pkg/multicloud/hcso/client/modules/mod_groups.go @@ -20,8 +20,8 @@ import ( "yunion.io/x/pkg/errors" "yunion.io/x/onecloud/pkg/cloudprovider" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/responses" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/responses" ) type SGroupManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_images.go b/pkg/multicloud/hcso/client/modules/mod_images.go similarity index 95% rename from pkg/multicloud/huaweistack/client/modules/mod_images.go rename to pkg/multicloud/hcso/client/modules/mod_images.go index 12e35b7c91..bdc60ec868 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_images.go +++ b/pkg/multicloud/hcso/client/modules/mod_images.go @@ -18,8 +18,8 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/onecloud/pkg/httperrors" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/requests" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/requests" ) type SImageManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_interface.go b/pkg/multicloud/hcso/client/modules/mod_interface.go similarity index 94% rename from pkg/multicloud/huaweistack/client/modules/mod_interface.go rename to pkg/multicloud/hcso/client/modules/mod_interface.go index 8e8292546e..af521091f8 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_interface.go +++ b/pkg/multicloud/hcso/client/modules/mod_interface.go @@ -15,7 +15,7 @@ package modules import ( - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" ) type SInterfaceManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_jobs.go b/pkg/multicloud/hcso/client/modules/mod_jobs.go similarity index 93% rename from pkg/multicloud/huaweistack/client/modules/mod_jobs.go rename to pkg/multicloud/hcso/client/modules/mod_jobs.go index 7e1ed69bbe..c77846a9c4 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_jobs.go +++ b/pkg/multicloud/hcso/client/modules/mod_jobs.go @@ -19,8 +19,8 @@ import ( "yunion.io/x/jsonutils" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/responses" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/responses" ) type SJobManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_keypairs.go b/pkg/multicloud/hcso/client/modules/mod_keypairs.go similarity index 94% rename from pkg/multicloud/huaweistack/client/modules/mod_keypairs.go rename to pkg/multicloud/hcso/client/modules/mod_keypairs.go index 6cb968d5f0..b55d570ea5 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_keypairs.go +++ b/pkg/multicloud/hcso/client/modules/mod_keypairs.go @@ -15,7 +15,7 @@ package modules import ( - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" ) type SKeypairManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_loadbalancer_backend.go b/pkg/multicloud/hcso/client/modules/mod_loadbalancer_backend.go similarity index 96% rename from pkg/multicloud/huaweistack/client/modules/mod_loadbalancer_backend.go rename to pkg/multicloud/hcso/client/modules/mod_loadbalancer_backend.go index d9bdbb7797..6ed5848d7e 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_loadbalancer_backend.go +++ b/pkg/multicloud/hcso/client/modules/mod_loadbalancer_backend.go @@ -17,7 +17,7 @@ package modules import ( "fmt" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" ) type SElbBackendManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_loadbalancer_backend_group.go b/pkg/multicloud/hcso/client/modules/mod_loadbalancer_backend_group.go similarity index 94% rename from pkg/multicloud/huaweistack/client/modules/mod_loadbalancer_backend_group.go rename to pkg/multicloud/hcso/client/modules/mod_loadbalancer_backend_group.go index 2bf4af2261..d3d9dec2e2 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_loadbalancer_backend_group.go +++ b/pkg/multicloud/hcso/client/modules/mod_loadbalancer_backend_group.go @@ -15,7 +15,7 @@ package modules import ( - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" ) type SElbBackendGroupManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_loadbalancer_certificates.go b/pkg/multicloud/hcso/client/modules/mod_loadbalancer_certificates.go similarity index 94% rename from pkg/multicloud/huaweistack/client/modules/mod_loadbalancer_certificates.go rename to pkg/multicloud/hcso/client/modules/mod_loadbalancer_certificates.go index c533b0ca78..fe3b5710cb 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_loadbalancer_certificates.go +++ b/pkg/multicloud/hcso/client/modules/mod_loadbalancer_certificates.go @@ -15,7 +15,7 @@ package modules import ( - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" ) type SElbCertificatesManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_loadbalancer_healthcheck.go b/pkg/multicloud/hcso/client/modules/mod_loadbalancer_healthcheck.go similarity index 95% rename from pkg/multicloud/huaweistack/client/modules/mod_loadbalancer_healthcheck.go rename to pkg/multicloud/hcso/client/modules/mod_loadbalancer_healthcheck.go index c9799337fd..acd22a1c19 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_loadbalancer_healthcheck.go +++ b/pkg/multicloud/hcso/client/modules/mod_loadbalancer_healthcheck.go @@ -17,7 +17,7 @@ package modules import ( "yunion.io/x/jsonutils" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" ) type SElbHealthCheckManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_loadbalancer_listeners.go b/pkg/multicloud/hcso/client/modules/mod_loadbalancer_listeners.go similarity index 94% rename from pkg/multicloud/huaweistack/client/modules/mod_loadbalancer_listeners.go rename to pkg/multicloud/hcso/client/modules/mod_loadbalancer_listeners.go index ba7337ead4..6998878873 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_loadbalancer_listeners.go +++ b/pkg/multicloud/hcso/client/modules/mod_loadbalancer_listeners.go @@ -15,7 +15,7 @@ package modules import ( - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" ) type SElbListenersManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_loadbalancer_policies.go b/pkg/multicloud/hcso/client/modules/mod_loadbalancer_policies.go similarity index 94% rename from pkg/multicloud/huaweistack/client/modules/mod_loadbalancer_policies.go rename to pkg/multicloud/hcso/client/modules/mod_loadbalancer_policies.go index ed5f16206b..491f39772d 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_loadbalancer_policies.go +++ b/pkg/multicloud/hcso/client/modules/mod_loadbalancer_policies.go @@ -15,7 +15,7 @@ package modules import ( - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" ) type SElbL7policiesManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_loadbalancer_rules.go b/pkg/multicloud/hcso/client/modules/mod_loadbalancer_rules.go similarity index 96% rename from pkg/multicloud/huaweistack/client/modules/mod_loadbalancer_rules.go rename to pkg/multicloud/hcso/client/modules/mod_loadbalancer_rules.go index 564033d130..6d4ad51d68 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_loadbalancer_rules.go +++ b/pkg/multicloud/hcso/client/modules/mod_loadbalancer_rules.go @@ -17,7 +17,7 @@ package modules import ( "fmt" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" ) type SElbPoliciesManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_loadbalancer_whitelists.go b/pkg/multicloud/hcso/client/modules/mod_loadbalancer_whitelists.go similarity index 94% rename from pkg/multicloud/huaweistack/client/modules/mod_loadbalancer_whitelists.go rename to pkg/multicloud/hcso/client/modules/mod_loadbalancer_whitelists.go index 6fa888ddda..5bcc8046ef 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_loadbalancer_whitelists.go +++ b/pkg/multicloud/hcso/client/modules/mod_loadbalancer_whitelists.go @@ -15,7 +15,7 @@ package modules import ( - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" ) type SElbWhitelistManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_loadbalancers.go b/pkg/multicloud/hcso/client/modules/mod_loadbalancers.go similarity index 94% rename from pkg/multicloud/huaweistack/client/modules/mod_loadbalancers.go rename to pkg/multicloud/hcso/client/modules/mod_loadbalancers.go index 2ded3b962b..cb8d9d31a0 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_loadbalancers.go +++ b/pkg/multicloud/hcso/client/modules/mod_loadbalancers.go @@ -15,7 +15,7 @@ package modules import ( - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" ) type SLoadbalancerManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_mapping.go b/pkg/multicloud/hcso/client/modules/mod_mapping.go similarity index 94% rename from pkg/multicloud/huaweistack/client/modules/mod_mapping.go rename to pkg/multicloud/hcso/client/modules/mod_mapping.go index 5fb2610f9c..c0deaeab69 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_mapping.go +++ b/pkg/multicloud/hcso/client/modules/mod_mapping.go @@ -15,7 +15,7 @@ package modules import ( - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" ) type SAMLProviderMappingManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_natgateway.go b/pkg/multicloud/hcso/client/modules/mod_natgateway.go similarity index 90% rename from pkg/multicloud/huaweistack/client/modules/mod_natgateway.go rename to pkg/multicloud/hcso/client/modules/mod_natgateway.go index d3d83924d7..8405112b61 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_natgateway.go +++ b/pkg/multicloud/hcso/client/modules/mod_natgateway.go @@ -15,8 +15,8 @@ package modules import ( - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/requests" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/requests" ) type SNatGatewayManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_port.go b/pkg/multicloud/hcso/client/modules/mod_port.go similarity index 92% rename from pkg/multicloud/huaweistack/client/modules/mod_port.go rename to pkg/multicloud/hcso/client/modules/mod_port.go index d32e5b5b53..c3c17fb87e 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_port.go +++ b/pkg/multicloud/hcso/client/modules/mod_port.go @@ -15,8 +15,8 @@ package modules import ( - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/requests" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/requests" ) type SPortManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_projects.go b/pkg/multicloud/hcso/client/modules/mod_projects.go similarity index 94% rename from pkg/multicloud/huaweistack/client/modules/mod_projects.go rename to pkg/multicloud/hcso/client/modules/mod_projects.go index 6a7b2a7b9b..279823e112 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_projects.go +++ b/pkg/multicloud/hcso/client/modules/mod_projects.go @@ -15,7 +15,7 @@ package modules import ( - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" ) type SProjectManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_quotas.go b/pkg/multicloud/hcso/client/modules/mod_quotas.go similarity index 94% rename from pkg/multicloud/huaweistack/client/modules/mod_quotas.go rename to pkg/multicloud/hcso/client/modules/mod_quotas.go index 73451837bc..ac0915fb54 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_quotas.go +++ b/pkg/multicloud/hcso/client/modules/mod_quotas.go @@ -15,7 +15,7 @@ package modules import ( - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" ) type SQuotaManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_regions.go b/pkg/multicloud/hcso/client/modules/mod_regions.go similarity index 94% rename from pkg/multicloud/huaweistack/client/modules/mod_regions.go rename to pkg/multicloud/hcso/client/modules/mod_regions.go index d3162b922d..96a2bf6650 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_regions.go +++ b/pkg/multicloud/hcso/client/modules/mod_regions.go @@ -15,7 +15,7 @@ package modules import ( - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" ) type SRegionManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_roles.go b/pkg/multicloud/hcso/client/modules/mod_roles.go similarity index 94% rename from pkg/multicloud/huaweistack/client/modules/mod_roles.go rename to pkg/multicloud/hcso/client/modules/mod_roles.go index ba6772d8dd..7a131cec47 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_roles.go +++ b/pkg/multicloud/hcso/client/modules/mod_roles.go @@ -15,7 +15,7 @@ package modules import ( - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" ) type SRoleManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_saml_provider.go b/pkg/multicloud/hcso/client/modules/mod_saml_provider.go similarity index 94% rename from pkg/multicloud/huaweistack/client/modules/mod_saml_provider.go rename to pkg/multicloud/hcso/client/modules/mod_saml_provider.go index 3149c4e0e1..a026aa83d1 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_saml_provider.go +++ b/pkg/multicloud/hcso/client/modules/mod_saml_provider.go @@ -15,7 +15,7 @@ package modules import ( - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" ) type SAMLProviderManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_secgroup_rules.go b/pkg/multicloud/hcso/client/modules/mod_secgroup_rules.go similarity index 94% rename from pkg/multicloud/huaweistack/client/modules/mod_secgroup_rules.go rename to pkg/multicloud/hcso/client/modules/mod_secgroup_rules.go index 4b641666d1..73889e276e 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_secgroup_rules.go +++ b/pkg/multicloud/hcso/client/modules/mod_secgroup_rules.go @@ -15,7 +15,7 @@ package modules import ( - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" ) type SSecgroupRuleManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_secgroups.go b/pkg/multicloud/hcso/client/modules/mod_secgroups.go similarity index 95% rename from pkg/multicloud/huaweistack/client/modules/mod_secgroups.go rename to pkg/multicloud/hcso/client/modules/mod_secgroups.go index 6a6bfc1217..624a6ec2f4 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_secgroups.go +++ b/pkg/multicloud/hcso/client/modules/mod_secgroups.go @@ -15,7 +15,7 @@ package modules import ( - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" ) type SSecurityGroupManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_servers.go b/pkg/multicloud/hcso/client/modules/mod_servers.go similarity index 96% rename from pkg/multicloud/huaweistack/client/modules/mod_servers.go rename to pkg/multicloud/hcso/client/modules/mod_servers.go index 7942753447..0fdac628b0 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_servers.go +++ b/pkg/multicloud/hcso/client/modules/mod_servers.go @@ -21,8 +21,8 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/responses" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/responses" ) type SServerManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_services.go b/pkg/multicloud/hcso/client/modules/mod_services.go similarity index 94% rename from pkg/multicloud/huaweistack/client/modules/mod_services.go rename to pkg/multicloud/hcso/client/modules/mod_services.go index 7a874bf5dd..b0f736dfcb 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_services.go +++ b/pkg/multicloud/hcso/client/modules/mod_services.go @@ -15,7 +15,7 @@ package modules import ( - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" ) type SServiceManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_sfs.go b/pkg/multicloud/hcso/client/modules/mod_sfs.go similarity index 91% rename from pkg/multicloud/huaweistack/client/modules/mod_sfs.go rename to pkg/multicloud/hcso/client/modules/mod_sfs.go index 731a63e9a4..8e77901859 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_sfs.go +++ b/pkg/multicloud/hcso/client/modules/mod_sfs.go @@ -17,8 +17,8 @@ package modules import ( "yunion.io/x/jsonutils" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/responses" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/responses" ) type SfsTurboManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_snapshots.go b/pkg/multicloud/hcso/client/modules/mod_snapshots.go similarity index 93% rename from pkg/multicloud/huaweistack/client/modules/mod_snapshots.go rename to pkg/multicloud/hcso/client/modules/mod_snapshots.go index 82b0e7cf53..86a7cdd71b 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_snapshots.go +++ b/pkg/multicloud/hcso/client/modules/mod_snapshots.go @@ -15,8 +15,8 @@ package modules import ( - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/responses" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/responses" ) type SSnapshotManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_snat_rules.go b/pkg/multicloud/hcso/client/modules/mod_snat_rules.go similarity index 94% rename from pkg/multicloud/huaweistack/client/modules/mod_snat_rules.go rename to pkg/multicloud/hcso/client/modules/mod_snat_rules.go index 71d350e3e6..ba9d1fcb2c 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_snat_rules.go +++ b/pkg/multicloud/hcso/client/modules/mod_snat_rules.go @@ -15,7 +15,7 @@ package modules import ( - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" ) type SNatSRuleManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_subnets.go b/pkg/multicloud/hcso/client/modules/mod_subnets.go similarity index 94% rename from pkg/multicloud/huaweistack/client/modules/mod_subnets.go rename to pkg/multicloud/hcso/client/modules/mod_subnets.go index c57a8c65a3..786cc8b2eb 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_subnets.go +++ b/pkg/multicloud/hcso/client/modules/mod_subnets.go @@ -15,7 +15,7 @@ package modules import ( - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" ) type SSubnetManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_traces.go b/pkg/multicloud/hcso/client/modules/mod_traces.go similarity index 94% rename from pkg/multicloud/huaweistack/client/modules/mod_traces.go rename to pkg/multicloud/hcso/client/modules/mod_traces.go index 83af088aaf..71bd4bc951 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_traces.go +++ b/pkg/multicloud/hcso/client/modules/mod_traces.go @@ -15,7 +15,7 @@ package modules import ( - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" ) type STraceManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_users.go b/pkg/multicloud/hcso/client/modules/mod_users.go similarity index 93% rename from pkg/multicloud/huaweistack/client/modules/mod_users.go rename to pkg/multicloud/hcso/client/modules/mod_users.go index adc1f60ab8..a37956619e 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_users.go +++ b/pkg/multicloud/hcso/client/modules/mod_users.go @@ -19,8 +19,8 @@ import ( "yunion.io/x/jsonutils" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/responses" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/responses" ) type SUserManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_vpc_peerings.go b/pkg/multicloud/hcso/client/modules/mod_vpc_peerings.go similarity index 94% rename from pkg/multicloud/huaweistack/client/modules/mod_vpc_peerings.go rename to pkg/multicloud/hcso/client/modules/mod_vpc_peerings.go index 8c96ed1fd9..c06c173de3 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_vpc_peerings.go +++ b/pkg/multicloud/hcso/client/modules/mod_vpc_peerings.go @@ -15,7 +15,7 @@ package modules import ( - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" ) type SVpcPeeringManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_vpc_routes.go b/pkg/multicloud/hcso/client/modules/mod_vpc_routes.go similarity index 94% rename from pkg/multicloud/huaweistack/client/modules/mod_vpc_routes.go rename to pkg/multicloud/hcso/client/modules/mod_vpc_routes.go index 62615fd5c4..6f1fe97135 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_vpc_routes.go +++ b/pkg/multicloud/hcso/client/modules/mod_vpc_routes.go @@ -15,7 +15,7 @@ package modules import ( - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" ) type SVpcRouteManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_vpcs.go b/pkg/multicloud/hcso/client/modules/mod_vpcs.go similarity index 93% rename from pkg/multicloud/huaweistack/client/modules/mod_vpcs.go rename to pkg/multicloud/hcso/client/modules/mod_vpcs.go index b89585eaea..f0133887ea 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_vpcs.go +++ b/pkg/multicloud/hcso/client/modules/mod_vpcs.go @@ -15,7 +15,7 @@ package modules import ( - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" ) type SVpcManager struct { diff --git a/pkg/multicloud/huaweistack/client/modules/mod_zones.go b/pkg/multicloud/hcso/client/modules/mod_zones.go similarity index 94% rename from pkg/multicloud/huaweistack/client/modules/mod_zones.go rename to pkg/multicloud/hcso/client/modules/mod_zones.go index 00ca67d5fb..05d79116b1 100644 --- a/pkg/multicloud/huaweistack/client/modules/mod_zones.go +++ b/pkg/multicloud/hcso/client/modules/mod_zones.go @@ -15,7 +15,7 @@ package modules import ( - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" ) type SZoneManager struct { diff --git a/pkg/multicloud/huaweistack/client/requests/doc.go b/pkg/multicloud/hcso/client/requests/doc.go similarity index 95% rename from pkg/multicloud/huaweistack/client/requests/doc.go rename to pkg/multicloud/hcso/client/requests/doc.go index ba3824d718..b6c70dcf5b 100644 --- a/pkg/multicloud/huaweistack/client/requests/doc.go +++ b/pkg/multicloud/hcso/client/requests/doc.go @@ -12,4 +12,4 @@ // See the License for the specific language governing permissions and // limitations under the License. -package requests // import "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/requests" +package requests // import "yunion.io/x/onecloud/pkg/multicloud/hcso/client/requests" diff --git a/pkg/multicloud/huaweistack/client/requests/requests.go b/pkg/multicloud/hcso/client/requests/requests.go similarity index 100% rename from pkg/multicloud/huaweistack/client/requests/requests.go rename to pkg/multicloud/hcso/client/requests/requests.go diff --git a/pkg/multicloud/huaweistack/client/responses/doc.go b/pkg/multicloud/hcso/client/responses/doc.go similarity index 95% rename from pkg/multicloud/huaweistack/client/responses/doc.go rename to pkg/multicloud/hcso/client/responses/doc.go index 00cfe7867e..a6621472b0 100644 --- a/pkg/multicloud/huaweistack/client/responses/doc.go +++ b/pkg/multicloud/hcso/client/responses/doc.go @@ -12,4 +12,4 @@ // See the License for the specific language governing permissions and // limitations under the License. -package responses // import "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/responses" +package responses // import "yunion.io/x/onecloud/pkg/multicloud/hcso/client/responses" diff --git a/pkg/multicloud/huaweistack/client/responses/responses.go b/pkg/multicloud/hcso/client/responses/responses.go similarity index 100% rename from pkg/multicloud/huaweistack/client/responses/responses.go rename to pkg/multicloud/hcso/client/responses/responses.go diff --git a/pkg/multicloud/huaweistack/client/responses/responses_test.go b/pkg/multicloud/hcso/client/responses/responses_test.go similarity index 100% rename from pkg/multicloud/huaweistack/client/responses/responses_test.go rename to pkg/multicloud/hcso/client/responses/responses_test.go diff --git a/pkg/multicloud/huaweistack/cloudgroup.go b/pkg/multicloud/hcso/cloudgroup.go similarity index 99% rename from pkg/multicloud/huaweistack/cloudgroup.go rename to pkg/multicloud/hcso/cloudgroup.go index 52481321ad..570805c7dd 100644 --- a/pkg/multicloud/huaweistack/cloudgroup.go +++ b/pkg/multicloud/hcso/cloudgroup.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "fmt" diff --git a/pkg/multicloud/huaweistack/clouduser.go b/pkg/multicloud/hcso/clouduser.go similarity index 98% rename from pkg/multicloud/huaweistack/clouduser.go rename to pkg/multicloud/hcso/clouduser.go index 3a545c60e5..8165ad659b 100644 --- a/pkg/multicloud/huaweistack/clouduser.go +++ b/pkg/multicloud/hcso/clouduser.go @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "yunion.io/x/jsonutils" "yunion.io/x/pkg/errors" "yunion.io/x/onecloud/pkg/cloudprovider" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/modules" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/modules" ) type SLink struct { diff --git a/pkg/multicloud/huaweistack/consts.go b/pkg/multicloud/hcso/consts.go similarity index 99% rename from pkg/multicloud/huaweistack/consts.go rename to pkg/multicloud/hcso/consts.go index 3a8db71130..bcc037c526 100644 --- a/pkg/multicloud/huaweistack/consts.go +++ b/pkg/multicloud/hcso/consts.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso // 华为云返回的时间格式 const DATETIME_FORMAT = "2006-01-02T15:04:05.999999999" diff --git a/pkg/multicloud/huaweistack/dbinstance.go b/pkg/multicloud/hcso/dbinstance.go similarity index 99% rename from pkg/multicloud/huaweistack/dbinstance.go rename to pkg/multicloud/hcso/dbinstance.go index 41298389e1..e1d6a2e51b 100644 --- a/pkg/multicloud/huaweistack/dbinstance.go +++ b/pkg/multicloud/hcso/dbinstance.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "context" diff --git a/pkg/multicloud/huaweistack/dbinstance_account.go b/pkg/multicloud/hcso/dbinstance_account.go similarity index 99% rename from pkg/multicloud/huaweistack/dbinstance_account.go rename to pkg/multicloud/hcso/dbinstance_account.go index 56a0a919bb..28e13d9fe0 100644 --- a/pkg/multicloud/huaweistack/dbinstance_account.go +++ b/pkg/multicloud/hcso/dbinstance_account.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "fmt" diff --git a/pkg/multicloud/huaweistack/dbinstance_backup.go b/pkg/multicloud/hcso/dbinstance_backup.go similarity index 99% rename from pkg/multicloud/huaweistack/dbinstance_backup.go rename to pkg/multicloud/hcso/dbinstance_backup.go index 808708dbc5..30f9d9e5b9 100644 --- a/pkg/multicloud/huaweistack/dbinstance_backup.go +++ b/pkg/multicloud/hcso/dbinstance_backup.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "time" diff --git a/pkg/multicloud/huaweistack/dbinstance_database.go b/pkg/multicloud/hcso/dbinstance_database.go similarity index 99% rename from pkg/multicloud/huaweistack/dbinstance_database.go rename to pkg/multicloud/hcso/dbinstance_database.go index 87d95e5a80..6cc9d5b7df 100644 --- a/pkg/multicloud/huaweistack/dbinstance_database.go +++ b/pkg/multicloud/hcso/dbinstance_database.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "fmt" diff --git a/pkg/multicloud/huaweistack/dbinstance_parameter.go b/pkg/multicloud/hcso/dbinstance_parameter.go similarity index 98% rename from pkg/multicloud/huaweistack/dbinstance_parameter.go rename to pkg/multicloud/hcso/dbinstance_parameter.go index 9ac9e912dc..e475dca585 100644 --- a/pkg/multicloud/huaweistack/dbinstance_parameter.go +++ b/pkg/multicloud/hcso/dbinstance_parameter.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso type SDBInstanceParameter struct { instance *SDBInstance diff --git a/pkg/multicloud/huaweistack/dbinstance_privilege.go b/pkg/multicloud/hcso/dbinstance_privilege.go similarity index 98% rename from pkg/multicloud/huaweistack/dbinstance_privilege.go rename to pkg/multicloud/hcso/dbinstance_privilege.go index f7dc7f1347..ae8b754c96 100644 --- a/pkg/multicloud/huaweistack/dbinstance_privilege.go +++ b/pkg/multicloud/hcso/dbinstance_privilege.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "fmt" diff --git a/pkg/multicloud/huaweistack/dbinstance_skus.go b/pkg/multicloud/hcso/dbinstance_skus.go similarity index 99% rename from pkg/multicloud/huaweistack/dbinstance_skus.go rename to pkg/multicloud/hcso/dbinstance_skus.go index edd7744d16..08181612fb 100644 --- a/pkg/multicloud/huaweistack/dbinstance_skus.go +++ b/pkg/multicloud/hcso/dbinstance_skus.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "fmt" diff --git a/pkg/multicloud/huaweistack/disk.go b/pkg/multicloud/hcso/disk.go similarity index 99% rename from pkg/multicloud/huaweistack/disk.go rename to pkg/multicloud/hcso/disk.go index d966ce9dc5..2eadedc1ab 100644 --- a/pkg/multicloud/huaweistack/disk.go +++ b/pkg/multicloud/hcso/disk.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "context" diff --git a/pkg/multicloud/huaweistack/disktype.go b/pkg/multicloud/hcso/disktype.go similarity index 98% rename from pkg/multicloud/huaweistack/disktype.go rename to pkg/multicloud/hcso/disktype.go index f4ac9c0dc0..fffd09cbcb 100644 --- a/pkg/multicloud/huaweistack/disktype.go +++ b/pkg/multicloud/hcso/disktype.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import "strings" diff --git a/pkg/multicloud/huaweistack/client/auth/doc.go b/pkg/multicloud/hcso/doc.go similarity index 87% rename from pkg/multicloud/huaweistack/client/auth/doc.go rename to pkg/multicloud/hcso/doc.go index 758342c1e1..fdc6ab1b71 100644 --- a/pkg/multicloud/huaweistack/client/auth/doc.go +++ b/pkg/multicloud/hcso/doc.go @@ -12,4 +12,4 @@ // See the License for the specific language governing permissions and // limitations under the License. -package auth // import "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/auth" +package hcso // import huawei "yunion.io/x/onecloud/pkg/multicloud/hcso" diff --git a/pkg/multicloud/huaweistack/domain.go b/pkg/multicloud/hcso/domain.go similarity index 98% rename from pkg/multicloud/huaweistack/domain.go rename to pkg/multicloud/hcso/domain.go index 134e565745..f8285e5803 100644 --- a/pkg/multicloud/huaweistack/domain.go +++ b/pkg/multicloud/hcso/domain.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso // https://support.huaweicloud.com/api-iam/zh-cn_topic_0057845574.html // 租户列表 diff --git a/pkg/multicloud/huaweistack/eip.go b/pkg/multicloud/hcso/eip.go similarity index 99% rename from pkg/multicloud/huaweistack/eip.go rename to pkg/multicloud/hcso/eip.go index 657f954163..b63e802c06 100644 --- a/pkg/multicloud/huaweistack/eip.go +++ b/pkg/multicloud/hcso/eip.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "fmt" diff --git a/pkg/multicloud/huaweistack/elasticcache_account.go b/pkg/multicloud/hcso/elasticcache_account.go similarity index 99% rename from pkg/multicloud/huaweistack/elasticcache_account.go rename to pkg/multicloud/hcso/elasticcache_account.go index b68fa5c01a..404ef9d4e5 100644 --- a/pkg/multicloud/huaweistack/elasticcache_account.go +++ b/pkg/multicloud/hcso/elasticcache_account.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "fmt" diff --git a/pkg/multicloud/huaweistack/elasticcache_acl.go b/pkg/multicloud/hcso/elasticcache_acl.go similarity index 96% rename from pkg/multicloud/huaweistack/elasticcache_acl.go rename to pkg/multicloud/hcso/elasticcache_acl.go index b81898ecb5..e8a77b8aaa 100644 --- a/pkg/multicloud/huaweistack/elasticcache_acl.go +++ b/pkg/multicloud/hcso/elasticcache_acl.go @@ -12,4 +12,4 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso diff --git a/pkg/multicloud/huaweistack/elasticcache_backup.go b/pkg/multicloud/hcso/elasticcache_backup.go similarity index 99% rename from pkg/multicloud/huaweistack/elasticcache_backup.go rename to pkg/multicloud/hcso/elasticcache_backup.go index 084ba43e9e..38f483862c 100644 --- a/pkg/multicloud/huaweistack/elasticcache_backup.go +++ b/pkg/multicloud/hcso/elasticcache_backup.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "time" diff --git a/pkg/multicloud/huaweistack/elasticcache_instance.go b/pkg/multicloud/hcso/elasticcache_instance.go similarity index 99% rename from pkg/multicloud/huaweistack/elasticcache_instance.go rename to pkg/multicloud/hcso/elasticcache_instance.go index 3218b09b68..b9eb069b23 100644 --- a/pkg/multicloud/huaweistack/elasticcache_instance.go +++ b/pkg/multicloud/hcso/elasticcache_instance.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "fmt" diff --git a/pkg/multicloud/huaweistack/elasticcache_parameter.go b/pkg/multicloud/hcso/elasticcache_parameter.go similarity index 99% rename from pkg/multicloud/huaweistack/elasticcache_parameter.go rename to pkg/multicloud/hcso/elasticcache_parameter.go index 39a88437ac..99d974ce97 100644 --- a/pkg/multicloud/huaweistack/elasticcache_parameter.go +++ b/pkg/multicloud/hcso/elasticcache_parameter.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "fmt" diff --git a/pkg/multicloud/huaweistack/enterpriceprojects.go b/pkg/multicloud/hcso/enterpriceprojects.go similarity index 99% rename from pkg/multicloud/huaweistack/enterpriceprojects.go rename to pkg/multicloud/hcso/enterpriceprojects.go index 4d3ac12dd9..9f979839d8 100644 --- a/pkg/multicloud/huaweistack/enterpriceprojects.go +++ b/pkg/multicloud/hcso/enterpriceprojects.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "strings" diff --git a/pkg/multicloud/huaweistack/host.go b/pkg/multicloud/hcso/host.go similarity index 99% rename from pkg/multicloud/huaweistack/host.go rename to pkg/multicloud/hcso/host.go index cebda49ffe..ef6ad4da22 100644 --- a/pkg/multicloud/huaweistack/host.go +++ b/pkg/multicloud/hcso/host.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "fmt" @@ -192,7 +192,7 @@ func (self *SHost) GetStorageType() string { } func (self *SHost) GetHostType() string { - return api.HOST_TYPE_HUAWEI_CLOUD_STACK + return api.HOST_TYPE_HCSO } func (self *SHost) GetIsMaintenance() bool { diff --git a/pkg/multicloud/huaweistack/huawei.go b/pkg/multicloud/hcso/huawei.go similarity index 96% rename from pkg/multicloud/huaweistack/huawei.go rename to pkg/multicloud/hcso/huawei.go index 6137439a7b..70f5196a83 100644 --- a/pkg/multicloud/huaweistack/huawei.go +++ b/pkg/multicloud/hcso/huawei.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "fmt" @@ -26,9 +26,9 @@ import ( api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/multicloud/huawei/obs" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/auth" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/auth/credentials" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/auth" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/auth/credentials" ) /* @@ -38,9 +38,9 @@ import ( */ const ( - CLOUD_PROVIDER_HUAWEI = api.CLOUD_PROVIDER_HUAWEI_CLOUD_STACK + CLOUD_PROVIDER_HUAWEI = api.CLOUD_PROVIDER_HCSO CLOUD_PROVIDER_HUAWEI_CN = "华为云Stack" - CLOUD_PROVIDER_HUAWEI_EN = "HuaweiCloudStack" + CLOUD_PROVIDER_HUAWEI_EN = "HCSO" HUAWEI_API_VERSION = "" ) @@ -55,7 +55,7 @@ type userRegionsCache struct { type HuaweiClientConfig struct { cpcfg cloudprovider.ProviderConfig - endpoints *cloudprovider.SHuaweiCloudStackEndpoints + endpoints *cloudprovider.SHCSOEndpoints projectId string // 华为云项目ID. accessKey string @@ -64,7 +64,7 @@ type HuaweiClientConfig struct { debug bool } -func NewHuaweiClientConfig(accessKey, accessSecret, projectId string, endpoints *cloudprovider.SHuaweiCloudStackEndpoints) *HuaweiClientConfig { +func NewHuaweiClientConfig(accessKey, accessSecret, projectId string, endpoints *cloudprovider.SHCSOEndpoints) *HuaweiClientConfig { cfg := &HuaweiClientConfig{ projectId: projectId, accessKey: accessKey, @@ -243,7 +243,7 @@ func getOBSEndpoint(regionId string) string { } func (client *SHuaweiClient) getOBSClient(regionId string) (*obs.ObsClient, error) { - endpoint := client.cpcfg.SHuaweiCloudStackEndpoints.GetEndpoint("obs", regionId) + endpoint := client.cpcfg.SHCSOEndpoints.GetEndpoint("obs", regionId) return obs.New(client.accessKey, client.accessSecret, endpoint) } diff --git a/pkg/multicloud/huaweistack/image.go b/pkg/multicloud/hcso/image.go similarity index 99% rename from pkg/multicloud/huaweistack/image.go rename to pkg/multicloud/hcso/image.go index 84ad7c8a1b..22dba0d504 100644 --- a/pkg/multicloud/huaweistack/image.go +++ b/pkg/multicloud/hcso/image.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "context" diff --git a/pkg/multicloud/huaweistack/instance.go b/pkg/multicloud/hcso/instance.go similarity index 99% rename from pkg/multicloud/huaweistack/instance.go rename to pkg/multicloud/hcso/instance.go index b846bc6b0e..6dcba0b0f8 100644 --- a/pkg/multicloud/huaweistack/instance.go +++ b/pkg/multicloud/hcso/instance.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "context" @@ -34,7 +34,7 @@ import ( api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/multicloud" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/modules" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/modules" "yunion.io/x/onecloud/pkg/util/billing" "yunion.io/x/onecloud/pkg/util/cloudinit" ) @@ -502,7 +502,7 @@ func (self *SInstance) SetSecurityGroups(secgroupIds []string) error { } func (self *SInstance) GetHypervisor() string { - return api.HYPERVISOR_HUAWEI_CLOUD_STACK + return api.HYPERVISOR_HCSO } func (self *SInstance) StartVM(ctx context.Context) error { diff --git a/pkg/multicloud/huaweistack/instancenic.go b/pkg/multicloud/hcso/instancenic.go similarity index 97% rename from pkg/multicloud/huaweistack/instancenic.go rename to pkg/multicloud/hcso/instancenic.go index 4e54b45bd2..3cd08dda79 100644 --- a/pkg/multicloud/huaweistack/instancenic.go +++ b/pkg/multicloud/hcso/instancenic.go @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "yunion.io/x/log" "yunion.io/x/onecloud/pkg/cloudprovider" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/modules" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/modules" ) // =========================================== diff --git a/pkg/multicloud/huaweistack/instancetype.go b/pkg/multicloud/hcso/instancetype.go similarity index 99% rename from pkg/multicloud/huaweistack/instancetype.go rename to pkg/multicloud/hcso/instancetype.go index c9d276b63a..0f19025928 100644 --- a/pkg/multicloud/huaweistack/instancetype.go +++ b/pkg/multicloud/hcso/instancetype.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "strconv" diff --git a/pkg/multicloud/huaweistack/keypair.go b/pkg/multicloud/hcso/keypair.go similarity index 99% rename from pkg/multicloud/huaweistack/keypair.go rename to pkg/multicloud/hcso/keypair.go index 9f8a1e17d7..82462bb38a 100644 --- a/pkg/multicloud/huaweistack/keypair.go +++ b/pkg/multicloud/hcso/keypair.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "fmt" diff --git a/pkg/multicloud/huaweistack/latitud_and_longitude.go b/pkg/multicloud/hcso/latitud_and_longitude.go similarity index 99% rename from pkg/multicloud/huaweistack/latitud_and_longitude.go rename to pkg/multicloud/hcso/latitud_and_longitude.go index 2316170a47..74d4ff2477 100644 --- a/pkg/multicloud/huaweistack/latitud_and_longitude.go +++ b/pkg/multicloud/hcso/latitud_and_longitude.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( api "yunion.io/x/onecloud/pkg/apis/compute" diff --git a/pkg/multicloud/huaweistack/loadbalancer.go b/pkg/multicloud/hcso/loadbalancer.go similarity index 99% rename from pkg/multicloud/huaweistack/loadbalancer.go rename to pkg/multicloud/hcso/loadbalancer.go index b19434df32..a634248f25 100644 --- a/pkg/multicloud/huaweistack/loadbalancer.go +++ b/pkg/multicloud/hcso/loadbalancer.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "context" diff --git a/pkg/multicloud/huaweistack/loadbalancer_acl.go b/pkg/multicloud/hcso/loadbalancer_acl.go similarity index 99% rename from pkg/multicloud/huaweistack/loadbalancer_acl.go rename to pkg/multicloud/hcso/loadbalancer_acl.go index bc892f2d7f..43da0d0fbb 100644 --- a/pkg/multicloud/huaweistack/loadbalancer_acl.go +++ b/pkg/multicloud/hcso/loadbalancer_acl.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "strings" diff --git a/pkg/multicloud/huaweistack/loadbalancer_backend.go b/pkg/multicloud/hcso/loadbalancer_backend.go similarity index 99% rename from pkg/multicloud/huaweistack/loadbalancer_backend.go rename to pkg/multicloud/hcso/loadbalancer_backend.go index 6eb386fc66..2a36d80eb4 100644 --- a/pkg/multicloud/huaweistack/loadbalancer_backend.go +++ b/pkg/multicloud/hcso/loadbalancer_backend.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "context" diff --git a/pkg/multicloud/huaweistack/loadbalancer_backendgroup.go b/pkg/multicloud/hcso/loadbalancer_backendgroup.go similarity index 99% rename from pkg/multicloud/huaweistack/loadbalancer_backendgroup.go rename to pkg/multicloud/hcso/loadbalancer_backendgroup.go index 6e0124fda9..e5ea22f95a 100644 --- a/pkg/multicloud/huaweistack/loadbalancer_backendgroup.go +++ b/pkg/multicloud/hcso/loadbalancer_backendgroup.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "context" diff --git a/pkg/multicloud/huaweistack/loadbalancer_cert.go b/pkg/multicloud/hcso/loadbalancer_cert.go similarity index 99% rename from pkg/multicloud/huaweistack/loadbalancer_cert.go rename to pkg/multicloud/hcso/loadbalancer_cert.go index d4d4ec3575..25f94b651b 100644 --- a/pkg/multicloud/huaweistack/loadbalancer_cert.go +++ b/pkg/multicloud/hcso/loadbalancer_cert.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "crypto/sha1" diff --git a/pkg/multicloud/huaweistack/loadbalancer_healthcheck.go b/pkg/multicloud/hcso/loadbalancer_healthcheck.go similarity index 98% rename from pkg/multicloud/huaweistack/loadbalancer_healthcheck.go rename to pkg/multicloud/hcso/loadbalancer_healthcheck.go index 6e8fe86749..e3e90675b2 100644 --- a/pkg/multicloud/huaweistack/loadbalancer_healthcheck.go +++ b/pkg/multicloud/hcso/loadbalancer_healthcheck.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso type SElbHealthCheck struct { region *SRegion diff --git a/pkg/multicloud/huaweistack/loadbalancer_listener.go b/pkg/multicloud/hcso/loadbalancer_listener.go similarity index 99% rename from pkg/multicloud/huaweistack/loadbalancer_listener.go rename to pkg/multicloud/hcso/loadbalancer_listener.go index 8ff1e658ef..17a7c816c3 100644 --- a/pkg/multicloud/huaweistack/loadbalancer_listener.go +++ b/pkg/multicloud/hcso/loadbalancer_listener.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "context" diff --git a/pkg/multicloud/huaweistack/loadbalancer_listener_rule.go b/pkg/multicloud/hcso/loadbalancer_listener_rule.go similarity index 99% rename from pkg/multicloud/huaweistack/loadbalancer_listener_rule.go rename to pkg/multicloud/hcso/loadbalancer_listener_rule.go index 27db45a133..ccc7ffdfcd 100644 --- a/pkg/multicloud/huaweistack/loadbalancer_listener_rule.go +++ b/pkg/multicloud/hcso/loadbalancer_listener_rule.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "context" diff --git a/pkg/multicloud/huaweistack/monitor.go b/pkg/multicloud/hcso/monitor.go similarity index 97% rename from pkg/multicloud/huaweistack/monitor.go rename to pkg/multicloud/hcso/monitor.go index d0600131ef..d330977c2f 100644 --- a/pkg/multicloud/huaweistack/monitor.go +++ b/pkg/multicloud/hcso/monitor.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "time" diff --git a/pkg/multicloud/huaweistack/nat_skus.go b/pkg/multicloud/hcso/nat_skus.go similarity index 99% rename from pkg/multicloud/huaweistack/nat_skus.go rename to pkg/multicloud/hcso/nat_skus.go index 324da78ee8..93bf85c7d5 100644 --- a/pkg/multicloud/huaweistack/nat_skus.go +++ b/pkg/multicloud/hcso/nat_skus.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( api "yunion.io/x/onecloud/pkg/apis/compute" diff --git a/pkg/multicloud/huaweistack/natdtable.go b/pkg/multicloud/hcso/natdtable.go similarity index 99% rename from pkg/multicloud/huaweistack/natdtable.go rename to pkg/multicloud/hcso/natdtable.go index 20faa3e13d..28aa2aa47e 100644 --- a/pkg/multicloud/huaweistack/natdtable.go +++ b/pkg/multicloud/hcso/natdtable.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "yunion.io/x/jsonutils" diff --git a/pkg/multicloud/huaweistack/natgateway.go b/pkg/multicloud/hcso/natgateway.go similarity index 99% rename from pkg/multicloud/huaweistack/natgateway.go rename to pkg/multicloud/hcso/natgateway.go index 872a7b82f8..4a292e5517 100644 --- a/pkg/multicloud/huaweistack/natgateway.go +++ b/pkg/multicloud/hcso/natgateway.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "strings" diff --git a/pkg/multicloud/huaweistack/natstable.go b/pkg/multicloud/hcso/natstable.go similarity index 99% rename from pkg/multicloud/huaweistack/natstable.go rename to pkg/multicloud/hcso/natstable.go index 83a7a3b4fe..da6f98a337 100644 --- a/pkg/multicloud/huaweistack/natstable.go +++ b/pkg/multicloud/hcso/natstable.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "yunion.io/x/jsonutils" diff --git a/pkg/multicloud/huaweistack/network.go b/pkg/multicloud/hcso/network.go similarity index 98% rename from pkg/multicloud/huaweistack/network.go rename to pkg/multicloud/hcso/network.go index 5415f15f2d..e7a4289472 100644 --- a/pkg/multicloud/huaweistack/network.go +++ b/pkg/multicloud/hcso/network.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "yunion.io/x/jsonutils" @@ -22,7 +22,7 @@ import ( api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/multicloud" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/modules" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/modules" "yunion.io/x/onecloud/pkg/util/rbacutils" ) diff --git a/pkg/multicloud/huaweistack/object.go b/pkg/multicloud/hcso/object.go similarity index 99% rename from pkg/multicloud/huaweistack/object.go rename to pkg/multicloud/hcso/object.go index 1d0414d65b..b94abecceb 100644 --- a/pkg/multicloud/huaweistack/object.go +++ b/pkg/multicloud/hcso/object.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "context" diff --git a/pkg/multicloud/huaweistack/order.go b/pkg/multicloud/hcso/order.go similarity index 99% rename from pkg/multicloud/huaweistack/order.go rename to pkg/multicloud/hcso/order.go index 1b783b24d5..6d4a0ec5c7 100644 --- a/pkg/multicloud/huaweistack/order.go +++ b/pkg/multicloud/hcso/order.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "fmt" diff --git a/pkg/multicloud/huaweistack/port.go b/pkg/multicloud/hcso/port.go similarity index 99% rename from pkg/multicloud/huaweistack/port.go rename to pkg/multicloud/hcso/port.go index cb865b0c22..56739286a4 100644 --- a/pkg/multicloud/huaweistack/port.go +++ b/pkg/multicloud/hcso/port.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "strings" diff --git a/pkg/multicloud/huaweistack/project.go b/pkg/multicloud/hcso/project.go similarity index 99% rename from pkg/multicloud/huaweistack/project.go rename to pkg/multicloud/hcso/project.go index 411457d705..dd0f9a4b4f 100644 --- a/pkg/multicloud/huaweistack/project.go +++ b/pkg/multicloud/hcso/project.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "fmt" diff --git a/pkg/multicloud/huaweistack/provider/doc.go b/pkg/multicloud/hcso/provider/doc.go similarity index 96% rename from pkg/multicloud/huaweistack/provider/doc.go rename to pkg/multicloud/hcso/provider/doc.go index d2c13154ea..04fcb650c2 100644 --- a/pkg/multicloud/huaweistack/provider/doc.go +++ b/pkg/multicloud/hcso/provider/doc.go @@ -12,4 +12,4 @@ // See the License for the specific language governing permissions and // limitations under the License. -package provider // import "yunion.io/x/onecloud/pkg/multicloud/huaweistack/provider" +package provider // import "yunion.io/x/onecloud/pkg/multicloud/hcso/provider" diff --git a/pkg/multicloud/huaweistack/provider/provider.go b/pkg/multicloud/hcso/provider/provider.go similarity index 50% rename from pkg/multicloud/huaweistack/provider/provider.go rename to pkg/multicloud/hcso/provider/provider.go index 5bd1fab644..3df6f8dd02 100644 --- a/pkg/multicloud/huaweistack/provider/provider.go +++ b/pkg/multicloud/hcso/provider/provider.go @@ -25,66 +25,66 @@ import ( "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/httperrors" "yunion.io/x/onecloud/pkg/mcclient" - huawei "yunion.io/x/onecloud/pkg/multicloud/huaweistack" + huawei "yunion.io/x/onecloud/pkg/multicloud/hcso" ) -type SHuaweiCloudStackProviderFactory struct { +type SHCSOProviderFactory struct { cloudprovider.SPrivateCloudBaseProviderFactory } -func (self *SHuaweiCloudStackProviderFactory) GetId() string { +func (self *SHCSOProviderFactory) GetId() string { return huawei.CLOUD_PROVIDER_HUAWEI } -func (self *SHuaweiCloudStackProviderFactory) GetName() string { +func (self *SHCSOProviderFactory) GetName() string { return huawei.CLOUD_PROVIDER_HUAWEI_CN } -func (self *SHuaweiCloudStackProviderFactory) IsCloudeventRegional() bool { +func (self *SHCSOProviderFactory) IsCloudeventRegional() bool { return true } -func (self *SHuaweiCloudStackProviderFactory) GetMaxCloudEventSyncDays() int { +func (self *SHCSOProviderFactory) GetMaxCloudEventSyncDays() int { return 7 } -func (self *SHuaweiCloudStackProviderFactory) GetMaxCloudEventKeepDays() int { +func (self *SHCSOProviderFactory) GetMaxCloudEventKeepDays() int { return 7 } -func (self *SHuaweiCloudStackProviderFactory) IsSupportCloudIdService() bool { +func (self *SHCSOProviderFactory) IsSupportCloudIdService() bool { return true } -func (self *SHuaweiCloudStackProviderFactory) IsSupportClouduserPolicy() bool { +func (self *SHCSOProviderFactory) IsSupportClouduserPolicy() bool { return false } -func (self *SHuaweiCloudStackProviderFactory) IsSupportCreateCloudgroup() bool { +func (self *SHCSOProviderFactory) IsSupportCreateCloudgroup() bool { return true } -func (factory *SHuaweiCloudStackProviderFactory) IsSupportCrossCloudEnvVpcPeering() bool { +func (factory *SHCSOProviderFactory) IsSupportCrossCloudEnvVpcPeering() bool { return false } -func (factory *SHuaweiCloudStackProviderFactory) IsSupportCrossRegionVpcPeering() bool { +func (factory *SHCSOProviderFactory) IsSupportCrossRegionVpcPeering() bool { return false } -func (factory *SHuaweiCloudStackProviderFactory) IsSupportVpcPeeringVpcCidrOverlap() bool { +func (factory *SHCSOProviderFactory) IsSupportVpcPeeringVpcCidrOverlap() bool { return true } -func (factory *SHuaweiCloudStackProviderFactory) IsSupportModifyRouteTable() bool { +func (factory *SHCSOProviderFactory) IsSupportModifyRouteTable() bool { return true } -func (factory *SHuaweiCloudStackProviderFactory) IsSupportSAMLAuth() bool { +func (factory *SHCSOProviderFactory) IsSupportSAMLAuth() bool { return true } -func (self *SHuaweiCloudStackProviderFactory) ValidateCreateCloudaccountData(ctx context.Context, userCred mcclient.TokenCredential, input cloudprovider.SCloudaccountCredential) (cloudprovider.SCloudaccount, error) { +func (self *SHCSOProviderFactory) ValidateCreateCloudaccountData(ctx context.Context, userCred mcclient.TokenCredential, input cloudprovider.SCloudaccountCredential) (cloudprovider.SCloudaccount, error) { output := cloudprovider.SCloudaccount{} if len(input.AccessKeyId) == 0 { return output, errors.Wrap(httperrors.ErrMissingParameter, "access_key_id") @@ -93,15 +93,15 @@ func (self *SHuaweiCloudStackProviderFactory) ValidateCreateCloudaccountData(ctx return output, errors.Wrap(httperrors.ErrMissingParameter, "access_key_secret") } - if input.SHuaweiCloudStackEndpoints == nil { + if input.SHCSOEndpoints == nil { return output, errors.Wrap(httperrors.ErrMissingParameter, "cloud_stack_endpoints") } - if len(input.SHuaweiCloudStackEndpoints.DefaultRegion) == 0 { + if len(input.SHCSOEndpoints.DefaultRegion) == 0 { return output, errors.Wrap(httperrors.ErrMissingParameter, "default_region") } - if len(input.SHuaweiCloudStackEndpoints.EndpointDomain) == 0 { + if len(input.SHCSOEndpoints.EndpointDomain) == 0 { return output, errors.Wrap(httperrors.ErrMissingParameter, "endpoint_domain") } @@ -110,7 +110,7 @@ func (self *SHuaweiCloudStackProviderFactory) ValidateCreateCloudaccountData(ctx return output, nil } -func (self *SHuaweiCloudStackProviderFactory) ValidateUpdateCloudaccountCredential(ctx context.Context, userCred mcclient.TokenCredential, input cloudprovider.SCloudaccountCredential, cloudaccount string) (cloudprovider.SCloudaccount, error) { +func (self *SHCSOProviderFactory) ValidateUpdateCloudaccountCredential(ctx context.Context, userCred mcclient.TokenCredential, input cloudprovider.SCloudaccountCredential, cloudaccount string) (cloudprovider.SCloudaccount, error) { output := cloudprovider.SCloudaccount{} if len(input.AccessKeyId) == 0 { return output, errors.Wrap(httperrors.ErrMissingParameter, "access_key_id") @@ -119,12 +119,12 @@ func (self *SHuaweiCloudStackProviderFactory) ValidateUpdateCloudaccountCredenti return output, errors.Wrap(httperrors.ErrMissingParameter, "access_key_secret") } - if input.SHuaweiCloudStackEndpoints != nil { - if len(input.SHuaweiCloudStackEndpoints.DefaultRegion) == 0 { + if input.SHCSOEndpoints != nil { + if len(input.SHCSOEndpoints.DefaultRegion) == 0 { return output, errors.Wrap(httperrors.ErrMissingParameter, "default_region") } - if len(input.SHuaweiCloudStackEndpoints.EndpointDomain) == 0 { + if len(input.SHCSOEndpoints.EndpointDomain) == 0 { return output, errors.Wrap(httperrors.ErrMissingParameter, "endpoint_domain") } } @@ -149,23 +149,23 @@ func parseAccount(account string) (accessKey string, projectId string) { return } -func (self *SHuaweiCloudStackProviderFactory) GetProvider(cfg cloudprovider.ProviderConfig) (cloudprovider.ICloudProvider, error) { +func (self *SHCSOProviderFactory) GetProvider(cfg cloudprovider.ProviderConfig) (cloudprovider.ICloudProvider, error) { accessKey, project_id := parseAccount(cfg.Account) client, err := huawei.NewHuaweiClient( huawei.NewHuaweiClientConfig( - accessKey, cfg.Secret, project_id, &cfg.SHuaweiCloudStackEndpoints, + accessKey, cfg.Secret, project_id, &cfg.SHCSOEndpoints, ).CloudproviderConfig(cfg), ) if err != nil { return nil, err } - return &SHuaweiCloudStackProvider{ + return &SHCSOProvider{ SBaseProvider: cloudprovider.NewBaseProvider(self), client: client, }, nil } -func (self *SHuaweiCloudStackProviderFactory) GetClientRC(info cloudprovider.SProviderInfo) (map[string]string, error) { +func (self *SHCSOProviderFactory) GetClientRC(info cloudprovider.SProviderInfo) (map[string]string, error) { accessKey, projectId := parseAccount(info.Account) region := "" data := strings.Split(info.Name, "-") @@ -181,25 +181,25 @@ func (self *SHuaweiCloudStackProviderFactory) GetClientRC(info cloudprovider.SPr }, nil } -func (self *SHuaweiCloudStackProviderFactory) IsMultiTenant() bool { +func (self *SHCSOProviderFactory) IsMultiTenant() bool { return true } func init() { - factory := SHuaweiCloudStackProviderFactory{} + factory := SHCSOProviderFactory{} cloudprovider.RegisterFactory(&factory) } -type SHuaweiCloudStackProvider struct { +type SHCSOProvider struct { cloudprovider.SBaseProvider client *huawei.SHuaweiClient } -func (self *SHuaweiCloudStackProvider) GetVersion() string { +func (self *SHCSOProvider) GetVersion() string { return self.client.GetVersion() } -func (self *SHuaweiCloudStackProvider) GetSysInfo() (jsonutils.JSONObject, error) { +func (self *SHCSOProvider) GetSysInfo() (jsonutils.JSONObject, error) { regions := self.client.GetIRegions() info := jsonutils.NewDict() info.Add(jsonutils.NewInt(int64(len(regions))), "region_count") @@ -207,49 +207,49 @@ func (self *SHuaweiCloudStackProvider) GetSysInfo() (jsonutils.JSONObject, error return info, nil } -func (self *SHuaweiCloudStackProvider) GetIRegions() []cloudprovider.ICloudRegion { +func (self *SHCSOProvider) GetIRegions() []cloudprovider.ICloudRegion { return self.client.GetIRegions() } -func (self *SHuaweiCloudStackProvider) GetIRegionById(extId string) (cloudprovider.ICloudRegion, error) { +func (self *SHCSOProvider) GetIRegionById(extId string) (cloudprovider.ICloudRegion, error) { return self.client.GetIRegionById(extId) } -func (self *SHuaweiCloudStackProvider) GetBalance() (float64, string, error) { +func (self *SHCSOProvider) GetBalance() (float64, string, error) { return 0.0, api.CLOUD_PROVIDER_HEALTH_NORMAL, nil } -func (self *SHuaweiCloudStackProvider) GetSubAccounts() ([]cloudprovider.SSubAccount, error) { +func (self *SHCSOProvider) GetSubAccounts() ([]cloudprovider.SSubAccount, error) { return self.client.GetSubAccounts() } -func (self *SHuaweiCloudStackProvider) GetAccountId() string { +func (self *SHCSOProvider) GetAccountId() string { return self.client.GetAccountId() } -func (self *SHuaweiCloudStackProvider) GetIamLoginUrl() string { +func (self *SHCSOProvider) GetIamLoginUrl() string { return self.client.GetIamLoginUrl() } -func (self *SHuaweiCloudStackProvider) GetCloudRegionExternalIdPrefix() string { +func (self *SHCSOProvider) GetCloudRegionExternalIdPrefix() string { return self.client.GetCloudRegionExternalIdPrefix() } -func (self *SHuaweiCloudStackProvider) GetIProjects() ([]cloudprovider.ICloudProject, error) { +func (self *SHCSOProvider) GetIProjects() ([]cloudprovider.ICloudProject, error) { return self.client.GetIProjects() } -func (self *SHuaweiCloudStackProvider) CreateIProject(name string) (cloudprovider.ICloudProject, error) { +func (self *SHCSOProvider) CreateIProject(name string) (cloudprovider.ICloudProject, error) { return self.client.CreateIProject(name) } -func (self *SHuaweiCloudStackProvider) GetStorageClasses(regionId string) []string { +func (self *SHCSOProvider) GetStorageClasses(regionId string) []string { return []string{ "STANDARD", "WARM", "COLD", } } -func (self *SHuaweiCloudStackProvider) GetBucketCannedAcls(regionId string) []string { +func (self *SHCSOProvider) GetBucketCannedAcls(regionId string) []string { return []string{ string(cloudprovider.ACLPrivate), string(cloudprovider.ACLAuthRead), @@ -258,7 +258,7 @@ func (self *SHuaweiCloudStackProvider) GetBucketCannedAcls(regionId string) []st } } -func (self *SHuaweiCloudStackProvider) GetObjectCannedAcls(regionId string) []string { +func (self *SHCSOProvider) GetObjectCannedAcls(regionId string) []string { return []string{ string(cloudprovider.ACLPrivate), string(cloudprovider.ACLAuthRead), @@ -267,55 +267,55 @@ func (self *SHuaweiCloudStackProvider) GetObjectCannedAcls(regionId string) []st } } -func (self *SHuaweiCloudStackProvider) GetCapabilities() []string { +func (self *SHCSOProvider) GetCapabilities() []string { return self.client.GetCapabilities() } -func (self *SHuaweiCloudStackProvider) CreateIClouduser(conf *cloudprovider.SClouduserCreateConfig) (cloudprovider.IClouduser, error) { +func (self *SHCSOProvider) CreateIClouduser(conf *cloudprovider.SClouduserCreateConfig) (cloudprovider.IClouduser, error) { return self.client.CreateIClouduser(conf) } -func (self *SHuaweiCloudStackProvider) GetICloudusers() ([]cloudprovider.IClouduser, error) { +func (self *SHCSOProvider) GetICloudusers() ([]cloudprovider.IClouduser, error) { return self.client.GetICloudusers() } -func (self *SHuaweiCloudStackProvider) GetICloudgroups() ([]cloudprovider.ICloudgroup, error) { +func (self *SHCSOProvider) GetICloudgroups() ([]cloudprovider.ICloudgroup, error) { return self.client.GetICloudgroups() } -func (self *SHuaweiCloudStackProvider) GetICloudgroupByName(name string) (cloudprovider.ICloudgroup, error) { +func (self *SHCSOProvider) GetICloudgroupByName(name string) (cloudprovider.ICloudgroup, error) { return self.client.GetICloudgroupByName(name) } -func (self *SHuaweiCloudStackProvider) CreateICloudgroup(name, desc string) (cloudprovider.ICloudgroup, error) { +func (self *SHCSOProvider) CreateICloudgroup(name, desc string) (cloudprovider.ICloudgroup, error) { return self.client.CreateICloudgroup(name, desc) } -func (self *SHuaweiCloudStackProvider) GetISystemCloudpolicies() ([]cloudprovider.ICloudpolicy, error) { +func (self *SHCSOProvider) GetISystemCloudpolicies() ([]cloudprovider.ICloudpolicy, error) { return self.client.GetISystemCloudpolicies() } -func (self *SHuaweiCloudStackProvider) GetICustomCloudpolicies() ([]cloudprovider.ICloudpolicy, error) { +func (self *SHCSOProvider) GetICustomCloudpolicies() ([]cloudprovider.ICloudpolicy, error) { return self.client.GetICustomCloudpolicies() } -func (self *SHuaweiCloudStackProvider) CreateICloudpolicy(opts *cloudprovider.SCloudpolicyCreateOptions) (cloudprovider.ICloudpolicy, error) { +func (self *SHCSOProvider) CreateICloudpolicy(opts *cloudprovider.SCloudpolicyCreateOptions) (cloudprovider.ICloudpolicy, error) { return self.client.CreateICloudpolicy(opts) } -func (self *SHuaweiCloudStackProvider) GetIClouduserByName(name string) (cloudprovider.IClouduser, error) { +func (self *SHCSOProvider) GetIClouduserByName(name string) (cloudprovider.IClouduser, error) { return self.client.GetIClouduserByName(name) } -func (self *SHuaweiCloudStackProvider) GetSamlEntityId() string { +func (self *SHCSOProvider) GetSamlEntityId() string { return self.client.GetSamlEntityId() } -func (self *SHuaweiCloudStackProvider) GetICloudSAMLProviders() ([]cloudprovider.ICloudSAMLProvider, error) { +func (self *SHCSOProvider) GetICloudSAMLProviders() ([]cloudprovider.ICloudSAMLProvider, error) { return self.client.GetICloudSAMLProviders() } -func (self *SHuaweiCloudStackProvider) CreateICloudSAMLProvider(opts *cloudprovider.SAMLProviderCreateOptions) (cloudprovider.ICloudSAMLProvider, error) { +func (self *SHCSOProvider) CreateICloudSAMLProvider(opts *cloudprovider.SAMLProviderCreateOptions) (cloudprovider.ICloudSAMLProvider, error) { sp, err := self.client.CreateSAMLProvider(opts) if err != nil { return nil, errors.Wrapf(err, "CreateSAMLProvider") diff --git a/pkg/multicloud/huaweistack/quota.go b/pkg/multicloud/hcso/quota.go similarity index 98% rename from pkg/multicloud/huaweistack/quota.go rename to pkg/multicloud/hcso/quota.go index 8c6dc76556..1cc739441e 100644 --- a/pkg/multicloud/huaweistack/quota.go +++ b/pkg/multicloud/hcso/quota.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "yunion.io/x/pkg/errors" diff --git a/pkg/multicloud/huaweistack/region.go b/pkg/multicloud/hcso/region.go similarity index 99% rename from pkg/multicloud/huaweistack/region.go rename to pkg/multicloud/hcso/region.go index b8c4947558..ddc5e891f7 100644 --- a/pkg/multicloud/huaweistack/region.go +++ b/pkg/multicloud/hcso/region.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "fmt" @@ -28,7 +28,7 @@ import ( "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/multicloud" "yunion.io/x/onecloud/pkg/multicloud/huawei/obs" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client" ) type Locales struct { @@ -376,7 +376,7 @@ func (self *SRegion) GetI18n() cloudprovider.SModelI18nTable { } func (self *SRegion) GetGlobalId() string { - return fmt.Sprintf("%s/%s", api.CLOUD_PROVIDER_HUAWEI_CLOUD_STACK, self.ID) + return fmt.Sprintf("%s/%s", api.CLOUD_PROVIDER_HCSO, self.ID) } func (self *SRegion) GetStatus() string { diff --git a/pkg/multicloud/huaweistack/roles.go b/pkg/multicloud/hcso/roles.go similarity index 99% rename from pkg/multicloud/huaweistack/roles.go rename to pkg/multicloud/hcso/roles.go index d16cc4935c..fe63dca88e 100644 --- a/pkg/multicloud/huaweistack/roles.go +++ b/pkg/multicloud/hcso/roles.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "yunion.io/x/jsonutils" diff --git a/pkg/multicloud/huaweistack/routetable.go b/pkg/multicloud/hcso/routetable.go similarity index 99% rename from pkg/multicloud/huaweistack/routetable.go rename to pkg/multicloud/hcso/routetable.go index a4798892f9..9c6b187d07 100644 --- a/pkg/multicloud/huaweistack/routetable.go +++ b/pkg/multicloud/hcso/routetable.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "fmt" diff --git a/pkg/multicloud/huaweistack/saml_provider.go b/pkg/multicloud/hcso/saml_provider.go similarity index 99% rename from pkg/multicloud/huaweistack/saml_provider.go rename to pkg/multicloud/hcso/saml_provider.go index 487e4c8a91..26e85f8ddb 100644 --- a/pkg/multicloud/huaweistack/saml_provider.go +++ b/pkg/multicloud/hcso/saml_provider.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "fmt" @@ -26,7 +26,7 @@ import ( api "yunion.io/x/onecloud/pkg/apis/cloudid" "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/multicloud" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/modules" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/modules" "yunion.io/x/onecloud/pkg/util/samlutils" ) diff --git a/pkg/multicloud/huaweistack/securitygroup.go b/pkg/multicloud/hcso/securitygroup.go similarity index 99% rename from pkg/multicloud/huaweistack/securitygroup.go rename to pkg/multicloud/hcso/securitygroup.go index 9e455c425c..48f6bc3668 100644 --- a/pkg/multicloud/huaweistack/securitygroup.go +++ b/pkg/multicloud/hcso/securitygroup.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso /* https://support.huaweicloud.com/usermanual-vpc/zh-cn_topic_0073379079.html diff --git a/pkg/multicloud/huaweistack/sfs-turbo.go b/pkg/multicloud/hcso/sfs-turbo.go similarity index 99% rename from pkg/multicloud/huaweistack/sfs-turbo.go rename to pkg/multicloud/hcso/sfs-turbo.go index 9307428e1f..0aca694c00 100644 --- a/pkg/multicloud/huaweistack/sfs-turbo.go +++ b/pkg/multicloud/hcso/sfs-turbo.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "fmt" diff --git a/pkg/multicloud/huaweistack/shell/bucket.go b/pkg/multicloud/hcso/shell/bucket.go similarity index 95% rename from pkg/multicloud/huaweistack/shell/bucket.go rename to pkg/multicloud/hcso/shell/bucket.go index 030c78c202..b9787ea454 100644 --- a/pkg/multicloud/huaweistack/shell/bucket.go +++ b/pkg/multicloud/hcso/shell/bucket.go @@ -17,7 +17,7 @@ package shell import ( "fmt" - huawei "yunion.io/x/onecloud/pkg/multicloud/huaweistack" + huawei "yunion.io/x/onecloud/pkg/multicloud/hcso" "yunion.io/x/onecloud/pkg/multicloud/objectstore" "yunion.io/x/onecloud/pkg/util/shellutils" ) diff --git a/pkg/multicloud/huaweistack/shell/cloudgroup.go b/pkg/multicloud/hcso/shell/cloudgroup.go similarity index 98% rename from pkg/multicloud/huaweistack/shell/cloudgroup.go rename to pkg/multicloud/hcso/shell/cloudgroup.go index ec1f2034ed..1c92979be0 100644 --- a/pkg/multicloud/huaweistack/shell/cloudgroup.go +++ b/pkg/multicloud/hcso/shell/cloudgroup.go @@ -15,7 +15,7 @@ package shell import ( - huawei "yunion.io/x/onecloud/pkg/multicloud/huaweistack" + huawei "yunion.io/x/onecloud/pkg/multicloud/hcso" "yunion.io/x/onecloud/pkg/util/shellutils" ) diff --git a/pkg/multicloud/huaweistack/shell/clouduser.go b/pkg/multicloud/hcso/shell/clouduser.go similarity index 97% rename from pkg/multicloud/huaweistack/shell/clouduser.go rename to pkg/multicloud/hcso/shell/clouduser.go index 52f77a6ffe..f816cdb963 100644 --- a/pkg/multicloud/huaweistack/shell/clouduser.go +++ b/pkg/multicloud/hcso/shell/clouduser.go @@ -15,7 +15,7 @@ package shell import ( - huawei "yunion.io/x/onecloud/pkg/multicloud/huaweistack" + huawei "yunion.io/x/onecloud/pkg/multicloud/hcso" "yunion.io/x/onecloud/pkg/util/shellutils" ) diff --git a/pkg/multicloud/huaweistack/shell/dbinstance.go b/pkg/multicloud/hcso/shell/dbinstance.go similarity index 98% rename from pkg/multicloud/huaweistack/shell/dbinstance.go rename to pkg/multicloud/hcso/shell/dbinstance.go index d9897bf37b..ee648744e1 100644 --- a/pkg/multicloud/huaweistack/shell/dbinstance.go +++ b/pkg/multicloud/hcso/shell/dbinstance.go @@ -15,7 +15,7 @@ package shell import ( - huawei "yunion.io/x/onecloud/pkg/multicloud/huaweistack" + huawei "yunion.io/x/onecloud/pkg/multicloud/hcso" "yunion.io/x/onecloud/pkg/util/shellutils" ) diff --git a/pkg/multicloud/huaweistack/shell/dbinstance_account.go b/pkg/multicloud/hcso/shell/dbinstance_account.go similarity index 97% rename from pkg/multicloud/huaweistack/shell/dbinstance_account.go rename to pkg/multicloud/hcso/shell/dbinstance_account.go index 7804af97af..60375c0793 100644 --- a/pkg/multicloud/huaweistack/shell/dbinstance_account.go +++ b/pkg/multicloud/hcso/shell/dbinstance_account.go @@ -15,7 +15,7 @@ package shell import ( - huawei "yunion.io/x/onecloud/pkg/multicloud/huaweistack" + huawei "yunion.io/x/onecloud/pkg/multicloud/hcso" "yunion.io/x/onecloud/pkg/util/shellutils" ) diff --git a/pkg/multicloud/huaweistack/shell/dbinstance_database.go b/pkg/multicloud/hcso/shell/dbinstance_database.go similarity index 96% rename from pkg/multicloud/huaweistack/shell/dbinstance_database.go rename to pkg/multicloud/hcso/shell/dbinstance_database.go index e02e757a8c..afea978b93 100644 --- a/pkg/multicloud/huaweistack/shell/dbinstance_database.go +++ b/pkg/multicloud/hcso/shell/dbinstance_database.go @@ -15,7 +15,7 @@ package shell import ( - huawei "yunion.io/x/onecloud/pkg/multicloud/huaweistack" + huawei "yunion.io/x/onecloud/pkg/multicloud/hcso" "yunion.io/x/onecloud/pkg/util/shellutils" ) diff --git a/pkg/multicloud/huaweistack/shell/dbinstance_skus.go b/pkg/multicloud/hcso/shell/dbinstance_skus.go similarity index 96% rename from pkg/multicloud/huaweistack/shell/dbinstance_skus.go rename to pkg/multicloud/hcso/shell/dbinstance_skus.go index dea88ca6cd..b95310dca4 100644 --- a/pkg/multicloud/huaweistack/shell/dbinstance_skus.go +++ b/pkg/multicloud/hcso/shell/dbinstance_skus.go @@ -15,7 +15,7 @@ package shell import ( - huawei "yunion.io/x/onecloud/pkg/multicloud/huaweistack" + huawei "yunion.io/x/onecloud/pkg/multicloud/hcso" "yunion.io/x/onecloud/pkg/util/shellutils" ) diff --git a/pkg/multicloud/huaweistack/shell/disk.go b/pkg/multicloud/hcso/shell/disk.go similarity index 96% rename from pkg/multicloud/huaweistack/shell/disk.go rename to pkg/multicloud/hcso/shell/disk.go index 647609bfee..b0e1eb095e 100644 --- a/pkg/multicloud/huaweistack/shell/disk.go +++ b/pkg/multicloud/hcso/shell/disk.go @@ -15,7 +15,7 @@ package shell import ( - huawei "yunion.io/x/onecloud/pkg/multicloud/huaweistack" + huawei "yunion.io/x/onecloud/pkg/multicloud/hcso" "yunion.io/x/onecloud/pkg/util/shellutils" ) diff --git a/pkg/multicloud/hcso/shell/doc.go b/pkg/multicloud/hcso/shell/doc.go new file mode 100644 index 0000000000..ea1098fa7e --- /dev/null +++ b/pkg/multicloud/hcso/shell/doc.go @@ -0,0 +1,15 @@ +// Copyright 2019 Yunion +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package shell // import "yunion.io/x/onecloud/pkg/multicloud/hcso/shell" diff --git a/pkg/multicloud/huaweistack/shell/eip.go b/pkg/multicloud/hcso/shell/eip.go similarity index 97% rename from pkg/multicloud/huaweistack/shell/eip.go rename to pkg/multicloud/hcso/shell/eip.go index bf9783a259..06e5e58b4c 100644 --- a/pkg/multicloud/huaweistack/shell/eip.go +++ b/pkg/multicloud/hcso/shell/eip.go @@ -15,7 +15,7 @@ package shell import ( - huawei "yunion.io/x/onecloud/pkg/multicloud/huaweistack" + huawei "yunion.io/x/onecloud/pkg/multicloud/hcso" "yunion.io/x/onecloud/pkg/util/shellutils" ) diff --git a/pkg/multicloud/huaweistack/shell/elasticcache.go b/pkg/multicloud/hcso/shell/elasticcache.go similarity index 97% rename from pkg/multicloud/huaweistack/shell/elasticcache.go rename to pkg/multicloud/hcso/shell/elasticcache.go index 8e23e83403..2e96a36677 100644 --- a/pkg/multicloud/huaweistack/shell/elasticcache.go +++ b/pkg/multicloud/hcso/shell/elasticcache.go @@ -15,7 +15,7 @@ package shell import ( - huawei "yunion.io/x/onecloud/pkg/multicloud/huaweistack" + huawei "yunion.io/x/onecloud/pkg/multicloud/hcso" "yunion.io/x/onecloud/pkg/util/shellutils" ) diff --git a/pkg/multicloud/huaweistack/shell/endpoints.go b/pkg/multicloud/hcso/shell/endpoints.go similarity index 94% rename from pkg/multicloud/huaweistack/shell/endpoints.go rename to pkg/multicloud/hcso/shell/endpoints.go index 251dae64b3..e44ba47e54 100644 --- a/pkg/multicloud/huaweistack/shell/endpoints.go +++ b/pkg/multicloud/hcso/shell/endpoints.go @@ -15,7 +15,7 @@ package shell import ( - huawei "yunion.io/x/onecloud/pkg/multicloud/huaweistack" + huawei "yunion.io/x/onecloud/pkg/multicloud/hcso" "yunion.io/x/onecloud/pkg/util/shellutils" ) diff --git a/pkg/multicloud/huaweistack/shell/enterpriseprojects.go b/pkg/multicloud/hcso/shell/enterpriseprojects.go similarity index 96% rename from pkg/multicloud/huaweistack/shell/enterpriseprojects.go rename to pkg/multicloud/hcso/shell/enterpriseprojects.go index ccedd4f5a2..1ad54442b2 100644 --- a/pkg/multicloud/huaweistack/shell/enterpriseprojects.go +++ b/pkg/multicloud/hcso/shell/enterpriseprojects.go @@ -15,7 +15,7 @@ package shell import ( - huawei "yunion.io/x/onecloud/pkg/multicloud/huaweistack" + huawei "yunion.io/x/onecloud/pkg/multicloud/hcso" "yunion.io/x/onecloud/pkg/util/shellutils" ) diff --git a/pkg/multicloud/huaweistack/shell/events.go b/pkg/multicloud/hcso/shell/events.go similarity index 94% rename from pkg/multicloud/huaweistack/shell/events.go rename to pkg/multicloud/hcso/shell/events.go index cf9556adb9..2fe94a7b0e 100644 --- a/pkg/multicloud/huaweistack/shell/events.go +++ b/pkg/multicloud/hcso/shell/events.go @@ -17,7 +17,7 @@ package shell import ( "time" - huawei "yunion.io/x/onecloud/pkg/multicloud/huaweistack" + huawei "yunion.io/x/onecloud/pkg/multicloud/hcso" "yunion.io/x/onecloud/pkg/util/shellutils" ) diff --git a/pkg/multicloud/huaweistack/shell/filesystem.go b/pkg/multicloud/hcso/shell/filesystem.go similarity index 96% rename from pkg/multicloud/huaweistack/shell/filesystem.go rename to pkg/multicloud/hcso/shell/filesystem.go index e25b0e9d30..9992c7e678 100644 --- a/pkg/multicloud/huaweistack/shell/filesystem.go +++ b/pkg/multicloud/hcso/shell/filesystem.go @@ -16,7 +16,7 @@ package shell import ( "yunion.io/x/onecloud/pkg/cloudprovider" - huawei "yunion.io/x/onecloud/pkg/multicloud/huaweistack" + huawei "yunion.io/x/onecloud/pkg/multicloud/hcso" "yunion.io/x/onecloud/pkg/util/shellutils" ) diff --git a/pkg/multicloud/huaweistack/shell/hosts.go b/pkg/multicloud/hcso/shell/hosts.go similarity index 94% rename from pkg/multicloud/huaweistack/shell/hosts.go rename to pkg/multicloud/hcso/shell/hosts.go index 6dad7c7f54..762cd705fe 100644 --- a/pkg/multicloud/huaweistack/shell/hosts.go +++ b/pkg/multicloud/hcso/shell/hosts.go @@ -15,7 +15,7 @@ package shell import ( - huawei "yunion.io/x/onecloud/pkg/multicloud/huaweistack" + huawei "yunion.io/x/onecloud/pkg/multicloud/hcso" "yunion.io/x/onecloud/pkg/util/shellutils" ) diff --git a/pkg/multicloud/huaweistack/shell/iam.go b/pkg/multicloud/hcso/shell/iam.go similarity index 94% rename from pkg/multicloud/huaweistack/shell/iam.go rename to pkg/multicloud/hcso/shell/iam.go index 68d11c53b0..eb2d3f29a5 100644 --- a/pkg/multicloud/huaweistack/shell/iam.go +++ b/pkg/multicloud/hcso/shell/iam.go @@ -17,7 +17,7 @@ package shell import ( "fmt" - huawei "yunion.io/x/onecloud/pkg/multicloud/huaweistack" + huawei "yunion.io/x/onecloud/pkg/multicloud/hcso" "yunion.io/x/onecloud/pkg/util/shellutils" ) diff --git a/pkg/multicloud/huaweistack/shell/image.go b/pkg/multicloud/hcso/shell/image.go similarity index 97% rename from pkg/multicloud/huaweistack/shell/image.go rename to pkg/multicloud/hcso/shell/image.go index 21c2b6a365..cbc566a51f 100644 --- a/pkg/multicloud/huaweistack/shell/image.go +++ b/pkg/multicloud/hcso/shell/image.go @@ -15,7 +15,7 @@ package shell import ( - huawei "yunion.io/x/onecloud/pkg/multicloud/huaweistack" + huawei "yunion.io/x/onecloud/pkg/multicloud/hcso" "yunion.io/x/onecloud/pkg/util/shellutils" ) diff --git a/pkg/multicloud/huaweistack/shell/instance.go b/pkg/multicloud/hcso/shell/instance.go similarity index 99% rename from pkg/multicloud/huaweistack/shell/instance.go rename to pkg/multicloud/hcso/shell/instance.go index f9ce186c22..f50dc02f99 100644 --- a/pkg/multicloud/huaweistack/shell/instance.go +++ b/pkg/multicloud/hcso/shell/instance.go @@ -20,7 +20,7 @@ import ( "strings" "yunion.io/x/onecloud/pkg/cloudprovider" - huawei "yunion.io/x/onecloud/pkg/multicloud/huaweistack" + huawei "yunion.io/x/onecloud/pkg/multicloud/hcso" "yunion.io/x/onecloud/pkg/util/shellutils" ) diff --git a/pkg/multicloud/huaweistack/shell/instancetype.go b/pkg/multicloud/hcso/shell/instancetype.go similarity index 95% rename from pkg/multicloud/huaweistack/shell/instancetype.go rename to pkg/multicloud/hcso/shell/instancetype.go index c62e1806d6..ed246896a3 100644 --- a/pkg/multicloud/huaweistack/shell/instancetype.go +++ b/pkg/multicloud/hcso/shell/instancetype.go @@ -15,7 +15,7 @@ package shell import ( - huawei "yunion.io/x/onecloud/pkg/multicloud/huaweistack" + huawei "yunion.io/x/onecloud/pkg/multicloud/hcso" "yunion.io/x/onecloud/pkg/util/shellutils" ) diff --git a/pkg/multicloud/huaweistack/shell/keypair.go b/pkg/multicloud/hcso/shell/keypair.go similarity index 96% rename from pkg/multicloud/huaweistack/shell/keypair.go rename to pkg/multicloud/hcso/shell/keypair.go index 153f2efeb1..b28b47eec6 100644 --- a/pkg/multicloud/huaweistack/shell/keypair.go +++ b/pkg/multicloud/hcso/shell/keypair.go @@ -15,7 +15,7 @@ package shell import ( - huawei "yunion.io/x/onecloud/pkg/multicloud/huaweistack" + huawei "yunion.io/x/onecloud/pkg/multicloud/hcso" "yunion.io/x/onecloud/pkg/util/shellutils" ) diff --git a/pkg/multicloud/huaweistack/shell/loadbalancer.go b/pkg/multicloud/hcso/shell/loadbalancer.go similarity index 99% rename from pkg/multicloud/huaweistack/shell/loadbalancer.go rename to pkg/multicloud/hcso/shell/loadbalancer.go index 41c6e426dd..bf5ebeaed3 100644 --- a/pkg/multicloud/huaweistack/shell/loadbalancer.go +++ b/pkg/multicloud/hcso/shell/loadbalancer.go @@ -16,7 +16,7 @@ package shell import ( "yunion.io/x/onecloud/pkg/cloudprovider" - huawei "yunion.io/x/onecloud/pkg/multicloud/huaweistack" + huawei "yunion.io/x/onecloud/pkg/multicloud/hcso" "yunion.io/x/onecloud/pkg/util/shellutils" ) diff --git a/pkg/multicloud/huaweistack/shell/monitor.go b/pkg/multicloud/hcso/shell/monitor.go similarity index 96% rename from pkg/multicloud/huaweistack/shell/monitor.go rename to pkg/multicloud/hcso/shell/monitor.go index 52616256ac..c74162870c 100644 --- a/pkg/multicloud/huaweistack/shell/monitor.go +++ b/pkg/multicloud/hcso/shell/monitor.go @@ -17,7 +17,7 @@ package shell import ( "yunion.io/x/pkg/util/timeutils" - huawei "yunion.io/x/onecloud/pkg/multicloud/huaweistack" + huawei "yunion.io/x/onecloud/pkg/multicloud/hcso" "yunion.io/x/onecloud/pkg/util/shellutils" ) diff --git a/pkg/multicloud/huaweistack/shell/natdtable.go b/pkg/multicloud/hcso/shell/natdtable.go similarity index 94% rename from pkg/multicloud/huaweistack/shell/natdtable.go rename to pkg/multicloud/hcso/shell/natdtable.go index ca268ecf0e..ee071d60a8 100644 --- a/pkg/multicloud/huaweistack/shell/natdtable.go +++ b/pkg/multicloud/hcso/shell/natdtable.go @@ -15,7 +15,7 @@ package shell import ( - huawei "yunion.io/x/onecloud/pkg/multicloud/huaweistack" + huawei "yunion.io/x/onecloud/pkg/multicloud/hcso" "yunion.io/x/onecloud/pkg/util/shellutils" ) diff --git a/pkg/multicloud/huaweistack/shell/natgateway.go b/pkg/multicloud/hcso/shell/natgateway.go similarity index 98% rename from pkg/multicloud/huaweistack/shell/natgateway.go rename to pkg/multicloud/hcso/shell/natgateway.go index d84180aa08..4644f38c72 100644 --- a/pkg/multicloud/huaweistack/shell/natgateway.go +++ b/pkg/multicloud/hcso/shell/natgateway.go @@ -16,7 +16,7 @@ package shell import ( "yunion.io/x/onecloud/pkg/cloudprovider" - huawei "yunion.io/x/onecloud/pkg/multicloud/huaweistack" + huawei "yunion.io/x/onecloud/pkg/multicloud/hcso" "yunion.io/x/onecloud/pkg/util/shellutils" ) diff --git a/pkg/multicloud/huaweistack/shell/natstable.go b/pkg/multicloud/hcso/shell/natstable.go similarity index 94% rename from pkg/multicloud/huaweistack/shell/natstable.go rename to pkg/multicloud/hcso/shell/natstable.go index 89a9b60eb8..bfe2195722 100644 --- a/pkg/multicloud/huaweistack/shell/natstable.go +++ b/pkg/multicloud/hcso/shell/natstable.go @@ -15,7 +15,7 @@ package shell import ( - huawei "yunion.io/x/onecloud/pkg/multicloud/huaweistack" + huawei "yunion.io/x/onecloud/pkg/multicloud/hcso" "yunion.io/x/onecloud/pkg/util/shellutils" ) diff --git a/pkg/multicloud/huaweistack/shell/network.go b/pkg/multicloud/hcso/shell/network.go similarity index 94% rename from pkg/multicloud/huaweistack/shell/network.go rename to pkg/multicloud/hcso/shell/network.go index af1c5578f1..8dbab7d219 100644 --- a/pkg/multicloud/huaweistack/shell/network.go +++ b/pkg/multicloud/hcso/shell/network.go @@ -15,7 +15,7 @@ package shell import ( - huawei "yunion.io/x/onecloud/pkg/multicloud/huaweistack" + huawei "yunion.io/x/onecloud/pkg/multicloud/hcso" "yunion.io/x/onecloud/pkg/util/shellutils" ) diff --git a/pkg/multicloud/huaweistack/shell/obs.go b/pkg/multicloud/hcso/shell/obs.go similarity index 97% rename from pkg/multicloud/huaweistack/shell/obs.go rename to pkg/multicloud/hcso/shell/obs.go index 1503bd5c58..7d36154926 100644 --- a/pkg/multicloud/huaweistack/shell/obs.go +++ b/pkg/multicloud/hcso/shell/obs.go @@ -15,7 +15,7 @@ package shell import ( - huawei "yunion.io/x/onecloud/pkg/multicloud/huaweistack" + huawei "yunion.io/x/onecloud/pkg/multicloud/hcso" "yunion.io/x/onecloud/pkg/util/printutils" "yunion.io/x/onecloud/pkg/util/shellutils" ) diff --git a/pkg/multicloud/huaweistack/shell/port.go b/pkg/multicloud/hcso/shell/port.go similarity index 94% rename from pkg/multicloud/huaweistack/shell/port.go rename to pkg/multicloud/hcso/shell/port.go index d16c50876d..b0a35c1416 100644 --- a/pkg/multicloud/huaweistack/shell/port.go +++ b/pkg/multicloud/hcso/shell/port.go @@ -15,7 +15,7 @@ package shell import ( - huawei "yunion.io/x/onecloud/pkg/multicloud/huaweistack" + huawei "yunion.io/x/onecloud/pkg/multicloud/hcso" "yunion.io/x/onecloud/pkg/util/shellutils" ) diff --git a/pkg/multicloud/huaweistack/shell/printutils.go b/pkg/multicloud/hcso/shell/printutils.go similarity index 100% rename from pkg/multicloud/huaweistack/shell/printutils.go rename to pkg/multicloud/hcso/shell/printutils.go diff --git a/pkg/multicloud/huaweistack/shell/quota.go b/pkg/multicloud/hcso/shell/quota.go similarity index 94% rename from pkg/multicloud/huaweistack/shell/quota.go rename to pkg/multicloud/hcso/shell/quota.go index 8065a33b5a..13a7cbbdf3 100644 --- a/pkg/multicloud/huaweistack/shell/quota.go +++ b/pkg/multicloud/hcso/shell/quota.go @@ -15,7 +15,7 @@ package shell import ( - huawei "yunion.io/x/onecloud/pkg/multicloud/huaweistack" + huawei "yunion.io/x/onecloud/pkg/multicloud/hcso" "yunion.io/x/onecloud/pkg/util/shellutils" ) diff --git a/pkg/multicloud/huaweistack/shell/region.go b/pkg/multicloud/hcso/shell/region.go similarity index 97% rename from pkg/multicloud/huaweistack/shell/region.go rename to pkg/multicloud/hcso/shell/region.go index 9648d65b14..1f51dc31c2 100644 --- a/pkg/multicloud/huaweistack/shell/region.go +++ b/pkg/multicloud/hcso/shell/region.go @@ -17,7 +17,7 @@ package shell import ( "fmt" - huawei "yunion.io/x/onecloud/pkg/multicloud/huaweistack" + huawei "yunion.io/x/onecloud/pkg/multicloud/hcso" "yunion.io/x/onecloud/pkg/util/shellutils" ) diff --git a/pkg/multicloud/huaweistack/shell/role.go b/pkg/multicloud/hcso/shell/role.go similarity index 89% rename from pkg/multicloud/huaweistack/shell/role.go rename to pkg/multicloud/hcso/shell/role.go index 0707532c2f..e562eabba5 100644 --- a/pkg/multicloud/huaweistack/shell/role.go +++ b/pkg/multicloud/hcso/shell/role.go @@ -22,7 +22,7 @@ import ( cloudid_api "yunion.io/x/onecloud/pkg/apis/cloudid" api "yunion.io/x/onecloud/pkg/apis/compute" - huawei "yunion.io/x/onecloud/pkg/multicloud/huaweistack" + huawei "yunion.io/x/onecloud/pkg/multicloud/hcso" "yunion.io/x/onecloud/pkg/util/shellutils" ) @@ -62,14 +62,14 @@ func init() { Name: roles[i].DisplayName, Id: roles[i].Id, ExternalId: roles[i].DisplayName, - CloudEnv: api.CLOUD_PROVIDER_HUAWEI_CLOUD_STACK, - Provider: api.CLOUD_PROVIDER_HUAWEI_CLOUD_STACK, + CloudEnv: api.CLOUD_PROVIDER_HCSO, + Provider: api.CLOUD_PROVIDER_HCSO, Description: roles[i].DescriptionCn, Document: roles[i].Policy, PolicyType: cloudid_api.CLOUD_POLICY_TYPE_SYSTEM, Status: cloudid_api.CLOUD_POLICY_STATUS_AVAILABLE, }) } - return ioutil.WriteFile(fmt.Sprintf("%s.json", api.CLOUD_PROVIDER_HUAWEI_CLOUD_STACK), []byte(jsonutils.Marshal(ret).PrettyString()), 0644) + return ioutil.WriteFile(fmt.Sprintf("%s.json", api.CLOUD_PROVIDER_HCSO), []byte(jsonutils.Marshal(ret).PrettyString()), 0644) }) } diff --git a/pkg/multicloud/huaweistack/shell/routetable.go b/pkg/multicloud/hcso/shell/routetable.go similarity index 94% rename from pkg/multicloud/huaweistack/shell/routetable.go rename to pkg/multicloud/hcso/shell/routetable.go index c0bf7febe2..66116b96b0 100644 --- a/pkg/multicloud/huaweistack/shell/routetable.go +++ b/pkg/multicloud/hcso/shell/routetable.go @@ -15,7 +15,7 @@ package shell import ( - huawei "yunion.io/x/onecloud/pkg/multicloud/huaweistack" + huawei "yunion.io/x/onecloud/pkg/multicloud/hcso" "yunion.io/x/onecloud/pkg/util/shellutils" ) diff --git a/pkg/multicloud/huaweistack/shell/saml_provider.go b/pkg/multicloud/hcso/shell/saml_provider.go similarity index 98% rename from pkg/multicloud/huaweistack/shell/saml_provider.go rename to pkg/multicloud/hcso/shell/saml_provider.go index 94c942d024..ca59870c2c 100644 --- a/pkg/multicloud/huaweistack/shell/saml_provider.go +++ b/pkg/multicloud/hcso/shell/saml_provider.go @@ -15,7 +15,7 @@ package shell import ( - huawei "yunion.io/x/onecloud/pkg/multicloud/huaweistack" + huawei "yunion.io/x/onecloud/pkg/multicloud/hcso" "yunion.io/x/onecloud/pkg/util/shellutils" ) diff --git a/pkg/multicloud/huaweistack/shell/secgroup.go b/pkg/multicloud/hcso/shell/secgroup.go similarity index 98% rename from pkg/multicloud/huaweistack/shell/secgroup.go rename to pkg/multicloud/hcso/shell/secgroup.go index ab47b01362..c5ab793eac 100644 --- a/pkg/multicloud/huaweistack/shell/secgroup.go +++ b/pkg/multicloud/hcso/shell/secgroup.go @@ -19,7 +19,7 @@ import ( "yunion.io/x/pkg/util/secrules" "yunion.io/x/onecloud/pkg/cloudprovider" - huawei "yunion.io/x/onecloud/pkg/multicloud/huaweistack" + huawei "yunion.io/x/onecloud/pkg/multicloud/hcso" "yunion.io/x/onecloud/pkg/util/shellutils" ) diff --git a/pkg/multicloud/huaweistack/shell/service.go b/pkg/multicloud/hcso/shell/service.go similarity index 94% rename from pkg/multicloud/huaweistack/shell/service.go rename to pkg/multicloud/hcso/shell/service.go index d3c96972c4..0f2a7d59aa 100644 --- a/pkg/multicloud/huaweistack/shell/service.go +++ b/pkg/multicloud/hcso/shell/service.go @@ -15,7 +15,7 @@ package shell import ( - huawei "yunion.io/x/onecloud/pkg/multicloud/huaweistack" + huawei "yunion.io/x/onecloud/pkg/multicloud/hcso" "yunion.io/x/onecloud/pkg/util/shellutils" ) diff --git a/pkg/multicloud/huaweistack/shell/skus.go b/pkg/multicloud/hcso/shell/skus.go similarity index 94% rename from pkg/multicloud/huaweistack/shell/skus.go rename to pkg/multicloud/hcso/shell/skus.go index 55909a8d2d..1330586703 100644 --- a/pkg/multicloud/huaweistack/shell/skus.go +++ b/pkg/multicloud/hcso/shell/skus.go @@ -15,7 +15,7 @@ package shell import ( - huawei "yunion.io/x/onecloud/pkg/multicloud/huaweistack" + huawei "yunion.io/x/onecloud/pkg/multicloud/hcso" "yunion.io/x/onecloud/pkg/util/shellutils" ) diff --git a/pkg/multicloud/huaweistack/shell/snapshot.go b/pkg/multicloud/hcso/shell/snapshot.go similarity index 96% rename from pkg/multicloud/huaweistack/shell/snapshot.go rename to pkg/multicloud/hcso/shell/snapshot.go index a258b3148f..0d756ae952 100644 --- a/pkg/multicloud/huaweistack/shell/snapshot.go +++ b/pkg/multicloud/hcso/shell/snapshot.go @@ -15,7 +15,7 @@ package shell import ( - huawei "yunion.io/x/onecloud/pkg/multicloud/huaweistack" + huawei "yunion.io/x/onecloud/pkg/multicloud/hcso" "yunion.io/x/onecloud/pkg/util/shellutils" ) diff --git a/pkg/multicloud/huaweistack/shell/vpc.go b/pkg/multicloud/hcso/shell/vpc.go similarity index 98% rename from pkg/multicloud/huaweistack/shell/vpc.go rename to pkg/multicloud/hcso/shell/vpc.go index 9958b35daa..6e0256e268 100644 --- a/pkg/multicloud/huaweistack/shell/vpc.go +++ b/pkg/multicloud/hcso/shell/vpc.go @@ -16,7 +16,7 @@ package shell import ( "yunion.io/x/onecloud/pkg/cloudprovider" - huawei "yunion.io/x/onecloud/pkg/multicloud/huaweistack" + huawei "yunion.io/x/onecloud/pkg/multicloud/hcso" "yunion.io/x/onecloud/pkg/util/shellutils" ) diff --git a/pkg/multicloud/huaweistack/shell/zone.go b/pkg/multicloud/hcso/shell/zone.go similarity index 94% rename from pkg/multicloud/huaweistack/shell/zone.go rename to pkg/multicloud/hcso/shell/zone.go index 8f55f655f0..dd3d172aee 100644 --- a/pkg/multicloud/huaweistack/shell/zone.go +++ b/pkg/multicloud/hcso/shell/zone.go @@ -15,7 +15,7 @@ package shell import ( - huawei "yunion.io/x/onecloud/pkg/multicloud/huaweistack" + huawei "yunion.io/x/onecloud/pkg/multicloud/hcso" "yunion.io/x/onecloud/pkg/util/shellutils" ) diff --git a/pkg/multicloud/huaweistack/snapshot.go b/pkg/multicloud/hcso/snapshot.go similarity index 99% rename from pkg/multicloud/huaweistack/snapshot.go rename to pkg/multicloud/hcso/snapshot.go index b0590269fb..dd661809cb 100644 --- a/pkg/multicloud/huaweistack/snapshot.go +++ b/pkg/multicloud/hcso/snapshot.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "fmt" diff --git a/pkg/multicloud/huaweistack/storage.go b/pkg/multicloud/hcso/storage.go similarity index 99% rename from pkg/multicloud/huaweistack/storage.go rename to pkg/multicloud/hcso/storage.go index d5f5c4fed0..7db6037b46 100644 --- a/pkg/multicloud/huaweistack/storage.go +++ b/pkg/multicloud/hcso/storage.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "fmt" diff --git a/pkg/multicloud/huaweistack/storagecache.go b/pkg/multicloud/hcso/storagecache.go similarity index 99% rename from pkg/multicloud/huaweistack/storagecache.go rename to pkg/multicloud/hcso/storagecache.go index b8f2bb4c13..68a16c2fe7 100644 --- a/pkg/multicloud/huaweistack/storagecache.go +++ b/pkg/multicloud/hcso/storagecache.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "context" diff --git a/pkg/multicloud/huaweistack/task.go b/pkg/multicloud/hcso/task.go similarity index 99% rename from pkg/multicloud/huaweistack/task.go rename to pkg/multicloud/hcso/task.go index 002a053a7a..af6609d6c5 100644 --- a/pkg/multicloud/huaweistack/task.go +++ b/pkg/multicloud/hcso/task.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "fmt" diff --git a/pkg/multicloud/huaweistack/traces.go b/pkg/multicloud/hcso/traces.go similarity index 99% rename from pkg/multicloud/huaweistack/traces.go rename to pkg/multicloud/hcso/traces.go index dfb3b7413e..73a0f7e6cd 100644 --- a/pkg/multicloud/huaweistack/traces.go +++ b/pkg/multicloud/hcso/traces.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "fmt" diff --git a/pkg/multicloud/huaweistack/utils.go b/pkg/multicloud/hcso/utils.go similarity index 98% rename from pkg/multicloud/huaweistack/utils.go rename to pkg/multicloud/hcso/utils.go index e8aa35bc47..79c04a4054 100644 --- a/pkg/multicloud/huaweistack/utils.go +++ b/pkg/multicloud/hcso/utils.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "fmt" @@ -25,8 +25,8 @@ import ( "yunion.io/x/pkg/utils" "yunion.io/x/onecloud/pkg/cloudprovider" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/manager" - "yunion.io/x/onecloud/pkg/multicloud/huaweistack/client/responses" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" + "yunion.io/x/onecloud/pkg/multicloud/hcso/client/responses" "yunion.io/x/onecloud/pkg/util/httputils" ) diff --git a/pkg/multicloud/huaweistack/vpc.go b/pkg/multicloud/hcso/vpc.go similarity index 99% rename from pkg/multicloud/huaweistack/vpc.go rename to pkg/multicloud/hcso/vpc.go index dd0e0abcb5..a1619377f0 100644 --- a/pkg/multicloud/huaweistack/vpc.go +++ b/pkg/multicloud/hcso/vpc.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "strings" diff --git a/pkg/multicloud/huaweistack/vpc_peering.go b/pkg/multicloud/hcso/vpc_peering.go similarity index 99% rename from pkg/multicloud/huaweistack/vpc_peering.go rename to pkg/multicloud/hcso/vpc_peering.go index 31429d954d..da1dbd9d7a 100644 --- a/pkg/multicloud/huaweistack/vpc_peering.go +++ b/pkg/multicloud/hcso/vpc_peering.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "yunion.io/x/jsonutils" diff --git a/pkg/multicloud/huaweistack/wire.go b/pkg/multicloud/hcso/wire.go similarity index 96% rename from pkg/multicloud/huaweistack/wire.go rename to pkg/multicloud/hcso/wire.go index 9c63f3fdd9..1d20cbfb2e 100644 --- a/pkg/multicloud/huaweistack/wire.go +++ b/pkg/multicloud/hcso/wire.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "fmt" @@ -188,8 +188,8 @@ func (self *SRegion) createNetwork(vpcId string, name string, cidr string, desc // hard code for hcso // https://support.huaweicloud.com/dns_faq/dns_faq_002.html // https://support.huaweicloud.com/api-dns/dns_api_69001.html - if self.client != nil && len(self.client.cpcfg.SHuaweiCloudStackEndpoints.DefaultSubnetDns) > 0 { - dns := strings.Split(self.client.cpcfg.SHuaweiCloudStackEndpoints.DefaultSubnetDns, ",") + if self.client != nil && len(self.client.cpcfg.SHCSOEndpoints.DefaultSubnetDns) > 0 { + dns := strings.Split(self.client.cpcfg.SHCSOEndpoints.DefaultSubnetDns, ",") if len(dns) > 0 && len(dns[0]) > 0 { subnetObj.Add(jsonutils.NewString(dns[0]), "primary_dns") } diff --git a/pkg/multicloud/huaweistack/zone.go b/pkg/multicloud/hcso/zone.go similarity index 99% rename from pkg/multicloud/huaweistack/zone.go rename to pkg/multicloud/hcso/zone.go index 6d5a4457e2..3a973f5c33 100644 --- a/pkg/multicloud/huaweistack/zone.go +++ b/pkg/multicloud/hcso/zone.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package huaweistack +package hcso import ( "fmt" diff --git a/pkg/multicloud/huaweistack/doc.go b/pkg/multicloud/huaweistack/doc.go deleted file mode 100644 index 05b9ca551d..0000000000 --- a/pkg/multicloud/huaweistack/doc.go +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright 2019 Yunion -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package huaweistack // import huawei "yunion.io/x/onecloud/pkg/multicloud/huaweistack" diff --git a/pkg/multicloud/loader/loader.go b/pkg/multicloud/loader/loader.go index bc8bbef09e..633b889539 100644 --- a/pkg/multicloud/loader/loader.go +++ b/pkg/multicloud/loader/loader.go @@ -27,7 +27,7 @@ import ( _ "yunion.io/x/onecloud/pkg/multicloud/esxi/provider" // private clouds _ "yunion.io/x/onecloud/pkg/multicloud/google/provider" // public clouds _ "yunion.io/x/onecloud/pkg/multicloud/huawei/provider" - _ "yunion.io/x/onecloud/pkg/multicloud/huaweistack/provider" + _ "yunion.io/x/onecloud/pkg/multicloud/hcso/provider" _ "yunion.io/x/onecloud/pkg/multicloud/jdcloud/provider" // public clouds _ "yunion.io/x/onecloud/pkg/multicloud/objectstore/ceph/provider" _ "yunion.io/x/onecloud/pkg/multicloud/objectstore/provider" From cd25e9dcbdfb67aa1447e696d3d1832507f53bed Mon Sep 17 00:00:00 2001 From: tb365 Date: Tue, 31 Aug 2021 11:09:34 +0800 Subject: [PATCH 3/3] make fmt --- pkg/apis/compute/cloudaccount_const.go | 34 +++--- pkg/apis/compute/guest_const.go | 106 +++++++++--------- pkg/apis/compute/host_const.go | 30 ++--- pkg/cloudevent/models/cloudproviders.go | 4 +- pkg/cloudid/models/cloudaccount.go | 4 +- pkg/cloudmon/collectors/cloudmoninit.go | 2 +- pkg/cloudmon/collectors/common/basemon.go | 18 +-- .../collectors/huaweimon/hwservice.go | 2 +- pkg/compute/models/cloudaccounts.go | 20 ++-- pkg/compute/models/cloudproviders.go | 4 +- pkg/multicloud/hcso/client/modules/mod_ces.go | 2 +- pkg/multicloud/hcso/huawei.go | 2 +- pkg/multicloud/hcso/region.go | 2 +- pkg/multicloud/loader/loader.go | 2 +- 14 files changed, 116 insertions(+), 116 deletions(-) diff --git a/pkg/apis/compute/cloudaccount_const.go b/pkg/apis/compute/cloudaccount_const.go index 00bbf2503d..7ee2d4eb3d 100644 --- a/pkg/apis/compute/cloudaccount_const.go +++ b/pkg/apis/compute/cloudaccount_const.go @@ -36,23 +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_HCSO = "HCSO" - 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_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_HCSO = "HCSO" + 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 6d5080bfff..840197ce74 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_HCSO = "hcso" - 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_ALIYUN = "aliyun" + HYPERVISOR_APSARA = "apsara" + HYPERVISOR_QCLOUD = "qcloud" + HYPERVISOR_AZURE = "azure" + HYPERVISOR_AWS = "aws" + HYPERVISOR_HUAWEI = "huawei" + HYPERVISOR_HCSO = "hcso" + 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_HCSO: HOST_TYPE_HCSO, - 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_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_HCSO: HOST_TYPE_HCSO, + 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_HCSO: HYPERVISOR_HCSO, - 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_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_HCSO: HYPERVISOR_HCSO, + 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 604610c2e8..0e8d57c666 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_HCSO = "hcso" - 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_ALIYUN = "aliyun" + HOST_TYPE_APSARA = "apsara" + HOST_TYPE_AWS = "aws" + HOST_TYPE_QCLOUD = "qcloud" + HOST_TYPE_AZURE = "azure" + HOST_TYPE_HUAWEI = "huawei" + HOST_TYPE_HCSO = "hcso" + 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 diff --git a/pkg/cloudevent/models/cloudproviders.go b/pkg/cloudevent/models/cloudproviders.go index abda47507c..7d8171501b 100644 --- a/pkg/cloudevent/models/cloudproviders.go +++ b/pkg/cloudevent/models/cloudproviders.go @@ -408,8 +408,8 @@ func (self *SCloudprovider) GetProvider() (cloudprovider.ICloudProvider, error) ProxyFunc: proxyFunc, - SHCSOEndpoints: delegate.Options.SHCSOEndpoints, - SApsaraEndpoints: delegate.Options.SApsaraEndpoints, + SHCSOEndpoints: delegate.Options.SHCSOEndpoints, + SApsaraEndpoints: delegate.Options.SApsaraEndpoints, }, ) } diff --git a/pkg/cloudid/models/cloudaccount.go b/pkg/cloudid/models/cloudaccount.go index 65abe56d00..8fbf5c67e5 100644 --- a/pkg/cloudid/models/cloudaccount.go +++ b/pkg/cloudid/models/cloudaccount.go @@ -568,8 +568,8 @@ func (account *SCloudDelegate) GetProvider() (cloudprovider.ICloudProvider, erro Secret: passwd, ProxyFunc: proxyFunc, - SApsaraEndpoints: account.Options.SApsaraEndpoints, - SHCSOEndpoints: account.Options.SHCSOEndpoints, + SApsaraEndpoints: account.Options.SApsaraEndpoints, + SHCSOEndpoints: account.Options.SHCSOEndpoints, AccountId: account.Id, }) diff --git a/pkg/cloudmon/collectors/cloudmoninit.go b/pkg/cloudmon/collectors/cloudmoninit.go index 4b005a0cbb..896c1ae43e 100644 --- a/pkg/cloudmon/collectors/cloudmoninit.go +++ b/pkg/cloudmon/collectors/cloudmoninit.go @@ -34,8 +34,8 @@ import ( _ "yunion.io/x/onecloud/pkg/multicloud/azure/provider" _ "yunion.io/x/onecloud/pkg/multicloud/esxi/provider" _ "yunion.io/x/onecloud/pkg/multicloud/google/provider" - _ "yunion.io/x/onecloud/pkg/multicloud/huawei/provider" _ "yunion.io/x/onecloud/pkg/multicloud/hcso/provider" + _ "yunion.io/x/onecloud/pkg/multicloud/huawei/provider" _ "yunion.io/x/onecloud/pkg/multicloud/jdcloud/provider" _ "yunion.io/x/onecloud/pkg/multicloud/qcloud/provider" _ "yunion.io/x/onecloud/pkg/multicloud/zstack/provider" diff --git a/pkg/cloudmon/collectors/common/basemon.go b/pkg/cloudmon/collectors/common/basemon.go index 069ab0ec5c..14b70b417e 100644 --- a/pkg/cloudmon/collectors/common/basemon.go +++ b/pkg/cloudmon/collectors/common/basemon.go @@ -139,15 +139,15 @@ func (self *CloudReportBase) InitProviderInstance() (cloudprovider.ICloudProvide log.Errorf("get cloudAccout options err:%v", err) } cfg := cloudprovider.ProviderConfig{ - Id: self.SProvider.Id, - Name: self.SProvider.Name, - URL: self.SProvider.AccessUrl, - Account: self.SProvider.Account, - Secret: secretDe, - Vendor: self.SProvider.Provider, - ProxyFunc: proxyFunc, - SApsaraEndpoints: endpoints, - SHCSOEndpoints: hwendpoints, + Id: self.SProvider.Id, + Name: self.SProvider.Name, + URL: self.SProvider.AccessUrl, + Account: self.SProvider.Account, + Secret: secretDe, + Vendor: self.SProvider.Provider, + ProxyFunc: proxyFunc, + SApsaraEndpoints: endpoints, + SHCSOEndpoints: hwendpoints, } return cloudprovider.GetProvider(cfg) } diff --git a/pkg/cloudmon/collectors/huaweimon/hwservice.go b/pkg/cloudmon/collectors/huaweimon/hwservice.go index 55ac0fe86c..8b3b38921d 100644 --- a/pkg/cloudmon/collectors/huaweimon/hwservice.go +++ b/pkg/cloudmon/collectors/huaweimon/hwservice.go @@ -25,9 +25,9 @@ import ( "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudmon/collectors/common" "yunion.io/x/onecloud/pkg/cloudprovider" + "yunion.io/x/onecloud/pkg/multicloud/hcso" "yunion.io/x/onecloud/pkg/multicloud/huawei" hw_moudules "yunion.io/x/onecloud/pkg/multicloud/huawei/client/modules" - "yunion.io/x/onecloud/pkg/multicloud/hcso" "yunion.io/x/onecloud/pkg/util/influxdb" ) diff --git a/pkg/compute/models/cloudaccounts.go b/pkg/compute/models/cloudaccounts.go index 3785b2ed9f..22c9e73ad2 100644 --- a/pkg/compute/models/cloudaccounts.go +++ b/pkg/compute/models/cloudaccounts.go @@ -511,8 +511,8 @@ func (manager *SCloudaccountManager) validateCreateData( Secret: input.Secret, ProxyFunc: proxyFunc, - SApsaraEndpoints: endpoints, - SHCSOEndpoints: hcsoEndpoints, + SApsaraEndpoints: endpoints, + SHCSOEndpoints: hcsoEndpoints, }) if err != nil { if err == cloudprovider.ErrNoSuchProvder { @@ -740,12 +740,12 @@ func (self *SCloudaccount) PerformUpdateCredential(ctx context.Context, userCred } accountId, err := cloudprovider.IsValidCloudAccount(cloudprovider.ProviderConfig{ - Vendor: self.Provider, - URL: self.AccessUrl, - Account: account.Account, - Secret: account.Secret, + Vendor: self.Provider, + URL: self.AccessUrl, + Account: account.Account, + Secret: account.Secret, SHCSOEndpoints: hcsoEndpoints, - ProxyFunc: self.proxyFunc(), + ProxyFunc: self.proxyFunc(), }) if err != nil { return nil, httperrors.NewInputParameterError("invalid cloud account info error: %s", err.Error()) @@ -954,9 +954,9 @@ func (self *SCloudaccount) getProviderInternal() (cloudprovider.ICloudProvider, Account: self.Account, Secret: secret, - SApsaraEndpoints: endpoints, - SHCSOEndpoints: hcsoEndpoints, - ProxyFunc: self.proxyFunc(), + SApsaraEndpoints: endpoints, + SHCSOEndpoints: hcsoEndpoints, + ProxyFunc: self.proxyFunc(), }) } diff --git a/pkg/compute/models/cloudproviders.go b/pkg/compute/models/cloudproviders.go index 7c83181637..ae81ffeaff 100644 --- a/pkg/compute/models/cloudproviders.go +++ b/pkg/compute/models/cloudproviders.go @@ -893,8 +893,8 @@ func (self *SCloudprovider) GetProvider() (cloudprovider.ICloudProvider, error) Secret: passwd, ProxyFunc: account.proxyFunc(), - SApsaraEndpoints: endpoints, - SHCSOEndpoints: hscsoEndpoints, + SApsaraEndpoints: endpoints, + SHCSOEndpoints: hscsoEndpoints, }) } diff --git a/pkg/multicloud/hcso/client/modules/mod_ces.go b/pkg/multicloud/hcso/client/modules/mod_ces.go index a6c691b689..91112b97ec 100644 --- a/pkg/multicloud/hcso/client/modules/mod_ces.go +++ b/pkg/multicloud/hcso/client/modules/mod_ces.go @@ -21,9 +21,9 @@ import ( "yunion.io/x/pkg/errors" "yunion.io/x/onecloud/pkg/httperrors" - hw_mod "yunion.io/x/onecloud/pkg/multicloud/huawei/client/modules" "yunion.io/x/onecloud/pkg/multicloud/hcso/client/manager" "yunion.io/x/onecloud/pkg/multicloud/hcso/client/requests" + hw_mod "yunion.io/x/onecloud/pkg/multicloud/huawei/client/modules" ) type SCloudEyeManager struct { diff --git a/pkg/multicloud/hcso/huawei.go b/pkg/multicloud/hcso/huawei.go index 70f5196a83..ab49605156 100644 --- a/pkg/multicloud/hcso/huawei.go +++ b/pkg/multicloud/hcso/huawei.go @@ -25,10 +25,10 @@ import ( api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudprovider" - "yunion.io/x/onecloud/pkg/multicloud/huawei/obs" "yunion.io/x/onecloud/pkg/multicloud/hcso/client" "yunion.io/x/onecloud/pkg/multicloud/hcso/client/auth" "yunion.io/x/onecloud/pkg/multicloud/hcso/client/auth/credentials" + "yunion.io/x/onecloud/pkg/multicloud/huawei/obs" ) /* diff --git a/pkg/multicloud/hcso/region.go b/pkg/multicloud/hcso/region.go index ddc5e891f7..89ac9c2543 100644 --- a/pkg/multicloud/hcso/region.go +++ b/pkg/multicloud/hcso/region.go @@ -27,8 +27,8 @@ import ( api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/multicloud" - "yunion.io/x/onecloud/pkg/multicloud/huawei/obs" "yunion.io/x/onecloud/pkg/multicloud/hcso/client" + "yunion.io/x/onecloud/pkg/multicloud/huawei/obs" ) type Locales struct { diff --git a/pkg/multicloud/loader/loader.go b/pkg/multicloud/loader/loader.go index 633b889539..54a147691c 100644 --- a/pkg/multicloud/loader/loader.go +++ b/pkg/multicloud/loader/loader.go @@ -26,8 +26,8 @@ import ( _ "yunion.io/x/onecloud/pkg/multicloud/ecloud/provider" // public clouds _ "yunion.io/x/onecloud/pkg/multicloud/esxi/provider" // private clouds _ "yunion.io/x/onecloud/pkg/multicloud/google/provider" // public clouds - _ "yunion.io/x/onecloud/pkg/multicloud/huawei/provider" _ "yunion.io/x/onecloud/pkg/multicloud/hcso/provider" + _ "yunion.io/x/onecloud/pkg/multicloud/huawei/provider" _ "yunion.io/x/onecloud/pkg/multicloud/jdcloud/provider" // public clouds _ "yunion.io/x/onecloud/pkg/multicloud/objectstore/ceph/provider" _ "yunion.io/x/onecloud/pkg/multicloud/objectstore/provider"