From 94d93bee07be298d1918e1fcd7bdcbc8008114eb Mon Sep 17 00:00:00 2001
From: TangBin <tangbin@yunionyun.com>
Date: Thu, 25 Oct 2018 18:26:25 +0800
Subject: [PATCH] security group list update

---
 pkg/util/aws/instance.go      | 30 +++++++++++++++++-------------
 pkg/util/aws/securitygroup.go |  5 +++++
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/pkg/util/aws/instance.go b/pkg/util/aws/instance.go
index 32f9c2eeb1..f4075f124f 100644
--- a/pkg/util/aws/instance.go
+++ b/pkg/util/aws/instance.go
@@ -426,40 +426,44 @@ func (self *SRegion) GetInstances(zoneId string, ids []string, offset int, limit
 				networkInterfaces.NetworkInterface = append(networkInterfaces.NetworkInterface, i)
 			}
 
+			var vpcattr SVpcAttributes
+			vpcattr.VpcId = *instance.VpcId
+			vpcattr.PrivateIpAddress = SIpAddress{[]string{*instance.PrivateIpAddress}}
+			vpcattr.NetworkId = *instance.SubnetId
+
+			var productCodes []string
+			for _, p := range instance.ProductCodes {
+				productCodes = append(productCodes, *p.ProductCodeId)
+			}
+
 			sinstance := SInstance{
 				RegionId: self.RegionId,
 				ZoneId: *instance.Placement.AvailabilityZone,
 				InstanceId: *instance.InstanceId,
 				ImageId: *instance.ImageId,
-				InstanceName: tagspec.GetNameTag(),
 				InstanceType: *instance.InstanceType,
 				Cpu: int8(*instance.CpuOptions.CoreCount),
 				Memory: instanceType.memoryMB(),
 				IoOptimized: *instance.EbsOptimized,
 				KeyPairName: *instance.KeyName,
 				CreationTime: *instance.LaunchTime,
-				// ExpiredTime:
-				// ProductCodes: *instance.ProductCodes
 				PublicDNSName: *instance.PublicDnsName,
 				RootDeviceName: *instance.RootDeviceName,
 				Status: *instance.State.Name,
+				InnerIpAddress: SIpAddress{[]string{*instance.PrivateIpAddress}},
+				PublicIpAddress: SIpAddress{[]string{*instance.PublicIpAddress}},
+				InstanceName: tagspec.GetNameTag(),
+				Description: tagspec.GetDescTag(),
 				Disks: disks,
 				SecurityGroupIds: secgroups,
 				NetworkInterfaces: networkInterfaces,
+				VpcAttributes: vpcattr,
+				ProductCodes: productCodes,
+				// ExpiredTime:
 				// EipAddress:
 				// VlanId:
-				// VpcAttributes:
 				// OSName:
 				// OSType:
-				Description: tagspec.GetDescTag(),
-			}
-
-			if instance.PrivateIpAddress != nil {
-				sinstance.InnerIpAddress = SIpAddress{[]string{*instance.PrivateIpAddress}}
-			}
-
-			if instance.PublicIpAddress != nil {
-				sinstance.PublicIpAddress = SIpAddress{[]string{*instance.PublicIpAddress}}
 			}
 
 			instances = append(instances, sinstance)
diff --git a/pkg/util/aws/securitygroup.go b/pkg/util/aws/securitygroup.go
index 2c6857d962..6ff3552464 100644
--- a/pkg/util/aws/securitygroup.go
+++ b/pkg/util/aws/securitygroup.go
@@ -218,6 +218,11 @@ func (self *SRegion) GetSecurityGroups(vpcId string, offset int, limit int) ([]S
 			return nil, 0, err
 		}
 
+		if len(*item.VpcId) == 0 {
+			log.Debugf("ingored: security group with no vpc binded")
+			continue
+		}
+
 		vpc, err := self.getVpc(*item.VpcId)
 		if err != nil {
 			log.Errorf("vpc %s not found", *item.VpcId)