diff --git a/deployments/ixia-c-config.yaml b/deployments/ixia-c-config.yaml index df28ab6..a06f62e 100644 --- a/deployments/ixia-c-config.yaml +++ b/deployments/ixia-c-config.yaml @@ -10,16 +10,17 @@ 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/licensed/keng-controller", + "tag": "0.0.1-5316", "env": { - "TRACE": "true" + "TRACE": "true", + "LICENSE_SERVERS": "localhost" } }, { "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", @@ -29,17 +30,22 @@ data: { "name": "protocol-engine", "path": "ghcr.io/open-traffic-generator/licensed/ixia-c-protocol-engine", - "tag": "1.00.0.331" + "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-5316" }, { "name": "ixia-c-one", "path": "ghcr.io/open-traffic-generator/ixia-c-one", - "tag": "0.0.1-4554" + "tag": "0.0.1-5316" + }, + { + "name": "license-server", + "path": "ghcr.io/open-traffic-generator/licensed/keng-license-server:0.0.1-24", + "tag": "0.0.1-24" } ] } diff --git a/deployments/k8s/manifests/ixia-c-b2b-eth0.yaml b/deployments/k8s/manifests/ixia-c-b2b-eth0.yaml index f256ee6..7267738 100644 --- a/deployments/k8s/manifests/ixia-c-b2b-eth0.yaml +++ b/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/licensed/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 diff --git a/do.sh b/do.sh index 18d24f6..b6deaf1 100755 --- a/do.sh +++ b/do.sh @@ -17,7 +17,7 @@ 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_YAML="https://github.com/open-traffic-generator/ixia-c-operator/releases/download/v${IXIA_C_OPERATOR_VERSION}/ixiatg-operator.yaml" +IXIA_C_OPERATOR_YAML="https://github.com/open-traffic-generator/keng-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}" ARISTA_CEOS_OPERATOR_VERSION="2.0.1" @@ -247,8 +247,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 +281,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,8 +311,8 @@ 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 } @@ -320,7 +320,7 @@ 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 @@ -566,7 +566,7 @@ 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} \ && docker run --net=host -d \ - --name=ixia-c-controller \ + --name=keng-controller \ $(ixia_c_controller_img dp) \ --accept-eula \ --trace \ @@ -593,7 +593,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} @@ -610,7 +610,7 @@ create_ixia_c_b2b_cpdp() { echo "Setting up back-to-back with CP/DP distribution of ixia-c ..." login_ghcr \ && 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) \ @@ -655,7 +655,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} @@ -674,7 +674,7 @@ 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=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) \ @@ -818,14 +818,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 } @@ -1133,9 +1133,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} diff --git a/versions.yaml b/versions.yaml index ede67fa..4698860 100644 --- a/versions.yaml +++ b/versions.yaml @@ -1,14 +1,14 @@ -release: 0.0.1-4554 +release: 0.0.1-5316 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-5316 - name: controller-cpdp - path: ghcr.io/open-traffic-generator/licensed/ixia-c-controller - tag: 0.0.1-4554 + path: ghcr.io/open-traffic-generator/licensed/keng-controller + tag: 0.0.1-5316 - 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 + tag: 1.00.0.332