Skip to content

Commit

Permalink
Add support for magna and all dial funcs (#345)
Browse files Browse the repository at this point in the history
* clients

* Add magna and dial options to binding

* pcap

* yes

* fixes
  • Loading branch information
DanG100 authored Jan 25, 2024
1 parent 069bb1e commit 10f2aa1
Show file tree
Hide file tree
Showing 10 changed files with 412 additions and 70 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/buildtest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ jobs:
restore-keys: |
${{ runner.os }}-bazel-build-
${{ runner.os }}-bazel-
- name: Install pcap
run: |
sudo apt-get install libpcap-dev
- name: Build Lemming
run: bazel build //...
- name: Save Bazel Cache
Expand All @@ -58,6 +61,9 @@ jobs:
restore-keys: |
${{ runner.os }}-bazel-test-
${{ runner.os }}-bazel-
- name: Install pcap
run: |
sudo apt-get install libpcap-dev
- name: Test
run: make coverage
- name: Coveralls
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ jobs:
go-version: stable
cache: false
- uses: actions/checkout@v3
- name: Install pcap
run: |
sudo apt-get install libpcap-dev
- name: golangci-lint
uses: golangci/golangci-lint-action@v3
with:
Expand Down
1 change: 1 addition & 0 deletions cloudbuild/lemming-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ gopath=$(go env GOPATH)
export PATH=${PATH}:$gopath/bin
curl -Lo bazel https://github.com/bazelbuild/bazelisk/releases/download/v1.16.0/bazelisk-linux-amd64 && \
sudo install bazel /usr/local/bin/
sudo apt-get -y install libpcap-dev

cd /tmp/workspace
kne deploy ~/kne-internal/deploy/kne/kind-bridge.yaml
Expand Down
1 change: 1 addition & 0 deletions cloudbuild/operator-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ curl -Lo skaffold https://storage.googleapis.com/skaffold/releases/latest/skaffo
sudo install skaffold /usr/local/bin/
curl -Lo bazel https://github.com/bazelbuild/bazelisk/releases/download/v1.16.0/bazelisk-linux-amd64 && \
sudo install bazel /usr/local/bin/
sudo apt-get -y install libpcap-dev

cd /tmp/workspace
kne deploy ~/kne-internal/deploy/kne/kind-bridge.yaml
Expand Down
1 change: 1 addition & 0 deletions cloudbuild/presubmit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ curl -Lo skaffold https://storage.googleapis.com/skaffold/releases/latest/skaffo
sudo install skaffold /usr/local/bin/
curl -Lo bazel https://github.com/bazelbuild/bazelisk/releases/download/v1.16.0/bazelisk-linux-amd64 && \
sudo install bazel /usr/local/bin/
sudo apt-get -y install libpcap-dev

cd /tmp/workspace
kne deploy ~/kne-internal/deploy/kne/kind-bridge.yaml
Expand Down
4 changes: 3 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,13 @@ require (
github.com/open-traffic-generator/snappi/gosnappi v0.13.0
github.com/openconfig/gnmi v0.10.0
github.com/openconfig/gnoi v0.3.0
github.com/openconfig/gnoigo v0.0.0-20231026010722-87413fdb22e7
github.com/openconfig/gnsi v1.2.3
github.com/openconfig/goyang v1.4.5
github.com/openconfig/gribi v1.0.0
github.com/openconfig/gribigo v0.0.0-20240116235734-d97fb76749ef
github.com/openconfig/kne v0.1.15
github.com/openconfig/magna v0.0.0-20240125181018-b59ccfe781f8
github.com/openconfig/ondatra v0.4.8
github.com/openconfig/ygnmi v0.11.1
github.com/openconfig/ygot v0.29.17
Expand All @@ -39,6 +41,7 @@ require (
google.golang.org/protobuf v1.32.0
k8s.io/apimachinery v0.26.3
k8s.io/client-go v0.26.3
k8s.io/klog v1.0.0
k8s.io/klog/v2 v2.100.1
modernc.org/cc/v4 v4.1.3
)
Expand Down Expand Up @@ -95,7 +98,6 @@ require (
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/networkop/meshnet-cni v0.3.1-0.20230525201116-d7c306c635cf // indirect
github.com/open-traffic-generator/ixia-c-operator v0.3.6 // indirect
github.com/openconfig/gnoigo v0.0.0-20231026010722-87413fdb22e7 // indirect
github.com/openconfig/gocloser v0.0.0-20220310182203-c6c950ed3b0b // indirect
github.com/openconfig/lemming/operator v0.2.0 // indirect
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
Expand Down
5 changes: 5 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -858,6 +858,7 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/go-latex/latex v0.0.0-20210118124228-b3d85cf34e07/go.mod h1:CO1AlKB2CSIqUrmQPqA0gdRIlnLEY0gK5JGjh37zN5U=
github.com/go-latex/latex v0.0.0-20210823091927-c0d11ff05a81/go.mod h1:SX0U8uGpxhq9o2S/CELCSUxEWWAuoCUcVCQWv7G2OCk=
github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
Expand Down Expand Up @@ -1134,6 +1135,8 @@ github.com/openconfig/kne v0.1.15 h1:3ADQpUasGv23V53KlkLdaJrMWM6yyJ4EGtJvFyVzCUA
github.com/openconfig/kne v0.1.15/go.mod h1:4rV0EbqxQec3BRvvkcrsponO6XLlMYFuNynkPAWjaMw=
github.com/openconfig/lemming/operator v0.2.0 h1:dovZnR6lQkOHXcODli1NDOr/GVYrBY05KS5X11jxVbw=
github.com/openconfig/lemming/operator v0.2.0/go.mod h1:LKgEXSR5VK2CAeh2uKijKAXFj42uQuwakrCHVPF0iII=
github.com/openconfig/magna v0.0.0-20240125181018-b59ccfe781f8 h1:Li3oruOjubVSr+7UAc6ohpWeD0FKk+7t7SzEkMN66Qk=
github.com/openconfig/magna v0.0.0-20240125181018-b59ccfe781f8/go.mod h1:3B8JDwmq2vuR0J1JB4+XtpxC+FrVvtZa1129LJ+7AIw=
github.com/openconfig/ondatra v0.4.8 h1:EnjtLMF4eiULquNVWHJulysV3VVKhAPeuQ0f+BxBBWs=
github.com/openconfig/ondatra v0.4.8/go.mod h1:KH97HqpgW6wv7Y0QSpqr5tjUruzJOhryP+YCQKRa57c=
github.com/openconfig/testt v0.0.0-20220311054427-efbb1a32ec07 h1:X631iD/B0ximGFb5P9LY5wHju4SiedxUhc5UZEo7VSw=
Expand Down Expand Up @@ -2052,6 +2055,8 @@ k8s.io/apimachinery v0.26.3 h1:dQx6PNETJ7nODU3XPtrwkfuubs6w7sX0M8n61zHIV/k=
k8s.io/apimachinery v0.26.3/go.mod h1:ats7nN1LExKHvJ9TmwootT00Yz05MuYqPXEXaVeOy5I=
k8s.io/client-go v0.26.3 h1:k1UY+KXfkxV2ScEL3gilKcF7761xkYsSD6BC9szIu8s=
k8s.io/client-go v0.26.3/go.mod h1:ZPNu9lm8/dbRIPAgteN30RSXea6vrCpFvq+MateTUuQ=
k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=
k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a h1:gmovKNur38vgoWfGtP5QOGNOA7ki4n6qNYoFAgMlNvg=
Expand Down
21 changes: 21 additions & 0 deletions internal/binding/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,26 @@ go_library(
"//dataplane/proto/sai",
"//proto/forwarding",
"@com_github_google_gopacket//:gopacket",
"@com_github_google_gopacket//layers",
"@com_github_google_uuid//:uuid",
"@com_github_open_traffic_generator_snappi_gosnappi//:gosnappi",
"@com_github_open_traffic_generator_snappi_gosnappi//otg",
"@com_github_openconfig_gnmi//proto/gnmi",
"@com_github_openconfig_gnoigo//:gnoigo",
"@com_github_openconfig_gnsi//acctz",
"@com_github_openconfig_gnsi//authz",
"@com_github_openconfig_gnsi//certz",
"@com_github_openconfig_gnsi//credentialz",
"@com_github_openconfig_gnsi//pathz",
"@com_github_openconfig_gribi//v1/proto/service",
"@com_github_openconfig_kne//topo",
"@com_github_openconfig_magna//flows/common",
"@com_github_openconfig_magna//flows/ip",
"@com_github_openconfig_magna//flows/mpls",
"@com_github_openconfig_magna//intf",
"@com_github_openconfig_magna//lwotg",
"@com_github_openconfig_magna//lwotgtelem",
"@com_github_openconfig_magna//telemetry/arp",
"@com_github_openconfig_ondatra//:ondatra",
"@com_github_openconfig_ondatra//binding",
"@com_github_openconfig_ondatra//eventlis",
Expand All @@ -29,6 +47,9 @@ go_library(
"@io_k8s_client_go//tools/clientcmd",
"@io_k8s_client_go//tools/leaderelection",
"@io_k8s_client_go//tools/leaderelection/resourcelock",
"@io_k8s_klog//:klog",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//credentials/local",
"@org_golang_google_grpc//reflection",
],
)
Loading

0 comments on commit 10f2aa1

Please sign in to comment.