open-traffic-generator · biplamal · Oct 9, 2023 · Oct 10, 2023 · Oct 10, 2023 · Oct 10, 2023
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -0,0 +1,29 @@
+name: CICD
+
+env:
+  GO_VERSION: "1.18"
+
+on:
+  push:
+
+jobs:
+  kne_b2b:
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout source
+        uses: actions/checkout@v3
+      - name: Setup docker
+        uses: docker-practice/actions-setup-docker@master
+      - name: Setup Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: ${{ env.GO_VERSION }}
+      - name: Setup KNE cluster
+        run: |
+          ./do.sh new_k8s_cluster
+      - name: Deploy KNE OTG back-to-back topology
+        run: |
+          ./do.sh topo new kneb2b
+      - name: Teardown KNE OTG back-to-back topology
+        run: |
+          ./do.sh topo rm kneb2b
diff --git a/conformance b/conformance
diff --git a/deployments/ixia-c-config.yaml b/deployments/ixia-c-config.yaml
@@ -0,0 +1,45 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+    name: ixiatg-release-config
+    namespace: ixiatg-op-system
+data:
+    versions: |
+        {
+        "release": "local",
+        "images": [
+                {
+                    "name": "controller",
+                    "path": "ghcr.io/open-traffic-generator/keng-controller",
+                    "tag": "0.0.1-5318",
+                    "env": {
+                        "TRACE": "true",
+                    }
+                },
+                {
+                    "name": "gnmi-server",
+                    "path": "ghcr.io/open-traffic-generator/otg-gnmi-server",
+                    "tag": "1.12.8"
+                },
+                {
+                    "name": "traffic-engine",
+                    "path": "ghcr.io/open-traffic-generator/ixia-c-traffic-engine",
+                    "tag": "1.6.0.85"
+                },
+                {
+                    "name": "protocol-engine",
+                    "path": "ghcr.io/open-traffic-generator/ixia-c-protocol-engine",
+                    "tag": "1.00.0.332"
+                },
+                {
+                    "name": "controller-community",
+                    "path": "ghcr.io/open-traffic-generator/keng-controller",
+                    "tag": "0.0.1-5318"
+                },
+                {
+                    "name": "ixia-c-one",
+                    "path": "ghcr.io/open-traffic-generator/ixia-c-one",
+                    "tag": "0.0.1-5318"
+                }
+            ]
+        }
diff --git a/deployments/k8s/bases/otg-controller/pod.yaml b/deployments/k8s/bases/otg-controller/pod.yaml
@@ -11,9 +11,9 @@ spec:
     - args:
         - --accept-eula
         - --debug
-      image: ixia-c-controller:latest
+      image: keng-controller:latest
       imagePullPolicy: IfNotPresent
-      name: ixia-c-controller
+      name: keng-controller
       ports:
         - containerPort: 8443
           name: https-port
@@ -38,9 +38,9 @@ spec:
         - -http-server
         - https://localhost:8443
         - --debug
-      image: ixia-c-gnmi-server:latest
+      image: otg-gnmi-server:latest
       imagePullPolicy: IfNotPresent
-      name: ixia-c-gnmi-server
+      name: otg-gnmi-server
       ports:
         - containerPort: 50051
           name: gnmi-port

diff --git a/deployments/k8s/components/images/kustomization.yaml b/deployments/k8s/components/images/kustomization.yaml
@@ -1,14 +1,14 @@
 apiVersion: kustomize.config.k8s.io/v1alpha1
 kind: Component
 
-# Release: https://github.com/open-traffic-generator/ixia-c/releases/tag/v0.0.1-4554
+# Release: https://github.com/open-traffic-generator/ixia-c/releases/tag/v0.0.1-5318
 images:
-  - name: ixia-c-controller
-    newName: ghcr.io/open-traffic-generator/ixia-c-controller
-    newTag: "0.0.1-4554"
-  - name: ixia-c-gnmi-server
-    newName: ghcr.io/open-traffic-generator/ixia-c-gnmi-server
-    newTag: "1.12.7"
+  - name: keng-controller
+    newName: ghcr.io/open-traffic-generator/keng-controller
+    newTag: "0.0.1-5318"
+  - name: otg-gnmi-server
+    newName: ghcr.io/open-traffic-generator/otg-gnmi-server
+    newTag: "1.12.8"
   - name: ixia-c-traffic-engine
     newName: ghcr.io/open-traffic-generator/ixia-c-traffic-engine
     newTag: "1.6.0.85"
diff --git a/deployments/k8s/kne-manifests/ixia-c-b2b.yaml b/deployments/k8s/kne-manifests/ixia-c-b2b.yaml
@@ -0,0 +1,20 @@
+name: ixia-c
+nodes:
+  - name: otg
+    vendor: KEYSIGHT
+    version: local
+    services:
+      8443:
+        name: https
+        inside: 8443
+      40051:
+        name: grpc
+        inside: 40051
+      50051:
+        name: gnmi
+        inside: 50051
+links:
+  - a_node: otg
+    a_int: eth1
+    z_node: otg
+    z_int: eth2
diff --git a/deployments/k8s/network-emulation/ixia-c-k8s.drawio.svg b/deployments/k8s/network-emulation/ixia-c-k8s.drawio.svg
diff --git a/deployments/k8s/network-emulation/pods.yaml b/deployments/k8s/network-emulation/pods.yaml
@@ -21,16 +21,16 @@ metadata:
   labels:
     app: ixia-c
     role: controller
-  name: ixia-c-controller
+  name: keng-controller
   namespace: ixia-c
 spec:
   containers:
     - args:
         - --accept-eula
         - --debug
-      image: ghcr.io/open-traffic-generator/licensed/ixia-c-controller:0.0.1-3889
+      image: ghcr.io/open-traffic-generator/keng-controller:0.0.1-3889
       imagePullPolicy: IfNotPresent
-      name: ixia-c-controller
+      name: keng-controller
       volumeMounts:
         - mountPath: /home/ixia-c/controller/config
           name: config
@@ -71,7 +71,7 @@ spec:
     - env:
         - name: INTF_LIST
           value: eth1
-      image: ghcr.io/open-traffic-generator/licensed/ixia-c-protocol-engine:1.00.0.290
+      image: ghcr.io/open-traffic-generator/ixia-c-protocol-engine:1.00.0.290
       imagePullPolicy: IfNotPresent
       name: ixia-c-port1-protocol-engine
       securityContext:
@@ -107,7 +107,7 @@ spec:
     - env:
         - name: INTF_LIST
           value: eth2
-      image: ghcr.io/open-traffic-generator/licensed/ixia-c-protocol-engine:1.00.0.290
+      image: ghcr.io/open-traffic-generator/ixia-c-protocol-engine:1.00.0.290
       imagePullPolicy: IfNotPresent
       name: ixia-c-port2-protocol-engine
       securityContext:

diff --git a/deployments/k8s/network-emulation/readme.md b/deployments/k8s/network-emulation/readme.md
@@ -15,7 +15,7 @@ This document discusses the first approach using a minimal Ubuntu container as D
 ### Overview
 
 Ixia-C is distributed as a multi-container application with following as core components:
-1. `ixia-c-controller`: API Server driving operation on one or more test port based on API requests
+1. `keng-controller`: API Server driving operation on one or more test port based on API requests
 2. `ixia-c-traffic-engine`: Drives data plane operations on test port
 3. `ixia-c-protocol-engine`: Drives control plane operations on test port
 
@@ -73,9 +73,9 @@ To achieve this, we'll be using [Meshnet CNI](https://github.com/networkop/meshn
     docker login ghcr.io
 
     # download ixia-c images
-    docker pull ghcr.io/open-traffic-generator/licensed/ixia-c-controller:0.0.1-3889
+    docker pull ghcr.io/open-traffic-generator/keng-controller:0.0.1-3889
     docker pull ghcr.io/open-traffic-generator/ixia-c-traffic-engine:1.6.0.35
-    docker pull ghcr.io/open-traffic-generator/licensed/ixia-c-protocol-engine:1.00.0.290
+    docker pull ghcr.io/open-traffic-generator/ixia-c-protocol-engine:1.00.0.290
 
     # download DUT image
     docker pull ubuntu:22.04
@@ -86,9 +86,9 @@ To achieve this, we'll be using [Meshnet CNI](https://github.com/networkop/meshn
     docker pull networkop/init-wait:latest
 
     # push images to nodes
-    kind load docker-image ghcr.io/open-traffic-generator/licensed/ixia-c-controller:0.0.1-3889
+    kind load docker-image ghcr.io/open-traffic-generator/keng-controller:0.0.1-3889
     kind load docker-image ghcr.io/open-traffic-generator/ixia-c-traffic-engine:1.6.0.35
-    kind load docker-image ghcr.io/open-traffic-generator/licensed/ixia-c-protocol-engine:1.00.0.290
+    kind load docker-image ghcr.io/open-traffic-generator/ixia-c-protocol-engine:1.00.0.290
     kind load docker-image ubuntu:22.04
     kind load docker-image networkop/meshnet:latest
     kind load docker-image networkop/init-wait:latest

diff --git a/deployments/k8s/network-emulation/services.yaml b/deployments/k8s/network-emulation/services.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: service-ixia-c-controller
+  name: service-keng-controller
   namespace: ixia-c
 spec:
   ports:

diff --git a/deployments/raw-one-arm.yml b/deployments/raw-one-arm.yml
@@ -1,7 +1,7 @@
 version: '3.9'
 services:
   controller:
-    image: ghcr.io/open-traffic-generator/ixia-c-controller:${CONTROLLER_VERSION:-latest}
+    image: ghcr.io/open-traffic-generator/keng-controller:${CONTROLLER_VERSION:-latest}
     command: --accept-eula
     network_mode: "host"
     restart: always

diff --git a/deployments/raw-three-arm-mesh.yml b/deployments/raw-three-arm-mesh.yml
@@ -1,7 +1,7 @@
 version: '3.9'
 services:
   controller:
-    image: ghcr.io/open-traffic-generator/ixia-c-controller:${CONTROLLER_VERSION:-latest}
+    image: ghcr.io/open-traffic-generator/keng-controller:${CONTROLLER_VERSION:-latest}
     command: --accept-eula
     network_mode: "host"
     restart: always

diff --git a/deployments/raw-two-arm.yml b/deployments/raw-two-arm.yml
@@ -1,7 +1,7 @@
 version: '3.9'
 services:
   controller:
-    image: ghcr.io/open-traffic-generator/ixia-c-controller:${CONTROLLER_VERSION:-latest}
+    image: ghcr.io/open-traffic-generator/keng-controller:${CONTROLLER_VERSION:-latest}
     command: --accept-eula
     network_mode: "host"
     restart: always
+3 −3		.github/workflows/cicd.yml
+10 −10		deployments/ixia-c-config.yaml
+6 −6		deployments/k8s/manifests/ixia-c-b2b-eth0.yaml
+32 −20		do.sh
+10 −7		versions.yaml