支持natgateway同步

pkg/util/aws/eip.go

@@ -113,7 +113,7 @@ func (self *SEipAddress) GetMode() string {
 
 func (self *SEipAddress) GetAssociationType() string {
 	// todo : ?
-	return "server"
+	return api.EIP_ASSOCIATE_TYPE_SERVER
 }
 
 func (self *SEipAddress) GetAssociationExternalId() string {

pkg/util/aws/vpc.go

@@ -25,6 +25,7 @@ import (
 	"yunion.io/x/pkg/util/secrules"
 
 	"yunion.io/x/onecloud/pkg/cloudprovider"
+	"yunion.io/x/onecloud/pkg/multicloud"
 )
 
 type SUserCIDRs struct {
@@ -32,6 +33,8 @@ type SUserCIDRs struct {
 }
 
 type SVpc struct {
+	multicloud.SVpc
+
 	region *SRegion
 
 	iwires    []cloudprovider.ICloudWire