Merged main and cleaned go.sum

.github/workflows/go.yml

@@ -1,22 +1,23 @@
+---
 name: Go
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
   pull_request:
-    branches: [ main ]
+    branches: [main]
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Go
-      uses: actions/setup-go@v3
-      with:
-        go-version: 1.18.x
-    - name: Build
-      run: go build -v ./...
+      - uses: actions/checkout@v2
+      - name: Set up Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: 1.18.x
+      - name: Build
+        run: go build -v ./...
   test:
     runs-on: ubuntu-latest
     steps:
@@ -25,7 +26,9 @@ jobs:
         uses: actions/setup-go@v2.1.3
         with:
           go-version: 1.18.x
-      - run: go test -v -coverprofile=profile.cov ./...
+      - run: |
+          # shellcheck disable=2046
+          go test -v -coverprofile=profile.cov $(go list ./... | grep -v /cloudbuild/) # ignore cloudbuild tests
       - name: Send coverage
         uses: shogo82148/actions-goveralls@v1
         with:

cloudbuild/external.pkr.hcl

@@ -70,7 +70,7 @@ build {
       "sudo apt-get -o DPkg::Lock::Timeout=60 install docker-ce docker-ce-cli containerd.io build-essential -y",
       "sudo usermod -aG docker $USER",
       "sudo docker version",
-      "sudo sysctl fs.inotify.max_user_instances=64000", # configure inotify for cisco containers
+      "echo \"fs.inotify.max_user_instances=64000\" | sudo tee -a /etc/sysctl.conf", # configure inotify for cisco containers
       "sudo sysctl -p",
     ]
   }

cloudbuild/internal.pkr.hcl

@@ -70,7 +70,7 @@ build {
       "sudo apt-get -o DPkg::Lock::Timeout=60 install docker-ce docker-ce-cli containerd.io build-essential -y",
       "sudo usermod -aG docker $USER",
       "sudo docker version",
-      "sudo sysctl fs.inotify.max_user_instances=64000", # configure inotify for cisco containers
+      "echo \"fs.inotify.max_user_instances=64000\" | sudo tee -a /etc/sysctl.conf", # configure inotify for cisco containers
       "sudo sysctl -p",
       "echo Pulling containers...",
       "gcloud auth configure-docker us-west1-docker.pkg.dev -q", # configure sudoless docker

cloudbuild/presubmit.sh

@@ -31,9 +31,16 @@ popd
 # Deploy a cluster + topo
 pushd "$HOME"
 kne deploy kne-internal/deploy/kne/kind-bridge.yaml
-kne create kne-internal/examples/multivendor/multivendor.pb.txt
+kne create kne/cloudbuild/presubmit/topology.textproto
 popd
 
-# Log topology
-kubectl get pods -A
-kubectl get services -A
+# pushd "$HOME/kne/cloudbuild/presubmit"
+# # Run an ondatra test
+# cat >config.yaml << EOF
+# username: admin
+# password: admin
+# topology: ${HOME}/kne/cloudbuild/presubmit/topology.textproto
+# EOF
+
+# go test -v presubmit_test.go -config config.yaml -testbed testbed.textproto
+# popd

cloudbuild/presubmit/presubmit_test.go

@@ -0,0 +1,131 @@
+package presubmit_test
+
+import (
+	// "context"
+	// "io"
+	"sort"
+	"testing"
+
+	"github.com/google/go-cmp/cmp"
+	// gpb "github.com/openconfig/gribi/v1/proto/service"
+	"github.com/openconfig/ondatra"
+	kinit "github.com/openconfig/ondatra/knebind/init"
+)
+
+func TestMain(m *testing.M) {
+	ondatra.RunTests(m, kinit.Init)
+}
+
+// lookupTelemetry checks for system telemetry for a DUT.
+func lookupTelemetry(t *testing.T, dut *ondatra.DUTDevice) {
+	t.Helper()
+	sys := dut.Telemetry().System().Lookup(t)
+	if !sys.IsPresent() {
+		t.Fatalf("No System telemetry for %v", dut)
+	}
+}
+
+func TestGNMICEOS(t *testing.T) {
+	dut := ondatra.DUT(t, "ceos")
+	lookupTelemetry(t, dut)
+}
+
+func TestGNMICTPX(t *testing.T) {
+	t.Skip()
+}
+
+func TestGNMISRL(t *testing.T) {
+	t.Skip()
+}
+
+func TestGNMIXRD(t *testing.T) {
+	t.Skip()
+}
+
+func TestGNOICEOS(t *testing.T) {
+	t.Skip()
+}
+
+func TestGNOICTPX(t *testing.T) {
+	t.Skip()
+}
+
+func TestGNOISRL(t *testing.T) {
+	t.Skip()
+}
+
+func TestGNOIXRD(t *testing.T) {
+	t.Skip()
+}
+
+// fetchAFTEntries checks for AFT entries using gRIBI for a DUT.
+// func fetchAFTEntries(t *testing.T, dut *ondatra.DUTDevice) {
+//	t.Helper()
+//	c := dut.RawAPIs().GRIBI().New(t)
+//	req := &gpb.GetRequest{
+//		NetworkInstance: &gpb.GetRequest_All{},
+//		Aft:             gpb.AFTType_ALL,
+//	}
+//	stream, err := c.Get(context.Background(), req)
+//	if err != nil {
+//		t.Fatalf("gRIBI Get request failed: %v", err)
+//	}
+//	for {
+//		resp, err := stream.Recv()
+//		if err == io.EOF {
+//			break
+//		}
+//		if err != nil {
+//			t.Fatalf("failed to recv from stream: %v", err)
+//		}
+//		t.Logf("Got AFT entries: %v", resp.GetEntry())
+//	}
+// }
+
+func TestGRIBICEOS(t *testing.T) {
+	t.Skip()
+}
+
+func TestGRIBICTPX(t *testing.T) {
+	t.Skip()
+}
+
+func TestGRIBISRL(t *testing.T) {
+	t.Skip()
+}
+
+func TestGRIBIXRD(t *testing.T) {
+	t.Skip()
+}
+
+func TestP4RTCEOS(t *testing.T) {
+	t.Skip()
+}
+
+func TestP4RTCPTX(t *testing.T) {
+	t.Skip()
+}
+
+func TestP4RTSRL(t *testing.T) {
+	t.Skip()
+}
+
+func TestP4RTXRD(t *testing.T) {
+	t.Skip()
+}
+
+func TestOTG(t *testing.T) {
+	ate := ondatra.ATE(t, "otg")
+	cfg := ate.OTG().NewConfig(t)
+	cfg.Ports().Add().SetName("port1")
+	cfg.Ports().Add().SetName("port2")
+	cfg.Ports().Add().SetName("port3")
+	cfg.Ports().Add().SetName("port4")
+	ate.OTG().PushConfig(t, cfg)
+
+	portNames := ate.OTG().Telemetry().PortAny().Name().Get(t)
+	sort.Strings(portNames)
+	if want := []string{"port1", "port2", "port3", "port4"}; !cmp.Equal(portNames, want) {
+		t.Errorf("Telemetry got port names %v, want %v", portNames, want)
+	}
+}

cloudbuild/presubmit/testbed.textproto

@@ -0,0 +1,120 @@
+duts {
+  id: "ceos"
+  vendor: ARISTA
+  ports {
+    id: "port1"
+  }
+  ports {
+    id: "port2"
+  }
+  ports {
+    id: "port3"
+  }
+  ports {
+    id: "port4"
+  }
+}
+duts {
+  id: "cptx"
+  vendor: JUNIPER
+  ports {
+    id: "port1"
+  }
+  ports {
+    id: "port2"
+  }
+  ports {
+    id: "port3"
+  }
+  ports {
+    id: "port4"
+  }
+}
+duts {
+  id: "srl"
+  vendor: NOKIA
+  ports {
+    id: "port1"
+  }
+  ports {
+    id: "port2"
+  }
+  ports {
+    id: "port3"
+  }
+  ports {
+    id: "port4"
+  }
+}
+duts {
+  id: "xrd"
+  vendor: CISCO
+  ports {
+    id: "port1"
+  }
+  ports {
+    id: "port2"
+  }
+  ports {
+    id: "port3"
+  }
+  ports {
+    id: "port4"
+  }
+}
+ates {
+  id: "otg"
+  vendor: IXIA
+  ports {
+    id: "port1"
+  }
+  ports {
+    id: "port2"
+  }
+  ports {
+    id: "port3"
+  }
+  ports {
+    id: "port4"
+  }
+}
+links {
+  a: "ceos:port1"
+  b: "otg:port1"
+}
+links {
+  a: "cptx:port1"
+  b: "otg:port2"
+}
+links {
+  a: "srl:port1"
+  b: "otg:port3"
+}
+links {
+  a: "xrd:port1"
+  b: "otg:port4"
+}
+links {
+  a: "ceos:port2"
+  b: "cptx:port2"
+}
+links {
+  a: "ceos:port3"
+  b: "srl:port2"
+}
+links {
+  a: "ceos:port4"
+  b: "xrd:port2"
+}
+links {
+  a: "cptx:port3"
+  b: "srl:port3"
+}
+links {
+  a: "cptx:port4"
+  b: "xrd:port3"
+}
+links {
+  a: "srl:port4"
+  b: "xrd:port4"
+}