diff --git a/roles/uperf-scale/templates/workload.yml.j2 b/roles/uperf-scale/templates/workload.yml.j2 index 54adf9117..02185ed25 100644 --- a/roles/uperf-scale/templates/workload.yml.j2 +++ b/roles/uperf-scale/templates/workload.yml.j2 @@ -16,6 +16,8 @@ items: {% else %} name: 'uperf-scale-client-{{item.spec.clusterIP}}-{{ trunc_uuid }}' {% endif %} +{% elif workload_args.multus.enabled is sameas true %} + name: 'uperf-client-{{ (item['metadata']['annotations']['k8s.v1.cni.cncf.io/network-status'] | from_json)[1]['ips'][0] }}-{{ trunc_uuid }}' {% else %} name: 'uperf-scale-client-{{item.status.podIP}}-{{ trunc_uuid }}' {% endif %} @@ -120,7 +122,7 @@ items: {% else %} {% if workload_args.multus.client is defined %} - "export multus_client={{workload_args.multus.client}}; - export h={{ (item['metadata']['annotations']['k8s.v1.cni.cncf.io/networks-status'] | from_json)[1]['ips'][0] }}; + export h={{ (item['metadata']['annotations']['k8s.v1.cni.cncf.io/network-status'] | from_json)[1]['ips'][0] }}; {% else %} - "export h={{item.status.podIP}}; {% endif %} diff --git a/roles/uperf/templates/workload.yml.j2 b/roles/uperf/templates/workload.yml.j2 index fdcf783ab..689e37e36 100644 --- a/roles/uperf/templates/workload.yml.j2 +++ b/roles/uperf/templates/workload.yml.j2 @@ -11,6 +11,8 @@ metadata: {% else %} name: 'uperf-client-{{item.spec.clusterIP}}-{{ trunc_uuid }}' {% endif %} +{% elif workload_args.multus.enabled is sameas true %} + name: 'uperf-client-{{ (item['metadata']['annotations']['k8s.v1.cni.cncf.io/network-status'] | from_json)[1]['ips'][0] }}-{{ trunc_uuid }}' {% else %} name: 'uperf-client-{{item.status.podIP}}-{{ trunc_uuid }}' {% endif %} @@ -134,7 +136,7 @@ spec: {% else %} {% if workload_args.multus.client is defined %} - "export multus_client={{workload_args.multus.client}}; - export h={{ (item['metadata']['annotations']['k8s.v1.cni.cncf.io/networks-status'] | from_json)[1]['ips'][0] }}; + export h={{ (item['metadata']['annotations']['k8s.v1.cni.cncf.io/network-status'] | from_json)[1]['ips'][0] }}; {% else %} - "export h={{item.status.podIP}}; {% endif %}