From 00f1f520021828fe43ff47975482cfc31b040c81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Thu, 26 Oct 2023 18:34:52 +0800 Subject: [PATCH] fix(region): remove useless code (#18454) --- pkg/compute/regiondrivers/azure.go | 34 --------------------- pkg/compute/regiondrivers/bingocloud.go | 34 --------------------- pkg/compute/regiondrivers/cloudpods.go | 34 --------------------- pkg/compute/regiondrivers/ctyun.go | 34 --------------------- pkg/compute/regiondrivers/huawei.go | 32 ------------------- pkg/compute/regiondrivers/managedvirtual.go | 1 + pkg/compute/regiondrivers/openstack.go | 34 --------------------- pkg/compute/regiondrivers/qcloud.go | 31 ------------------- pkg/compute/regiondrivers/ucloud.go | 34 --------------------- pkg/compute/regiondrivers/zstack.go | 34 --------------------- 10 files changed, 1 insertion(+), 301 deletions(-) diff --git a/pkg/compute/regiondrivers/azure.go b/pkg/compute/regiondrivers/azure.go index d5ec9878d3..5094602da5 100644 --- a/pkg/compute/regiondrivers/azure.go +++ b/pkg/compute/regiondrivers/azure.go @@ -16,12 +16,9 @@ package regiondrivers import ( "context" - "fmt" - "time" "yunion.io/x/cloudmux/pkg/cloudprovider" "yunion.io/x/jsonutils" - "yunion.io/x/pkg/errors" "yunion.io/x/sqlchemy" api "yunion.io/x/onecloud/pkg/apis/compute" @@ -110,34 +107,3 @@ func (self *SAzureRegionDriver) GetSecurityGroupFilter(vpc *models.SVpc) (func(q return q.Equals("cloudregion_id", vpc.CloudregionId) }, nil } - -func (self *SAzureRegionDriver) CreateDefaultSecurityGroup( - ctx context.Context, - userCred mcclient.TokenCredential, - ownerId mcclient.IIdentityProvider, - vpc *models.SVpc, -) (*models.SSecurityGroup, error) { - newGroup := &models.SSecurityGroup{} - newGroup.SetModelManager(models.SecurityGroupManager, newGroup) - newGroup.Name = fmt.Sprintf("default-auto-%d", time.Now().Unix()) - newGroup.Description = "auto generage" - newGroup.ManagerId = vpc.ManagerId - newGroup.CloudregionId = vpc.CloudregionId - newGroup.DomainId = ownerId.GetDomainId() - newGroup.ProjectId = ownerId.GetProjectId() - err := models.SecurityGroupManager.TableSpec().Insert(ctx, newGroup) - if err != nil { - return nil, errors.Wrapf(err, "insert") - } - - region, err := vpc.GetRegion() - if err != nil { - return nil, errors.Wrapf(err, "GetRegion") - } - driver := region.GetDriver() - err = driver.RequestCreateSecurityGroup(ctx, userCred, newGroup, api.SSecgroupRuleResourceSet{}) - if err != nil { - return nil, errors.Wrapf(err, "RequestCreateSecurityGroup") - } - return newGroup, nil -} diff --git a/pkg/compute/regiondrivers/bingocloud.go b/pkg/compute/regiondrivers/bingocloud.go index 39fc0d73ef..f82dc2b39e 100644 --- a/pkg/compute/regiondrivers/bingocloud.go +++ b/pkg/compute/regiondrivers/bingocloud.go @@ -16,11 +16,8 @@ package regiondrivers import ( "context" - "fmt" "strings" - "time" - "yunion.io/x/pkg/errors" "yunion.io/x/sqlchemy" api "yunion.io/x/onecloud/pkg/apis/compute" @@ -69,34 +66,3 @@ func (self *SBingoCloudRegionDriver) GetSecurityGroupFilter(vpc *models.SVpc) (f return q.Equals("cloudregion_id", vpc.CloudregionId) }, nil } - -func (self *SBingoCloudRegionDriver) CreateDefaultSecurityGroup( - ctx context.Context, - userCred mcclient.TokenCredential, - ownerId mcclient.IIdentityProvider, - vpc *models.SVpc, -) (*models.SSecurityGroup, error) { - newGroup := &models.SSecurityGroup{} - newGroup.SetModelManager(models.SecurityGroupManager, newGroup) - newGroup.Name = fmt.Sprintf("default-auto-%d", time.Now().Unix()) - newGroup.Description = "auto generage" - newGroup.ManagerId = vpc.ManagerId - newGroup.CloudregionId = vpc.CloudregionId - newGroup.DomainId = ownerId.GetDomainId() - newGroup.ProjectId = ownerId.GetProjectId() - err := models.SecurityGroupManager.TableSpec().Insert(ctx, newGroup) - if err != nil { - return nil, errors.Wrapf(err, "insert") - } - - region, err := vpc.GetRegion() - if err != nil { - return nil, errors.Wrapf(err, "GetRegion") - } - driver := region.GetDriver() - err = driver.RequestCreateSecurityGroup(ctx, userCred, newGroup, api.SSecgroupRuleResourceSet{}) - if err != nil { - return nil, errors.Wrapf(err, "RequestCreateSecurityGroup") - } - return newGroup, nil -} diff --git a/pkg/compute/regiondrivers/cloudpods.go b/pkg/compute/regiondrivers/cloudpods.go index 669775357b..2e3ab27f38 100644 --- a/pkg/compute/regiondrivers/cloudpods.go +++ b/pkg/compute/regiondrivers/cloudpods.go @@ -16,10 +16,7 @@ package regiondrivers import ( "context" - "fmt" - "time" - "yunion.io/x/pkg/errors" "yunion.io/x/pkg/utils" "yunion.io/x/sqlchemy" @@ -77,34 +74,3 @@ func (self *SCloudpodsRegionDriver) GetSecurityGroupFilter(vpc *models.SVpc) (fu return q.Equals("cloudregion_id", vpc.CloudregionId) }, nil } - -func (self *SCloudpodsRegionDriver) CreateDefaultSecurityGroup( - ctx context.Context, - userCred mcclient.TokenCredential, - ownerId mcclient.IIdentityProvider, - vpc *models.SVpc, -) (*models.SSecurityGroup, error) { - newGroup := &models.SSecurityGroup{} - newGroup.SetModelManager(models.SecurityGroupManager, newGroup) - newGroup.Name = fmt.Sprintf("default-auto-%d", time.Now().Unix()) - newGroup.Description = "auto generage" - newGroup.ManagerId = vpc.ManagerId - newGroup.CloudregionId = vpc.CloudregionId - newGroup.DomainId = ownerId.GetDomainId() - newGroup.ProjectId = ownerId.GetProjectId() - err := models.SecurityGroupManager.TableSpec().Insert(ctx, newGroup) - if err != nil { - return nil, errors.Wrapf(err, "insert") - } - - region, err := vpc.GetRegion() - if err != nil { - return nil, errors.Wrapf(err, "GetRegion") - } - driver := region.GetDriver() - err = driver.RequestCreateSecurityGroup(ctx, userCred, newGroup, api.SSecgroupRuleResourceSet{}) - if err != nil { - return nil, errors.Wrapf(err, "RequestCreateSecurityGroup") - } - return newGroup, nil -} diff --git a/pkg/compute/regiondrivers/ctyun.go b/pkg/compute/regiondrivers/ctyun.go index 90e21c3282..acd113cade 100644 --- a/pkg/compute/regiondrivers/ctyun.go +++ b/pkg/compute/regiondrivers/ctyun.go @@ -16,12 +16,9 @@ package regiondrivers import ( "context" - "fmt" "strings" - "time" "yunion.io/x/jsonutils" - "yunion.io/x/pkg/errors" "yunion.io/x/sqlchemy" api "yunion.io/x/onecloud/pkg/apis/compute" @@ -90,34 +87,3 @@ func (self *SCtyunRegionDriver) GetSecurityGroupFilter(vpc *models.SVpc) (func(q return q.Equals("cloudregion_id", vpc.CloudregionId) }, nil } - -func (self *SCtyunRegionDriver) CreateDefaultSecurityGroup( - ctx context.Context, - userCred mcclient.TokenCredential, - ownerId mcclient.IIdentityProvider, - vpc *models.SVpc, -) (*models.SSecurityGroup, error) { - newGroup := &models.SSecurityGroup{} - newGroup.SetModelManager(models.SecurityGroupManager, newGroup) - newGroup.Name = fmt.Sprintf("default-auto-%d", time.Now().Unix()) - newGroup.Description = "auto generage" - newGroup.ManagerId = vpc.ManagerId - newGroup.CloudregionId = vpc.CloudregionId - newGroup.DomainId = ownerId.GetDomainId() - newGroup.ProjectId = ownerId.GetProjectId() - err := models.SecurityGroupManager.TableSpec().Insert(ctx, newGroup) - if err != nil { - return nil, errors.Wrapf(err, "insert") - } - - region, err := vpc.GetRegion() - if err != nil { - return nil, errors.Wrapf(err, "GetRegion") - } - driver := region.GetDriver() - err = driver.RequestCreateSecurityGroup(ctx, userCred, newGroup, api.SSecgroupRuleResourceSet{}) - if err != nil { - return nil, errors.Wrapf(err, "RequestCreateSecurityGroup") - } - return newGroup, nil -} diff --git a/pkg/compute/regiondrivers/huawei.go b/pkg/compute/regiondrivers/huawei.go index 5bfd320b25..e9a0ffccd1 100644 --- a/pkg/compute/regiondrivers/huawei.go +++ b/pkg/compute/regiondrivers/huawei.go @@ -18,7 +18,6 @@ import ( "context" "fmt" "strings" - "time" "yunion.io/x/cloudmux/pkg/cloudprovider" "yunion.io/x/jsonutils" @@ -627,34 +626,3 @@ func (self *SHuaWeiRegionDriver) GetSecurityGroupFilter(vpc *models.SVpc) (func( return q.Equals("cloudregion_id", vpc.CloudregionId).Equals("manager_id", vpc.ManagerId) }, nil } - -func (self *SHuaWeiRegionDriver) CreateDefaultSecurityGroup( - ctx context.Context, - userCred mcclient.TokenCredential, - ownerId mcclient.IIdentityProvider, - vpc *models.SVpc, -) (*models.SSecurityGroup, error) { - newGroup := &models.SSecurityGroup{} - newGroup.SetModelManager(models.SecurityGroupManager, newGroup) - newGroup.Name = fmt.Sprintf("default-auto-%d", time.Now().Unix()) - newGroup.Description = "auto generage" - newGroup.ManagerId = vpc.ManagerId - newGroup.CloudregionId = vpc.CloudregionId - newGroup.DomainId = ownerId.GetDomainId() - newGroup.ProjectId = ownerId.GetProjectId() - err := models.SecurityGroupManager.TableSpec().Insert(ctx, newGroup) - if err != nil { - return nil, errors.Wrapf(err, "insert") - } - - region, err := vpc.GetRegion() - if err != nil { - return nil, errors.Wrapf(err, "GetRegion") - } - driver := region.GetDriver() - err = driver.RequestCreateSecurityGroup(ctx, userCred, newGroup, api.SSecgroupRuleResourceSet{}) - if err != nil { - return nil, errors.Wrapf(err, "RequestCreateSecurityGroup") - } - return newGroup, nil -} diff --git a/pkg/compute/regiondrivers/managedvirtual.go b/pkg/compute/regiondrivers/managedvirtual.go index 52eb87b756..1cb5c98872 100644 --- a/pkg/compute/regiondrivers/managedvirtual.go +++ b/pkg/compute/regiondrivers/managedvirtual.go @@ -3497,6 +3497,7 @@ func (self *SManagedVirtualizationRegionDriver) CreateDefaultSecurityGroup( newGroup.SetModelManager(models.SecurityGroupManager, newGroup) newGroup.Name = fmt.Sprintf("default-auto-%d", time.Now().Unix()) newGroup.Description = "auto generage" + // 部分云可能不需要vpcId, 创建完安全组后会自动置空 newGroup.VpcId = vpc.Id newGroup.ManagerId = vpc.ManagerId newGroup.CloudregionId = vpc.CloudregionId diff --git a/pkg/compute/regiondrivers/openstack.go b/pkg/compute/regiondrivers/openstack.go index 309fa99fa1..46d72facd7 100644 --- a/pkg/compute/regiondrivers/openstack.go +++ b/pkg/compute/regiondrivers/openstack.go @@ -17,12 +17,9 @@ package regiondrivers import ( "context" "database/sql" - "fmt" - "time" "yunion.io/x/cloudmux/pkg/cloudprovider" "yunion.io/x/jsonutils" - "yunion.io/x/pkg/errors" "yunion.io/x/sqlchemy" api "yunion.io/x/onecloud/pkg/apis/compute" @@ -133,34 +130,3 @@ func (self *SOpenStackRegionDriver) GetSecurityGroupFilter(vpc *models.SVpc) (fu return q.Equals("cloudregion_id", vpc.CloudregionId) }, nil } - -func (self *SOpenStackRegionDriver) CreateDefaultSecurityGroup( - ctx context.Context, - userCred mcclient.TokenCredential, - ownerId mcclient.IIdentityProvider, - vpc *models.SVpc, -) (*models.SSecurityGroup, error) { - newGroup := &models.SSecurityGroup{} - newGroup.SetModelManager(models.SecurityGroupManager, newGroup) - newGroup.Name = fmt.Sprintf("default-auto-%d", time.Now().Unix()) - newGroup.Description = "auto generage" - newGroup.ManagerId = vpc.ManagerId - newGroup.CloudregionId = vpc.CloudregionId - newGroup.DomainId = ownerId.GetDomainId() - newGroup.ProjectId = ownerId.GetProjectId() - err := models.SecurityGroupManager.TableSpec().Insert(ctx, newGroup) - if err != nil { - return nil, errors.Wrapf(err, "insert") - } - - region, err := vpc.GetRegion() - if err != nil { - return nil, errors.Wrapf(err, "GetRegion") - } - driver := region.GetDriver() - err = driver.RequestCreateSecurityGroup(ctx, userCred, newGroup, api.SSecgroupRuleResourceSet{}) - if err != nil { - return nil, errors.Wrapf(err, "RequestCreateSecurityGroup") - } - return newGroup, nil -} diff --git a/pkg/compute/regiondrivers/qcloud.go b/pkg/compute/regiondrivers/qcloud.go index 6553ebb84e..26c3428be5 100644 --- a/pkg/compute/regiondrivers/qcloud.go +++ b/pkg/compute/regiondrivers/qcloud.go @@ -626,34 +626,3 @@ func (self *SQcloudRegionDriver) GetSecurityGroupFilter(vpc *models.SVpc) (func( return q.Equals("cloudregion_id", vpc.CloudregionId) }, nil } - -func (self *SQcloudRegionDriver) CreateDefaultSecurityGroup( - ctx context.Context, - userCred mcclient.TokenCredential, - ownerId mcclient.IIdentityProvider, - vpc *models.SVpc, -) (*models.SSecurityGroup, error) { - newGroup := &models.SSecurityGroup{} - newGroup.SetModelManager(models.SecurityGroupManager, newGroup) - newGroup.Name = fmt.Sprintf("default-auto-%d", time.Now().Unix()) - newGroup.Description = "auto generage" - newGroup.ManagerId = vpc.ManagerId - newGroup.CloudregionId = vpc.CloudregionId - newGroup.DomainId = ownerId.GetDomainId() - newGroup.ProjectId = ownerId.GetProjectId() - err := models.SecurityGroupManager.TableSpec().Insert(ctx, newGroup) - if err != nil { - return nil, errors.Wrapf(err, "insert") - } - - region, err := vpc.GetRegion() - if err != nil { - return nil, errors.Wrapf(err, "GetRegion") - } - driver := region.GetDriver() - err = driver.RequestCreateSecurityGroup(ctx, userCred, newGroup, api.SSecgroupRuleResourceSet{}) - if err != nil { - return nil, errors.Wrapf(err, "RequestCreateSecurityGroup") - } - return newGroup, nil -} diff --git a/pkg/compute/regiondrivers/ucloud.go b/pkg/compute/regiondrivers/ucloud.go index 5ac6c32215..2a2dd25173 100644 --- a/pkg/compute/regiondrivers/ucloud.go +++ b/pkg/compute/regiondrivers/ucloud.go @@ -16,12 +16,9 @@ package regiondrivers import ( "context" - "fmt" "strings" - "time" "yunion.io/x/jsonutils" - "yunion.io/x/pkg/errors" "yunion.io/x/pkg/util/secrules" "yunion.io/x/sqlchemy" @@ -97,34 +94,3 @@ func (self *SUcloudRegionDriver) GetSecurityGroupFilter(vpc *models.SVpc) (func( return q.Equals("cloudregion_id", vpc.CloudregionId) }, nil } - -func (self *SUcloudRegionDriver) CreateDefaultSecurityGroup( - ctx context.Context, - userCred mcclient.TokenCredential, - ownerId mcclient.IIdentityProvider, - vpc *models.SVpc, -) (*models.SSecurityGroup, error) { - newGroup := &models.SSecurityGroup{} - newGroup.SetModelManager(models.SecurityGroupManager, newGroup) - newGroup.Name = fmt.Sprintf("default-auto-%d", time.Now().Unix()) - newGroup.Description = "auto generage" - newGroup.ManagerId = vpc.ManagerId - newGroup.CloudregionId = vpc.CloudregionId - newGroup.DomainId = ownerId.GetDomainId() - newGroup.ProjectId = ownerId.GetProjectId() - err := models.SecurityGroupManager.TableSpec().Insert(ctx, newGroup) - if err != nil { - return nil, errors.Wrapf(err, "insert") - } - - region, err := vpc.GetRegion() - if err != nil { - return nil, errors.Wrapf(err, "GetRegion") - } - driver := region.GetDriver() - err = driver.RequestCreateSecurityGroup(ctx, userCred, newGroup, api.SSecgroupRuleResourceSet{}) - if err != nil { - return nil, errors.Wrapf(err, "RequestCreateSecurityGroup") - } - return newGroup, nil -} diff --git a/pkg/compute/regiondrivers/zstack.go b/pkg/compute/regiondrivers/zstack.go index 28deacc40f..eba6356b99 100644 --- a/pkg/compute/regiondrivers/zstack.go +++ b/pkg/compute/regiondrivers/zstack.go @@ -17,11 +17,8 @@ package regiondrivers import ( "context" "database/sql" - "fmt" "strings" - "time" - "yunion.io/x/pkg/errors" "yunion.io/x/sqlchemy" api "yunion.io/x/onecloud/pkg/apis/compute" @@ -94,34 +91,3 @@ func (self *SZStackRegionDriver) GetSecurityGroupFilter(vpc *models.SVpc) (func( return q.Equals("cloudregion_id", vpc.CloudregionId) }, nil } - -func (self *SZStackRegionDriver) CreateDefaultSecurityGroup( - ctx context.Context, - userCred mcclient.TokenCredential, - ownerId mcclient.IIdentityProvider, - vpc *models.SVpc, -) (*models.SSecurityGroup, error) { - newGroup := &models.SSecurityGroup{} - newGroup.SetModelManager(models.SecurityGroupManager, newGroup) - newGroup.Name = fmt.Sprintf("default-auto-%d", time.Now().Unix()) - newGroup.Description = "auto generage" - newGroup.ManagerId = vpc.ManagerId - newGroup.CloudregionId = vpc.CloudregionId - newGroup.DomainId = ownerId.GetDomainId() - newGroup.ProjectId = ownerId.GetProjectId() - err := models.SecurityGroupManager.TableSpec().Insert(ctx, newGroup) - if err != nil { - return nil, errors.Wrapf(err, "insert") - } - - region, err := vpc.GetRegion() - if err != nil { - return nil, errors.Wrapf(err, "GetRegion") - } - driver := region.GetDriver() - err = driver.RequestCreateSecurityGroup(ctx, userCred, newGroup, api.SSecgroupRuleResourceSet{}) - if err != nil { - return nil, errors.Wrapf(err, "RequestCreateSecurityGroup") - } - return newGroup, nil -}