Merge pull request #810 from SoftLayer/vlanTag

Vlan tag features

Author: allmightyspiff

.travis.yml

@@ -1,7 +1,7 @@
 group: bluezone
 language: go
 go:
-  - 1.19.3
+  - 1.21.3
 addons:
   apt:
     packages:

bin/buildAndDeploy.py

@@ -63,14 +63,19 @@ def runTests() -> None:
 
     go_vet = ['go', 'vet'] +  clean_mods
     # Not using the 'real' command here because this looks neater.
+
     print(f'[turquoise2]Running: go vet $(go list ./... | grep -v "fixtures" | grep -v "vendor")')
-    subprocess.run(go_vet, check=True)
+    try:
+        subprocess.run(go_vet, check=True)
+    except subprocess.CalledProcessError as e:
+        print(f"[red]>>> Go Vet failed <<<")
+        sys.exit(e.returncode)    
     go_test = ['go', 'test'] +  clean_mods
     print(f'[turquoise2]Running: go test $(go list ./... | grep -v "fixtures" | grep -v "vendor")')
     try:
         subprocess.run(go_test, check=True)
     except subprocess.CalledProcessError as e:
-        print(f"[red]Unit tests failed")
+        print(f"[red]>>> Go Test failed <<<")
         sys.exit(e.returncode)
     go_sec = ['gosec', '-exclude-dir=fixture', '-exclude-dir=plugin/resources', '-quiet', './...']
     # Not using the 'real' command because this is more copy/pasteable.

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/miekg/dns v1.1.50
 	github.com/nicksnyder/go-i18n v1.10.1
 	github.com/onsi/ginkgo v1.16.2
-	github.com/onsi/gomega v1.27.10
+	github.com/onsi/gomega v1.29.0
 	github.com/softlayer/softlayer-go v1.1.2
 	github.com/spf13/cobra v1.5.0
 	github.com/spf13/pflag v1.0.5
@@ -24,7 +24,8 @@ require (
 	github.com/fatih/structs v1.1.0 // indirect
 	github.com/fsnotify/fsnotify v1.4.9 // indirect
 	github.com/gofrs/flock v0.8.1 // indirect
-	github.com/google/go-cmp v0.5.9 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
 	github.com/mattn/go-colorable v0.1.8 // indirect
 	github.com/mattn/go-isatty v0.0.12 // indirect
@@ -41,6 +42,7 @@ require (
 	golang.org/x/sys v0.13.0 // indirect
 	golang.org/x/term v0.13.0 // indirect
 	golang.org/x/tools v0.12.0 // indirect
+	google.golang.org/protobuf v1.28.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect

go.sum

@@ -30,13 +30,17 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU
 github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
 github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE=
 github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
@@ -74,10 +78,13 @@ github.com/onsi/ginkgo v1.16.2 h1:HFB2fbVIlhIfCfOW81bZFbiC/RvnpXSdhbF2/DJr134=
 github.com/onsi/ginkgo v1.16.2/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E=
 github.com/onsi/ginkgo/v2 v2.11.0 h1:WgqUCUt/lT6yXoQ8Wef0fsNn5cAuMK7+KT9UFRz2tcU=
 github.com/onsi/ginkgo/v2 v2.11.0/go.mod h1:ZhrRA5XmEE3x3rhlzamx/JJvujdZoJ2uvgI7kR0iZvM=
+github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI=
 github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M=
+github.com/onsi/gomega v1.29.0 h1:KIA/t2t5UBzoirT4H9tsML45GEbo3ouUnBHsCfD2tVg=
+github.com/onsi/gomega v1.29.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
 github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -168,6 +175,8 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ
 google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
 google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=
 google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

plugin/commands/hardware/authorize-storage.go

@@ -25,7 +25,6 @@ func NewAuthorizeStorageCommand(sl *metadata.SoftlayerCommand) (cmd *AuthorizeSt
 		HardwareManager:  managers.NewHardwareServerManager(sl.Session),
 	}
 
-
 	cobraCmd := &cobra.Command{
 		Use:   "authorize-storage " + T("IDENTIFIER"),
 		Short: T("Authorize File and Block Storage to a Hardware Server"),

plugin/commands/hardware/billing.go

@@ -27,7 +27,6 @@ func NewBillingCommand(sl *metadata.SoftlayerCommand) (cmd *BillingCommand) {
 		HardwareManager:  managers.NewHardwareServerManager(sl.Session),
 	}
 
-
 	cobraCmd := &cobra.Command{
 		Use:   "billing " + T("IDENTIFIER"),
 		Short: T("Get billing for a hardware device."),

plugin/commands/hardware/cancel.go

@@ -30,7 +30,6 @@ func NewCancelCommand(sl *metadata.SoftlayerCommand) (cmd *CancelCommand) {
 		HardwareManager:  managers.NewHardwareServerManager(sl.Session),
 	}
 
-
 	cobraCmd := &cobra.Command{
 		Use:   "cancel " + T("IDENTIFIER"),
 		Short: T("Cancel a hardware server"),

plugin/commands/hardware/create_options_test.go

@@ -33,13 +33,13 @@ var _ = Describe("hardware create options", func() {
 		Context("hardware create options", func() {
 			BeforeEach(func() {
 				fakeHardwareManager.GetCreateOptionsReturns(map[string]map[string]string{
-					managers.KEY_LOCATIONS:  map[string]string{"dal10": "Dallas 10"},
-					managers.KEY_SIZES:      map[string]string{"D2620_128GB_2X1T_SATA_RAID_1xM60_GPU": "Dual Xeon 2620v4, 128GB Ram, 2x800GB SSD disks, RAID1"},
-					managers.KEY_OS:         map[string]string{"CENTOS_6_32": "CentOS 6.5-32"},
-					managers.KEY_NAME_OS:         map[string]string{"CENTOS_6_32": "OS_CENTOS_6_X_32_BIT"},
-					managers.KEY_PORT_SPEED: map[string]string{"100_MBPS_PUBLIC_PRIVATE_NETWORK_UPLINKS": "10000"},
+					managers.KEY_LOCATIONS:              map[string]string{"dal10": "Dallas 10"},
+					managers.KEY_SIZES:                  map[string]string{"D2620_128GB_2X1T_SATA_RAID_1xM60_GPU": "Dual Xeon 2620v4, 128GB Ram, 2x800GB SSD disks, RAID1"},
+					managers.KEY_OS:                     map[string]string{"CENTOS_6_32": "CentOS 6.5-32"},
+					managers.KEY_NAME_OS:                map[string]string{"CENTOS_6_32": "OS_CENTOS_6_X_32_BIT"},
+					managers.KEY_PORT_SPEED:             map[string]string{"100_MBPS_PUBLIC_PRIVATE_NETWORK_UPLINKS": "10000"},
 					managers.KEY_PORT_SPEED_DESCRIPTION: map[string]string{"100_MBPS_PUBLIC_PRIVATE_NETWORK_UPLINKS": "10 Gbps Redundant Public & Private Network Uplinks"},
-					managers.KEY_EXTRAS:     map[string]string{"8_PUBLIC_IP_ADDRESSES": "8 Public IP Addresses"},
+					managers.KEY_EXTRAS:                 map[string]string{"8_PUBLIC_IP_ADDRESSES": "8 Public IP Addresses"},
 				})
 			})
 			It("return error", func() {

plugin/commands/hardware/detail.go

@@ -62,17 +62,17 @@ func (cmd *DetailCommand) Run(args []string) error {
 
 	hardDrives, err := cmd.HardwareManager.GetHardDrives(hardwareId)
 	if err != nil {
-		return errors.NewAPIError(T("Failed to get the hard drives detail for the hardware server {{.ID}}.\n", map[string]interface{}{"ID": hardwareId}), err.Error(), 2)
+		return err
 	}
 
 	bandwidthAllotmentDetail, err := cmd.HardwareManager.GetBandwidthAllotmentDetail(hardwareId, "")
 	if err != nil {
-		return errors.NewAPIError(T("Failed to get bandwidth allotment detail for the hardware server {{.ID}}.\n", map[string]interface{}{"ID": hardwareId}), err.Error(), 2)
+		return err
 	}
 
 	billingCycleBandwidthUsage, err := cmd.HardwareManager.GetBillingCycleBandwidthUsage(hardwareId, "")
 	if err != nil {
-		return errors.NewAPIError(T("Failed to get billing cycle bandwidth usage for the hardware server {{.ID}}.\n", map[string]interface{}{"ID": hardwareId}), err.Error(), 2)
+		return err
 	}
 
 	if outputFormat == "JSON" {
@@ -157,11 +157,33 @@ func (cmd *DetailCommand) Run(args []string) error {
 
 	if vlans := hardware.NetworkVlans; len(vlans) > 0 {
 		buf := new(bytes.Buffer)
-		vlanTable := terminal.NewTable(buf, []string{T("Type"), T("Number"), T("ID")})
+		vlanTable := terminal.NewTable(buf, []string{T("Network"), T("Number"), T("ID"), T("Name"), T("Type")})
 		for _, vlan := range vlans {
-			vlanTable.Add(utils.FormatStringPointer(vlan.NetworkSpace),
+			vlanTable.Add(
+				utils.FormatStringPointer(vlan.NetworkSpace),
 				utils.FormatIntPointer(vlan.VlanNumber),
-				utils.FormatIntPointer(vlan.Id))
+				utils.FormatIntPointer(vlan.Id),
+				utils.FormatStringPointer(vlan.FullyQualifiedName),
+				T("Primary"),
+			)
+		}
+		for _, component := range hardware.NetworkComponents {
+			if component.PrimaryIpAddress != nil {
+				uplink := component.UplinkComponent
+				if uplink == nil {
+					continue
+				}
+				for _, trunk := range uplink.NetworkVlanTrunks {
+					t_vlan := trunk.NetworkVlan
+					vlanTable.Add(
+						utils.FormatStringPointer(t_vlan.NetworkSpace),
+						utils.FormatIntPointer(t_vlan.VlanNumber),
+						utils.FormatIntPointer(t_vlan.Id),
+						utils.FormatStringPointer(t_vlan.FullyQualifiedName),
+						T("Trunked"),
+					)
+				}
+			}
 		}
 		vlanTable.Print()
 		table.Add("Vlans", buf.String())