Merge pull request #3 from rling-equinix/rui_develop

sshInterfaceId for primary and secondary device in self configured devices

Author: displague

.gitignore

@@ -4,6 +4,8 @@
 *.dll
 *.so
 *.dylib
+.idea
+*.iml
 
 # Test binary, built with `go test -c`
 *.test

client.go

@@ -251,6 +251,7 @@ type Device struct {
 	InterfaceCount      *int
 	CoreCount           *int
 	IsSelfManaged       *bool
+	WanInterfaceId      *string
 	Interfaces          []DeviceInterface
 	VendorConfiguration map[string]string
 	UserPublicKey       *DeviceUserPublicKey

internal/api/device.go

@@ -32,6 +32,7 @@ type Device struct {
 	InterfaceCount       *int                   `json:"interfaceCount,omitempty"`
 	Core                 *DeviceCoreInformation `json:"core,omitempty"`
 	DeviceManagementType *string                `json:"deviceManagementType,omitempty"`
+	SshInterfaceId       *string                `json:"sshInterfaceId,omitempty"`
 	Interfaces           []DeviceInterface      `json:"interfaces,omitempty"`
 	VendorConfig         map[string]string      `json:"vendorConfig,omitempty"`
 	UserPublicKey        *DeviceUserPublicKey   `json:"userPublicKey,omitempty"`
@@ -59,6 +60,7 @@ type DeviceRequest struct {
 	Version              *string                     `json:"version,omitempty"`
 	InterfaceCount       *int                        `json:"interfaceCount,omitempty"`
 	DeviceManagementType *string                     `json:"deviceManagementType,omitempty"`
+	SshInterfaceId       *string                     `json:"sshInterfaceId,omitempty"`
 	Core                 *int                        `json:"core,omitempty"`
 	AdditionalBandwidth  *int                        `json:"additionalBandwidth,omitempty,string"`
 	ACLTemplateUUID      *string                     `json:"aclTemplateUuid,omitempty"`
@@ -77,6 +79,7 @@ type SecondaryDeviceRequest struct {
 	HostNamePrefix      *string                     `json:"hostNamePrefix,omitempty"`
 	AccountNumber       *string                     `json:"accountNumber,omitempty"`
 	AdditionalBandwidth *int                        `json:"additionalBandwidth,omitempty,string"`
+	SshInterfaceId      *string                     `json:"sshInterfaceId,omitempty"`
 	ACLTemplateUUID     *string                     `json:"aclTemplateUuid,omitempty"`
 	VendorConfig        map[string]string           `json:"vendorConfig,omitempty"`
 	UserPublicKey       *DeviceUserPublicKeyRequest `json:"userPublicKey,omitempty"`

rest_device.go

@@ -207,6 +207,7 @@ func mapDeviceAPIToDomain(apiDevice api.Device) *Device {
 	device.RedundantUUID = apiDevice.RedundantUUID
 	device.TermLength = apiDevice.TermLength
 	device.AdditionalBandwidth = apiDevice.AdditionalBandwidth
+	device.WanInterfaceId = apiDevice.SshInterfaceId
 	device.OrderReference = apiDevice.OrderReference
 	device.InterfaceCount = apiDevice.InterfaceCount
 	if apiDevice.Core != nil {
@@ -301,6 +302,7 @@ func createDeviceRequest(device Device) api.DeviceRequest {
 	}
 	req.Core = device.CoreCount
 	req.AdditionalBandwidth = device.AdditionalBandwidth
+	req.SshInterfaceId = device.WanInterfaceId
 	req.ACLTemplateUUID = device.ACLTemplateUUID
 	req.VendorConfig = device.VendorConfiguration
 	req.UserPublicKey = mapDeviceUserPublicKeyDomainToAPI(device.UserPublicKey)
@@ -318,6 +320,10 @@ func createRedundantDeviceRequest(primary Device, secondary Device) api.DeviceRe
 	secReq.HostNamePrefix = secondary.HostName
 	secReq.AccountNumber = secondary.AccountNumber
 	secReq.AdditionalBandwidth = secondary.AdditionalBandwidth
+	secReq.SshInterfaceId = secondary.WanInterfaceId
+	if secReq.SshInterfaceId == nil {
+		secReq.SshInterfaceId = req.SshInterfaceId
+	}
 	secReq.ACLTemplateUUID = secondary.ACLTemplateUUID
 	secReq.VendorConfig = secondary.VendorConfiguration
 	secReq.UserPublicKey = mapDeviceUserPublicKeyDomainToAPI(secondary.UserPublicKey)