license server incorporation

.github/workflows/cicd.yml

@@ -125,7 +125,7 @@ jobs:
         uses: docker-practice/actions-setup-docker@master
       - name: Deploy back-to-back DP-only distribution of ixia-c
         run: |
-          ./do.sh topo new dp
+          GITHUB_USER=${{ secrets.ENV_GITHUB_USER }} GITHUB_PAT=${{ secrets.ENV_GITHUB_PAT }} ./do.sh topo new dp
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
@@ -160,7 +160,7 @@ jobs:
         uses: docker-practice/actions-setup-docker@master
       - name: Deploy back-to-back DP-only distribution of ixia-c
         run: |
-          ./do.sh topo new dp
+          GITHUB_USER=${{ secrets.ENV_GITHUB_USER }} GITHUB_PAT=${{ secrets.ENV_GITHUB_PAT }} ./do.sh topo new dp
       - name: Setup Go
         uses: actions/setup-go@v3
         with:
@@ -596,7 +596,7 @@ jobs:
         uses: docker-practice/actions-setup-docker@master
       - name: Deploy back-to-back DP-only distribution of ixia-c
         run: |
-          ./do.sh topo new dp
+          GITHUB_USER=${{ secrets.ENV_GITHUB_USER }} GITHUB_PAT=${{ secrets.ENV_GITHUB_PAT }} ./do.sh topo new dp
       - name: Setup Go
         uses: actions/setup-go@v3
         with:

deployments/ixia-c-config.yaml

@@ -10,16 +10,16 @@ data:
         "images": [
                 {
                     "name": "controller",
-                    "path": "ghcr.io/open-traffic-generator/licensed/ixia-c-controller",
-                    "tag": "0.0.1-4554",
+                    "path": "ghcr.io/open-traffic-generator/keng-controller",
+                    "tag": "0.0.1-5318",
                     "env": {
-                        "TRACE": "true"
+                        "TRACE": "true",
                     }
                 },
                 {
                     "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.12.8"
                 },
                 {
                     "name": "traffic-engine",
@@ -28,18 +28,18 @@ 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.332"
                 },
                 {
                     "name": "controller-community",
-                    "path": "ghcr.io/open-traffic-generator/ixia-c-controller",
-                    "tag": "0.0.1-4554"
+                    "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-4554"
+                    "tag": "0.0.1-5318"
                 }
             ]
         }

deployments/k8s/manifests/ixia-c-b2b-eth0.yaml

@@ -34,9 +34,9 @@ items:
         - args:
             - --accept-eula
             - --debug
-          image: ghcr.io/open-traffic-generator/licensed/ixia-c-controller:local
+          image: ghcr.io/open-traffic-generator/keng-controller:local
           imagePullPolicy: IfNotPresent
-          name: ixia-c-controller
+          name: keng-controller
           volumeMounts:
             - mountPath: /home/ixia-c/controller/config
               name: config
@@ -45,9 +45,9 @@ items:
             - -http-server
             - https://localhost:8443
             - --debug
-          image: ghcr.io/open-traffic-generator/ixia-c-gnmi-server:local
+          image: ghcr.io/open-traffic-generator/otg-gnmi-server:local
           imagePullPolicy: IfNotPresent
-          name: ixia-c-gnmi-server
+          name: otg-gnmi-server
           ports:
             - containerPort: 50051
               name: gnmi-port
@@ -85,7 +85,7 @@ items:
         - env:
             - name: INTF_LIST
               value: eth0
-          image: ghcr.io/open-traffic-generator/licensed/ixia-c-protocol-engine:local
+          image: ghcr.io/open-traffic-generator/ixia-c-protocol-engine:local
           imagePullPolicy: IfNotPresent
           name: otg-port-eth1-protocol-engine
           securityContext:
@@ -118,7 +118,7 @@ items:
         - env:
             - name: INTF_LIST
               value: eth0
-          image: ghcr.io/open-traffic-generator/licensed/ixia-c-protocol-engine:local
+          image: ghcr.io/open-traffic-generator/ixia-c-protocol-engine:local
           imagePullPolicy: IfNotPresent
           name: otg-port-eth2-protocol-engine
           securityContext:

do.sh

@@ -16,7 +16,7 @@ KIND_VERSION=v0.16.0
 METALLB_VERSION=v0.13.6
 MESHNET_COMMIT=f26c193
 MESHNET_IMAGE="networkop/meshnet\:v0.3.0"
-IXIA_C_OPERATOR_VERSION="0.3.6"
+IXIA_C_OPERATOR_VERSION="0.3.11"
 IXIA_C_OPERATOR_YAML="https://github.com/open-traffic-generator/ixia-c-operator/releases/download/v${IXIA_C_OPERATOR_VERSION}/ixiatg-operator.yaml"
 NOKIA_SRL_OPERATOR_VERSION="0.4.6"
 NOKIA_SRL_OPERATOR_YAML="https://github.com/srl-labs/srl-controller/config/default?ref=v${NOKIA_SRL_OPERATOR_VERSION}"
@@ -199,6 +199,10 @@ ixia_c_protocol_engine_img() {
     ixia_c_img protocol-engine
 }
 
+keng_license_server_img() {
+    ixia_c_img keng-license-server
+}
+
 ixia_c_controller_img() {
     case $1 in
         dp  )
@@ -247,8 +251,8 @@ gen_controller_config_b2b_dp() {
             endpoint: localhost:5556
         "
     echo -n "$yml" | sed "s/^        //g" | tee ./config.yaml > /dev/null \
-    && docker exec ixia-c-controller mkdir -p ${configdir} \
-    && docker cp ./config.yaml ixia-c-controller:${configdir}/ \
+    && docker exec keng-controller mkdir -p ${configdir} \
+    && docker cp ./config.yaml keng-controller:${configdir}/ \
     && rm -rf ./config.yaml
 }
 
@@ -281,8 +285,8 @@ gen_controller_config_b2b_cpdp() {
             endpoint: \"${OTG_PORTZ}:5555+${OTG_PORTZ}:50071\"
         "
     echo -n "$yml" | sed "s/^        //g" | tee ./config.yaml > /dev/null \
-    && docker exec ixia-c-controller mkdir -p ${configdir} \
-    && docker cp ./config.yaml ixia-c-controller:${configdir}/ \
+    && docker exec keng-controller mkdir -p ${configdir} \
+    && docker cp ./config.yaml keng-controller:${configdir}/ \
     && rm -rf ./config.yaml
 }
 
@@ -311,16 +315,16 @@ gen_controller_config_b2b_lag() {
             endpoint: ${OTG_PORTZ}:5555;3+${OTG_PORTZ}:50071
         "
     echo -n "$yml" | sed "s/^        //g" | tee ./config.yaml > /dev/null \
-    && docker exec ixia-c-controller mkdir -p ${configdir} \
-    && docker cp ./config.yaml ixia-c-controller:${configdir}/ \
+    && docker exec keng-controller mkdir -p ${configdir} \
+    && docker cp ./config.yaml keng-controller:${configdir}/ \
     && rm -rf ./config.yaml
 }
 
 gen_config_common() {
     location=localhost
     if [ "${1}" = "ipv6" ]
     then 
-        location="[$(container_ip6 ixia-c-controller)]"
+        location="[$(container_ip6 keng-controller)]"
     fi
 
     yml="otg_speed: speed_1_gbps
@@ -564,13 +568,16 @@ wait_for_sock() {
 
 create_ixia_c_b2b_dp() {
     echo "Setting up back-to-back with DP-only distribution of ixia-c ..."
-    create_veth_pair ${VETH_A} ${VETH_Z}                    \
+    login_ghcr                                             \
+    && create_veth_pair ${VETH_A} ${VETH_Z}                    \
+    && docker run -d --name=keng-license-server $(keng_license_server_img) --accept-eula \
     && docker run --net=host  -d                            \
-        --name=ixia-c-controller                            \
+        --name=keng-controller                              \
         $(ixia_c_controller_img dp)                         \
         --accept-eula                                       \
         --trace                                             \
         --disable-app-usage-reporter                        \
+        --license-servers="$(container_ip keng-license-server)"             \
     && docker run --net=host --privileged -d                \
         --name=ixia-c-traffic-engine-${VETH_A}              \
         -e OPT_LISTEN_PORT="5555"                           \
@@ -593,7 +600,7 @@ create_ixia_c_b2b_dp() {
 
 rm_ixia_c_b2b_dp() {
     echo "Tearing down back-to-back with DP-only distribution of ixia-c ..."
-    docker stop ixia-c-controller && docker rm ixia-c-controller
+    docker stop keng-controller && docker rm keng-controller
     docker stop ixia-c-traffic-engine-${VETH_A}
     docker rm ixia-c-traffic-engine-${VETH_A}
     docker stop ixia-c-traffic-engine-${VETH_Z}
@@ -609,14 +616,16 @@ create_ixia_c_b2b_cpdp() {
     fi
     echo "Setting up back-to-back with CP/DP distribution of ixia-c ..."
     login_ghcr                                              \
+    && docker run -d --name=keng-license-server $(keng_license_server_img) --accept-eula \
     && docker run -d                                        \
-        --name=ixia-c-controller                            \
+        --name=keng-controller                              \
         --publish 0.0.0.0:8443:8443                         \
         --publish 0.0.0.0:40051:40051                       \
         $(ixia_c_controller_img cpdp)                       \
         --accept-eula                                       \
         --trace                                             \
         --disable-app-usage-reporter                        \
+        --license-servers="$(container_ip keng-license-server)"             \
     && docker run --privileged -d                           \
         --name=ixia-c-traffic-engine-${VETH_A}              \
         -e OPT_LISTEN_PORT="5555"                           \
@@ -655,7 +664,7 @@ create_ixia_c_b2b_cpdp() {
 
 rm_ixia_c_b2b_cpdp() {
     echo "Tearing down back-to-back with CP/DP distribution of ixia-c ..."
-    docker stop ixia-c-controller && docker rm ixia-c-controller
+    docker stop keng-controller && docker rm keng-controller
 
     docker stop ixia-c-traffic-engine-${VETH_A}
     docker stop ixia-c-protocol-engine-${VETH_A}
@@ -673,14 +682,16 @@ rm_ixia_c_b2b_cpdp() {
 create_ixia_c_b2b_lag() {
     echo "Setting up back-to-back LAG with CP/DP distribution of ixia-c ..."
     login_ghcr                                              \
+    && docker run -d --name=keng-license-server $(keng_license_server_img) --accept-eula \
     && docker run -d                                        \
-        --name=ixia-c-controller                            \
+        --name=keng-controller                              \
         --publish 0.0.0.0:8443:8443                         \
         --publish 0.0.0.0:40051:40051                       \
         $(ixia_c_controller_img cpdp)                       \
         --accept-eula                                       \
         --trace                                             \
         --disable-app-usage-reporter                        \
+        --license-servers="$(container_ip keng-license-server)"     \
     && docker run --privileged -d                           \
         --name=ixia-c-traffic-engine-${VETH_A}              \
         -e OPT_LISTEN_PORT="5555"                           \
@@ -818,14 +829,14 @@ get_meshnet() {
 }
 
 get_ixia_c_operator() {
-    echo "Installing ixia-c-operator ${IXIA_C_OPERATOR_YAML} ..."
+    echo "Installing keng-operator ${IXIA_C_OPERATOR_YAML} ..."
     load_image_to_kind $(ixia_c_operator_image) \
     && kubectl apply -f ${IXIA_C_OPERATOR_YAML} \
     && wait_for_pods ixiatg-op-system
 }
 
 rm_ixia_c_operator() {
-    echo "Removing ixia-c-operator ${IXIA_C_OPERATOR_YAML} ..."
+    echo "Removing keng-operator ${IXIA_C_OPERATOR_YAML} ..."
     kubectl delete -f ${IXIA_C_OPERATOR_YAML} \
     && wait_for_no_namespace ixiatg-op-system
 }
@@ -1039,7 +1050,8 @@ create_ixia_c_kne() {
     echo "Creating KNE ${1} ${2} topology ..."
     ns=$(kne_namespace ${1} ${2})
     topo=$(kne_topo_file ${1} ${2})
-    kubectl apply -f deployments/ixia-c-config.yaml \
+    kubectl create secret -n ixiatg-op-system generic license-server --from-literal=image="ghcr.io/open-traffic-generator/licensed/keng-license-server:latest" \
+    && kubectl apply -f deployments/ixia-c-config.yaml \
     && kne create ${topo} \
     && wait_for_pods ${ns} \
     && kubectl get pods -A \
@@ -1133,9 +1145,9 @@ topo() {
             esac
         ;;
         logs    )
-            mkdir -p logs/ixia-c-controller
-            docker cp ixia-c-controller:/home/ixia-c/controller/logs/ logs/ixia-c-controller
-            docker cp ixia-c-controller:/home/ixia-c/controller/config/config.yaml logs/ixia-c-controller
+            mkdir -p logs/keng-controller
+            docker cp keng-controller:/home/ixia-c/controller/logs/ logs/keng-controller
+            docker cp keng-controller:/home/ixia-c/controller/config/config.yaml logs/keng-controller
             mkdir -p logs/ixia-c-traffic-engine-${VETH_A}
             mkdir -p logs/ixia-c-traffic-engine-${VETH_Z}
             docker cp ixia-c-traffic-engine-${VETH_A}:/var/log/usstream/ logs/ixia-c-traffic-engine-${VETH_A}

versions.yaml

@@ -1,14 +1,17 @@
-release: 0.0.1-4554
+release: 0.0.1-5318
 images:
   - name: controller-dp
-    path: ghcr.io/open-traffic-generator/ixia-c-controller
-    tag: 0.0.1-4554
+    path: ghcr.io/open-traffic-generator/keng-controller
+    tag: 0.0.1-5318
   - name: controller-cpdp
-    path: ghcr.io/open-traffic-generator/licensed/ixia-c-controller
-    tag: 0.0.1-4554
+    path: ghcr.io/open-traffic-generator/keng-controller
+    tag: 0.0.1-5318
+  - name: keng-license-server
+    path: ghcr.io/open-traffic-generator/licensed/keng-license-server
+    tag: 0.0.1-24
   - 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/licensed/ixia-c-protocol-engine
-    tag: 1.00.0.331
+    path: ghcr.io/open-traffic-generator/ixia-c-protocol-engine
+    tag: 1.00.0.332