Merge branch 'refs/heads/RQ-1493'

# Conflicts:
#	service/instance.go

service/image.go

@@ -100,6 +100,7 @@ type CaptureInstanceOutput struct {
 
 // Documentation URL: https://docs.qingcloud.com/api/image/delete_images.html
 func (s *ImageService) DeleteImages(i *DeleteImagesInput) (*DeleteImagesOutput, error) {
+	time.RFC822
 	if i == nil {
 		i = &DeleteImagesInput{}
 	}

service/nic.go

@@ -358,6 +358,11 @@ type ModifyNicAttributesInput struct {
 	NICName   *string `json:"nic_name" name:"nic_name" location:"params"`
 	PrivateIP *string `json:"private_ip" name:"private_ip" location:"params"`
 	VxNet     *string `json:"vxnet" name:"vxnet" location:"params"`
+
+	// enable/disable vxnet aspoof 1/0
+	EnableAspoof *int `json:"enable_aspoof" name:"enable_aspoof" location:"params"`
+	// specify the ipv6 address
+	Ipv6Address *string `json:"ipv6_address" name:"ipv6_address" location:"params"`
 }
 
 func (v *ModifyNicAttributesInput) Validate() error {

service/types.go

@@ -3354,3 +3354,58 @@ func (v *VIP) Validate() error {
 	// TODO
 	return nil
 }
+
+type BorderVxnet struct {
+	VxnetID          *string    `json:"vxnet_id"`
+	DynIPStart       *string    `json:"dyn_ip_start"`
+	DynIPv6End       *string    `json:"dyn_ipv6_end"`
+	ConsoleID        *string    `json:"console_id"`
+	CreateTime       *time.Time `json:"create_time"`
+	Owner            *string    `json:"owner"`
+	DhcpServerIP     *string    `json:"dhcp_server_ip"`
+	Features         *int       `json:"features"`
+	ManagerIP        *string    `json:"manager_ip"`
+	BorderID         *string    `json:"border_id"`
+	IPv6Network      *string    `json:"ipv6_network"`
+	VxnetName        *string    `json:"vxnet_name"`
+	BorderPrivateIP  *string    `json:"border_private_ip"`
+	DhcpServerIPv6   *string    `json:"dhcp_server_ipv6"`
+	RouterID         *string    `json:"router_id"`
+	IPNetwork        *string    `json:"ip_network"`
+	DynIPEnd         *string    `json:"dyn_ip_end"`
+	TransitionStatus *string    `json:"transition_status"`
+	Controller       *string    `json:"controller"`
+	DomainServers    *string    `json:"domain_servers"`
+	BorderZoneID     *string    `json:"border_zone_id"`
+	DynIPv6Start     *string    `json:"dyn_ipv6_start"`
+	ManagerIPv6      *string    `json:"manager_ipv6"`
+	VpcRouterID      *string    `json:"vpc_router_id"`
+	VxnetZoneID      *string    `json:"vxnet_zone_id"`
+	RootUserID       *string    `json:"root_user_id"`
+	Mode             *int       `json:"mode"`
+}
+
+func (v *BorderVxnet) Validate() error {
+	// TODO
+	return nil
+}
+
+type VpcBorder struct {
+	RouterID            *string   `json:"router_id"`
+	Status              *string   `json:"status"`
+	BorderName          *string   `json:"border_name"`
+	ZoneID              *string   `json:"zone_id"`
+	Tags                []*string `json:"tags"`
+	VpcBorderID         *string   `json:"vpc_border_id"`
+	BorderType          *int      `json:"border_type"`
+	CreateTime          *string   `json:"create_time"`
+	Owner               *string   `json:"owner"`
+	StatusTime          *string   `json:"status_time"`
+	ResourceProjectInfo []*string `json:"resource_project_info"`
+	Description         *string   `json:"description"`
+}
+
+func (v *VpcBorder) Validate() error {
+	// TODO
+	return nil
+}