From db00c83555f0b1440603ff39aa7230acec2d0063 Mon Sep 17 00:00:00 2001 From: Qu Xuan Date: Mon, 23 Nov 2020 17:33:05 +0800 Subject: [PATCH] fix(region): set classic vpc name to "-" --- pkg/compute/models/vpcs.go | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/pkg/compute/models/vpcs.go b/pkg/compute/models/vpcs.go index 272bc49a16..0defdf5daf 100644 --- a/pkg/compute/models/vpcs.go +++ b/pkg/compute/models/vpcs.go @@ -282,7 +282,7 @@ func (manager *SVpcManager) GetOrCreateVpcForClassicNetwork(ctx context.Context, vpc.IsDefault = false vpc.CloudregionId = region.Id vpc.SetModelManager(manager, vpc) - vpc.Name = fmt.Sprintf("emulated vpc for %s %s classic network", region.Name, cloudprovider.Name) + vpc.Name = "-" vpc.IsEmulated = true vpc.SetEnabled(false) vpc.Status = api.VPC_STATUS_UNAVAILABLE @@ -730,6 +730,26 @@ func (manager *SVpcManager) InitializeData() error { } } + { + vpcs := []SVpc{} + q := manager.Query().IsTrue("is_emulated").IsNotEmpty("external_id").NotEquals("name", "-") + err := db.FetchModelObjects(manager, q, &vpcs) + if err != nil { + return errors.Wrapf(err, "db.FetchModelObjects") + } + for i := range vpcs { + if vpcs[i].ExternalId == manager.getVpcExternalIdForClassicNetwork(vpcs[i].CloudregionId, vpcs[i].ManagerId) { + _, err = db.Update(&vpcs[i], func() error { + vpcs[i].Name = "-" + return nil + }) + if err != nil { + return errors.Wrapf(err, "db.Update class vpc name") + } + } + } + } + return nil }