Ixia-c operator upgrade (#448)

* Ixia operator upgrade * Update create_topology.md * Update create_topology.md * replace all references of ixia-c-operator with keng-operator * updated ixia-c versions and replaced usage of arbitrary version 0.0.1-999 with v0.1 * Update create_topology.md * ixiatg documentation updates * v0.1 -> 0.0.1-9999 * updated keng release to 0.1.0-26 --------- Co-authored-by: Ashutosh Kumar <[email protected]> Co-authored-by: Alex Bortok <[email protected]> Co-authored-by: Octavian Petre <[email protected]>
openconfig · Nov 9, 2023 · c5582a3 · c5582a3
1 parent 0ac02db
commit c5582a3
Show file tree

Hide file tree

Showing 13 changed files with 55 additions and 101 deletions.
diff --git a/cloudbuild/vendors/deployment.yaml b/cloudbuild/vendors/deployment.yaml
@@ -26,7 +26,7 @@ controllers:
   - kind: IxiaTG
     spec:
       operator: ../../manifests/keysight/ixiatg-operator.yaml
-      configMap: ../../manifests/keysight/ixiatg-configmap-unlicensed.yaml
+      configMap: ../../manifests/keysight/ixiatg-configmap.yaml
   - kind: SRLinux
     spec:
       operator: ../../manifests/controllers/srlinux/manifest.yaml

diff --git a/deploy/deploy.go b/deploy/deploy.go
@@ -1250,7 +1250,7 @@ func (i *IxiaTGSpec) Deploy(ctx context.Context) error {
 	}
 
 	if i.ConfigMap == "" && i.ConfigMapData == nil {
-		log.Warningf("IxiaTG controller deployed without configmap, before creating a topology with ixia-c be sure to create a configmap following https://github.com/open-traffic-generator/ixia-c-operator#ixia-c-operator and apply it using 'kubectl apply -f ixiatg-configmap.yaml'")
+		log.Warningf("IxiaTG controller deployed without configmap, before creating a topology with ixia-c be sure to create a configmap following https://github.com/open-traffic-generator/keng-operator#keng-operator and apply it using 'kubectl apply -f ixiatg-configmap.yaml'")
 		return nil
 	}
 	if i.ConfigMapData != nil {

diff --git a/deploy/kne/kind-bridge-unlicensed.yaml b/deploy/kne/kind-bridge-unlicensed.yaml
diff --git a/docs/create_topology.md b/docs/create_topology.md
@@ -184,11 +184,28 @@ deployment](#deploy-a-cluster).
 
 ### IxiaTG Controller
 
+`ixiatg` controller orchestrates the lifecycle of the [Ixia-c](https://ixia-c.dev) test nodes that add [Open Traffic Generator](https://otg.dev) capabilities to the KNE topology. To deploy:
+
 ```bash
 kubectl apply -f manifests/controllers/keysight/ixiatg-operator.yaml
 kubectl apply -f manifests/controllers/keysight/ixiatg-configmap.yaml
 ```
 
+With the steps above the Ixia-c nodes will operate in the [Community Edition](https://github.com/open-traffic-generator/ixia-c/blob/mkdocs/docs/licensing.md#license-editions) mode. To enable full capabilities of Ixia-c, a valid Keysight Elastic Network Generator license is required. Use the following additional step to provide the address of the Keysight Licensing Server with the license to the `ixiatg` controller:
+
+```bash
+kubectl create secret -n ixiatg-op-system generic license-server --from-literal=addresses="<license_server_IP_addresses>"
+```
+
+If later you need to use a different license server IP, delete the existing secret first.
+
+```bash
+kubectl delete secret/license-server -n ixiatg-op-system
+```
+
+See more on the
+[keng-operator GitHub repo](https://github.com/open-traffic-generator/keng-operator).
+
 ### SR Linux Controller
 
 ```bash

diff --git a/go.mod b/go.mod
@@ -13,7 +13,7 @@ require (
 	github.com/h-fam/errdiff v1.0.2
 	github.com/kr/pretty v0.3.1
 	github.com/networkop/meshnet-cni v0.3.1-0.20230525201116-d7c306c635cf
-	github.com/open-traffic-generator/ixia-c-operator v0.3.6
+	github.com/open-traffic-generator/keng-operator v0.3.13
 	github.com/open-traffic-generator/snappi/gosnappi v0.13.0
 	github.com/openconfig/gnmi v0.10.0
 	github.com/openconfig/gnoigo v0.0.0-20231026010722-87413fdb22e7

diff --git a/go.sum b/go.sum
@@ -1089,8 +1089,8 @@ github.com/onsi/ginkgo/v2 v2.6.0 h1:9t9b9vRUbFq3C4qKFCGkVuq/fIHji802N1nrtkh1mNc=
 github.com/onsi/ginkgo/v2 v2.6.0/go.mod h1:63DOGlLAH8+REH8jUGdL3YpCpu7JODesutUjdENfUAc=
 github.com/onsi/gomega v1.24.1 h1:KORJXNNTzJXzu4ScJWssJfJMnJ+2QJqhoQSRwNlze9E=
 github.com/onsi/gomega v1.24.1/go.mod h1:3AOiACssS3/MajrniINInwbfOOtfZvplPzuRSmvt1jM=
-github.com/open-traffic-generator/ixia-c-operator v0.3.6 h1:dablUs6FAToVDFaoIo2M+Z9UCa93KAwlj7HJqNwLwTQ=
-github.com/open-traffic-generator/ixia-c-operator v0.3.6/go.mod h1:Q+ZXCinXxUKcnrJf5PJC1Q7JxUQc5ZPZA85jwVAqIRQ=
+github.com/open-traffic-generator/keng-operator v0.3.13 h1:XTYbqKafrSPF55YxfbTU4x6OEvsslvWKxxEocN959AM=
+github.com/open-traffic-generator/keng-operator v0.3.13/go.mod h1:+koaOnSyrJHdzxnaye+M6k+ZbszQlWI9u3tMxSpORNA=
 github.com/open-traffic-generator/snappi/gosnappi v0.13.0 h1:RdlbT+CIlVum6xbhiFr/IzTvQee5bMa3V4oBWa79UBw=
 github.com/open-traffic-generator/snappi/gosnappi v0.13.0/go.mod h1:QjB939WFJqUq6V7RQqkY/LFCgRRzKrybHHFp7F7xdWA=
 github.com/openconfig/gnmi v0.0.0-20200414194230-1597cc0f2600/go.mod h1:M/EcuapNQgvzxo1DDXHK4tx3QpYM/uG4l591v33jG2A=

diff --git a/load/testdata/manifests/keysight/ixiatg-configmap.yaml b/load/testdata/manifests/keysight/ixiatg-configmap.yaml
@@ -6,32 +6,32 @@ metadata:
 data:
   versions: |
     {
-      "release": "0.0.1-9999",
-      "images": [
+        "release": "0.0.1-9999",
+        "images": [
             {
                 "name": "controller",
-                "path": "ghcr.io/open-traffic-generator/licensed/ixia-c-controller",
-                "tag": "0.0.1-3807"
+                "path": "ghcr.io/open-traffic-generator/keng-controller",
+                "tag": "0.1.0-26"
             },
             {
                 "name": "gnmi-server",
-                "path": "ghcr.io/open-traffic-generator/ixia-c-gnmi-server",
-                "tag": "1.10.14"
+                "path": "ghcr.io/open-traffic-generator/otg-gnmi-server",
+                "tag": "1.13.0"
             },
             {
                 "name": "traffic-engine",
                 "path": "ghcr.io/open-traffic-generator/ixia-c-traffic-engine",
-                "tag": "1.6.0.30"
+                "tag": "1.6.0.85"
             },
             {
                 "name": "protocol-engine",
-                "path": "ghcr.io/open-traffic-generator/licensed/ixia-c-protocol-engine",
-                "tag": "1.00.0.271"
+                "path": "ghcr.io/open-traffic-generator/ixia-c-protocol-engine",
+                "tag": "1.00.0.337"
             },
             {
                 "name": "ixhw-server",
-                "path": "ghcr.io/open-traffic-generator/ixia-c-ixhw-server",
-                "tag": "0.10.7-8"
+                "path": "ghcr.io/open-traffic-generator/keng-layer23-hw-server",
+                "tag": "0.13.0-2"
             }
         ]
     }
diff --git a/load/testdata/manifests/keysight/ixiatg-operator.yaml b/load/testdata/manifests/keysight/ixiatg-operator.yaml
@@ -387,7 +387,7 @@ spec:
         - --leader-elect
         command:
         - /manager
-        image: ghcr.io/open-traffic-generator/ixia-c-operator:0.3.1
+        image: ghcr.io/open-traffic-generator/keng-operator:0.3.13
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/manifests/keysight/ixiatg-configmap-unlicensed.yaml b/manifests/keysight/ixiatg-configmap-unlicensed.yaml
diff --git a/manifests/keysight/ixiatg-configmap.yaml b/manifests/keysight/ixiatg-configmap.yaml
@@ -6,17 +6,17 @@ metadata:
 data:
   versions: |
     {
-      "release": "0.0.1-9999",
-      "images": [
+        "release": "0.0.1-9999",
+        "images": [
             {
                 "name": "controller",
-                "path": "ghcr.io/open-traffic-generator/licensed/ixia-c-controller",
-                "tag": "0.0.1-4555"
+                "path": "ghcr.io/open-traffic-generator/keng-controller",
+                "tag": "0.1.0-26"
             },
             {
                 "name": "gnmi-server",
-                "path": "ghcr.io/open-traffic-generator/ixia-c-gnmi-server",
-                "tag": "1.12.7"
+                "path": "ghcr.io/open-traffic-generator/otg-gnmi-server",
+                "tag": "1.13.0"
             },
             {
                 "name": "traffic-engine",
@@ -25,13 +25,13 @@ data:
             },
             {
                 "name": "protocol-engine",
-                "path": "ghcr.io/open-traffic-generator/licensed/ixia-c-protocol-engine",
-                "tag": "1.00.0.331"
+                "path": "ghcr.io/open-traffic-generator/ixia-c-protocol-engine",
+                "tag": "1.00.0.337"
             },
             {
                 "name": "ixhw-server",
-                "path": "ghcr.io/open-traffic-generator/ixia-c-ixhw-server",
-                "tag": "0.12.5-1"
+                "path": "ghcr.io/open-traffic-generator/keng-layer23-hw-server",
+                "tag": "0.13.0-2"
             }
         ]
     }
diff --git a/manifests/keysight/ixiatg-operator.yaml b/manifests/keysight/ixiatg-operator.yaml
@@ -387,7 +387,7 @@ spec:
         - --leader-elect
         command:
         - /manager
-        image: ghcr.io/open-traffic-generator/ixia-c-operator:0.3.6
+        image: ghcr.io/open-traffic-generator/keng-operator:0.3.13
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/pods/data_test.go b/pods/data_test.go
@@ -2202,7 +2202,7 @@ var (
                 "command": [
                     "/manager"
                 ],
-                "image": "ghcr.io/open-traffic-generator/ixia-c-operator:0.3.1",
+                "image": "ghcr.io/open-traffic-generator/keng-operator:0.3.13",
                 "imagePullPolicy": "IfNotPresent",
                 "livenessProbe": {
                     "failureThreshold": 3,
@@ -2411,7 +2411,7 @@ var (
                 "command": [
                     "/manager"
                 ],
-                "image": "ghcr.io/open-traffic-generator/ixia-c-operator:0.3.1",
+                "image": "ghcr.io/open-traffic-generator/keng-operator:0.3.13",
                 "imagePullPolicy": "IfNotPresent",
                 "livenessProbe": {
                     "failureThreshold": 3,
@@ -2582,7 +2582,7 @@ var (
                 }
             },
             {
-                "image": "ghcr.io/open-traffic-generator/ixia-c-operator:0.3.1",
+                "image": "ghcr.io/open-traffic-generator/keng-operator:0.3.13",
                 "imageID": "",
                 "lastState": {},
                 "name": "manager",
@@ -2616,7 +2616,7 @@ var (
 			},
 			{
 				Name:   "manager",
-				Image:  "ghcr.io/open-traffic-generator/ixia-c-operator:0.3.1",
+				Image:  "ghcr.io/open-traffic-generator/keng-operator:0.3.13",
 				Reason: "ContainerCreating",
 			},
 		},
@@ -2981,7 +2981,7 @@ var (
                 "command": [
                     "/manager"
                 ],
-                "image": "ghcr.io/open-traffic-generator/ixia-c-operator:0.3.1",
+                "image": "ghcr.io/open-traffic-generator/keng-operator:0.3.13",
                 "imagePullPolicy": "IfNotPresent",
                 "livenessProbe": {
                     "failureThreshold": 3,
@@ -3154,8 +3154,8 @@ var (
             },
             {
                 "containerID": "containerd://2f69e4e109842b198534badca065147a6c64de6af15c652c98e909e4e7395d0c",
-                "image": "ghcr.io/open-traffic-generator/ixia-c-operator:0.3.1",
-                "imageID": "ghcr.io/open-traffic-generator/ixia-c-operator@sha256:157c99a77f89db86ba5074656c9b43b8edce828e863704b631e624cbfac7e813",
+                "image": "ghcr.io/open-traffic-generator/keng-operator:0.3.13",
+                "imageID": "ghcr.io/open-traffic-generator/keng-operator@sha256:30b629370b7aafafeecd7a9c2a4eabae2c3129a877a4d161d86070002ab6b2e2",
                 "lastState": {},
                 "name": "manager",
                 "ready": false,
@@ -3194,7 +3194,7 @@ var (
 			},
 			{
 				Name:  "manager",
-				Image: "ghcr.io/open-traffic-generator/ixia-c-operator:0.3.1",
+				Image: "ghcr.io/open-traffic-generator/keng-operator:0.3.13",
 				Ready: true,
 			},
 		},

diff --git a/topo/node/keysight/keysight.go b/topo/node/keysight/keysight.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"time"
 
-	ixclient "github.com/open-traffic-generator/ixia-c-operator/api/clientset/v1beta1"
-	ixiatg "github.com/open-traffic-generator/ixia-c-operator/api/v1beta1"
+	ixclient "github.com/open-traffic-generator/keng-operator/api/clientset/v1beta1"
+	ixiatg "github.com/open-traffic-generator/keng-operator/api/v1beta1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	log "k8s.io/klog/v2"