VOL-1577 - General cleanup (gofmt, go vet, go test, dep check)
Change-Id: I536b2746b8bd266f3e75aeccc65bfe7468f1b44a
diff --git a/tests/core/api/grpc_nbi_api_handler_client_test.go b/tests/core/api/grpc_nbi_api_handler_client_test.go
index 47e4472..4eb5d1c 100644
--- a/tests/core/api/grpc_nbi_api_handler_client_test.go
+++ b/tests/core/api/grpc_nbi_api_handler_client_test.go
@@ -1,3 +1,5 @@
+// +build integration
+
/*
* Copyright 2018-present Open Networking Foundation
@@ -13,13 +15,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package api
import (
"context"
"fmt"
- com "github.com/opencord/voltha-go/adapters/common"
"github.com/golang/protobuf/ptypes/empty"
+ com "github.com/opencord/voltha-go/adapters/common"
"github.com/opencord/voltha-go/common/log"
"github.com/opencord/voltha-protos/go/common"
"github.com/opencord/voltha-protos/go/openflow_13"
@@ -121,7 +124,7 @@
func startKafka() {
fmt.Println("Starting Kafka and Etcd ...")
command := "docker-compose"
- cmd := exec.Command(command, "-f", "../../compose/docker-compose-zk-kafka-test.yml", "up", "-d")
+ cmd := exec.Command(command, "-f", "../../../compose/docker-compose-zk-kafka-test.yml", "up", "-d")
if err := cmd.Run(); err != nil {
log.Fatal(err)
}
@@ -130,7 +133,7 @@
func startEtcd() {
fmt.Println("Starting Etcd ...")
command := "docker-compose"
- cmd := exec.Command(command, "-f", "../../compose/docker-compose-etcd.yml", "up", "-d")
+ cmd := exec.Command(command, "-f", "../../../compose/docker-compose-etcd.yml", "up", "-d")
if err := cmd.Run(); err != nil {
log.Fatal(err)
}
@@ -139,7 +142,7 @@
func stopKafka() {
fmt.Println("Stopping Kafka and Etcd ...")
command := "docker-compose"
- cmd := exec.Command(command, "-f", "../../compose/docker-compose-zk-kafka-test.yml", "down")
+ cmd := exec.Command(command, "-f", "../../../compose/docker-compose-zk-kafka-test.yml", "down")
if err := cmd.Run(); err != nil {
// ignore error - as this is mostly due network being left behind as its being used by other
// containers
@@ -150,7 +153,7 @@
func stopEtcd() {
fmt.Println("Stopping Etcd ...")
command := "docker-compose"
- cmd := exec.Command(command, "-f", "../../compose/docker-compose-etcd.yml", "down")
+ cmd := exec.Command(command, "-f", "../../../compose/docker-compose-etcd.yml", "down")
if err := cmd.Run(); err != nil {
// ignore error - as this is mostly due network being left behind as its being used by other
// containers
@@ -161,7 +164,7 @@
func startCore() {
fmt.Println("Starting voltha core ...")
command := "docker-compose"
- cmd := exec.Command(command, "-f", "../../compose/rw_core.yml", "up", "-d")
+ cmd := exec.Command(command, "-f", "../../../compose/rw_core.yml", "up", "-d")
if err := cmd.Run(); err != nil {
log.Fatal(err)
}
@@ -170,7 +173,7 @@
func stopCore() {
fmt.Println("Stopping voltha core ...")
command := "docker-compose"
- cmd := exec.Command(command, "-f", "../../compose/rw_core.yml", "down")
+ cmd := exec.Command(command, "-f", "../../../compose/rw_core.yml", "down")
if err := cmd.Run(); err != nil {
// ignore error - as this is mostly due network being left behind as its being used by other
// containers
@@ -181,7 +184,7 @@
func startSimulatedOLTAndONUAdapters() {
fmt.Println("Starting simulated OLT and ONU adapters ...")
command := "docker-compose"
- cmd := exec.Command(command, "-f", "../../compose/adapters-simulated.yml", "up", "-d")
+ cmd := exec.Command(command, "-f", "../../../compose/adapters-simulated.yml", "up", "-d")
if err := cmd.Run(); err != nil {
log.Fatal(err)
}
@@ -190,7 +193,7 @@
func stopSimulatedOLTAndONUAdapters() {
fmt.Println("Stopping simulated OLT and ONU adapters ...")
command := "docker-compose"
- cmd := exec.Command(command, "-f", "../../compose/adapters-simulated.yml", "down")
+ cmd := exec.Command(command, "-f", "../../../compose/adapters-simulated.yml", "down")
if err := cmd.Run(); err != nil {
// ignore error - as this is mostly due network being left behind as its being used by other
// containers
@@ -198,7 +201,6 @@
}
}
-
func TestListDeviceIds(t *testing.T) {
fmt.Println("Testing list Devices Ids ...")
//0. Start kafka and Ectd
@@ -335,7 +337,7 @@
for i := 0; i < numberOfOLTDevices; i++ {
ctx := context.Background()
randomMacAddress := strings.ToUpper(com.GetRandomMacAddress())
- device := &voltha.Device{Type: "simulated_olt", MacAddress:randomMacAddress}
+ device := &voltha.Device{Type: "simulated_olt", MacAddress: randomMacAddress}
response, err := stub.CreateDevice(ctx, device)
log.Infow("response", log.Fields{"res": response, "error": err})
assert.Nil(t, err)
@@ -345,7 +347,7 @@
//4. Enable all the devices
for id, _ := range devices {
ctx := context.Background()
- response, err := stub.EnableDevice(ctx, &common.ID{Id:id})
+ response, err := stub.EnableDevice(ctx, &common.ID{Id: id})
log.Infow("response", log.Fields{"res": response, "error": err})
assert.Nil(t, err)
}
@@ -366,7 +368,7 @@
log.Infow("response", log.Fields{"res": response, "error": err})
assert.Nil(t, err)
assert.Equal(t, len(devices)*2, len(response.Items))
- for _, d := range (response.Items) {
+ for _, d := range response.Items {
devices[d.Id] = d
assert.Equal(t, d.AdminState, voltha.AdminState_ENABLED)
}
@@ -377,7 +379,7 @@
log.Infow("response", log.Fields{"res": response, "error": lerr})
assert.Nil(t, lerr)
assert.Equal(t, numberOfOLTDevices, len(lresponse.Items))
- for _, ld := range (lresponse.Items) {
+ for _, ld := range lresponse.Items {
logicalDevices[ld.Id] = ld
// Ensure each logical device have two ports
assert.Equal(t, 2, len(ld.Ports))
@@ -387,7 +389,7 @@
for id, d := range devices {
ctx := context.Background()
if d.Type == "simulated_onu" {
- response, err := stub.DisableDevice(ctx, &common.ID{Id:id})
+ response, err := stub.DisableDevice(ctx, &common.ID{Id: id})
log.Infow("response", log.Fields{"res": response, "error": err})
assert.Nil(t, err)
}
@@ -401,7 +403,7 @@
log.Infow("response", log.Fields{"res": response, "error": err})
assert.Nil(t, err)
assert.Equal(t, len(devices), len(response.Items))
- for _, d := range (response.Items) {
+ for _, d := range response.Items {
if d.Type == "simulated_onu" {
assert.Equal(t, d.AdminState, voltha.AdminState_DISABLED)
devices[d.Id] = d
@@ -415,7 +417,7 @@
log.Infow("response", log.Fields{"res": response, "error": lerr})
assert.Nil(t, lerr)
assert.Equal(t, numberOfOLTDevices, len(lresponse.Items))
- for _, ld := range (lresponse.Items) {
+ for _, ld := range lresponse.Items {
logicalDevices[ld.Id] = ld
// Ensure each logical device have one port - only olt port
assert.Equal(t, 1, len(ld.Ports))
@@ -425,7 +427,7 @@
for id, d := range devices {
ctx := context.Background()
if d.Type == "simulated_onu" {
- response, err := stub.EnableDevice(ctx, &common.ID{Id:id})
+ response, err := stub.EnableDevice(ctx, &common.ID{Id: id})
log.Infow("response", log.Fields{"res": response, "error": err})
assert.Nil(t, err)
}
@@ -439,7 +441,7 @@
log.Infow("response", log.Fields{"res": response, "error": err})
assert.Nil(t, err)
assert.Equal(t, len(devices), len(response.Items))
- for _, d := range (response.Items) {
+ for _, d := range response.Items {
assert.Equal(t, d.AdminState, voltha.AdminState_ENABLED)
devices[d.Id] = d
}
@@ -474,7 +476,6 @@
//stopEtcd()
}
-
func TestGetDevice(t *testing.T) {
var id common.ID
id.Id = "anyid"