@@ -1623,13 +1623,13 @@ func (self *SDBInstance) SetZoneIds(extInstance cloudprovider.ICloudDBInstance)
16231623 return errors .Wrapf (err , "GetZones" )
16241624 }
16251625 var setZoneId = func (input string , output * string ) {
1626+ * output = input
16261627 for _ , zone := range zones {
16271628 if strings .HasSuffix (zone .ExternalId , input ) {
16281629 * output = zone .Id
16291630 break
16301631 }
16311632 }
1632- return
16331633 }
16341634 zone1 := extInstance .GetZone1Id ()
16351635 if len (zone1 ) > 0 {
@@ -1705,26 +1705,13 @@ func (self *SDBInstance) SyncWithCloudDBInstance(ctx context.Context, userCred m
17051705 self .CreatedAt = createdAt
17061706 }
17071707
1708- if len (self .VpcId ) == 0 {
1709- if vpcId := ext .GetIVpcId (); len (vpcId ) > 0 {
1710- vpc , err := db .FetchByExternalIdAndManagerId (VpcManager , vpcId , func (q * sqlchemy.SQuery ) * sqlchemy.SQuery {
1711- return q .Equals ("manager_id" , provider .Id )
1712- })
1713- if err != nil {
1714- log .Errorf ("FetchVpcId(%s) error: %v" , vpcId , err )
1715- } else {
1716- self .VpcId = vpc .GetId ()
1717- }
1718- }
1719- }
1720- if len (self .VpcId ) == 0 {
1721- region , err := self .GetRegion ()
1722- if err != nil {
1723- return err
1724- }
1725- vpc , err := VpcManager .GetOrCreateVpcForClassicNetwork (ctx , provider , region )
1708+ if vpcId := ext .GetIVpcId (); len (vpcId ) > 0 {
1709+ self .VpcId = vpcId
1710+ vpc , err := db .FetchByExternalIdAndManagerId (VpcManager , vpcId , func (q * sqlchemy.SQuery ) * sqlchemy.SQuery {
1711+ return q .Equals ("manager_id" , provider .Id )
1712+ })
17261713 if err != nil {
1727- log .Errorf ("failed to create classic vpc for region %s error: %v" , region . Name , err )
1714+ log .Errorf ("FetchVpcId(%s) error: %v" , vpcId , err )
17281715 } else {
17291716 self .VpcId = vpc .GetId ()
17301717 }
@@ -1792,6 +1779,7 @@ func (manager *SDBInstanceManager) newFromCloudDBInstance(ctx context.Context, u
17921779 instance .SetZoneIds (extInstance )
17931780
17941781 if vpcId := extInstance .GetIVpcId (); len (vpcId ) > 0 {
1782+ instance .VpcId = vpcId
17951783 vpc , err := db .FetchByExternalIdAndManagerId (VpcManager , vpcId , func (q * sqlchemy.SQuery ) * sqlchemy.SQuery {
17961784 return q .Equals ("manager_id" , provider .Id )
17971785 })
@@ -1801,14 +1789,6 @@ func (manager *SDBInstanceManager) newFromCloudDBInstance(ctx context.Context, u
18011789 instance .VpcId = vpc .GetId ()
18021790 }
18031791 }
1804- if len (instance .VpcId ) == 0 {
1805- vpc , err := VpcManager .GetOrCreateVpcForClassicNetwork (ctx , provider , region )
1806- if err != nil {
1807- log .Errorf ("failed to create classic vpc for region %s error: %v" , region .Name , err )
1808- } else {
1809- instance .VpcId = vpc .GetId ()
1810- }
1811- }
18121792
18131793 if createdAt := extInstance .GetCreatedAt (); ! createdAt .IsZero () {
18141794 instance .CreatedAt = createdAt
0 commit comments