The uplink and downlink interfaces for the 4 port
test cases were inconsistent and fixed in this commit.
This affects all the 4 port PROX test cases.
Tested on: Heat L2fwd-4 and L3fwd-4 test case.
JIRA: YARDSTICK-1185
Change-Id: Ia2ce7ed0dc395b812f84ede94e259b42dc833579
Signed-off-by:Abhijit Sinha <abhijit.sinha@intel.com>
14 files changed:
vnfd-id-ref: vnf__0
- id: downlink_0
vnfd-id-ref: vnf__0
- id: downlink_0
- name: vnf__0 to tg__0 link 1
+ name: vnf__0 to tg__0 link 2
type: ELAN
vnfd-connection-point-ref:
type: ELAN
vnfd-connection-point-ref:
- - member-vnf-index-ref: '1'
+ - member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe1
vnfd-id-ref: vnf__0
vnfd-connection-point-ref: xe1
vnfd-id-ref: vnf__0
- - member-vnf-index-ref: '2'
+ - member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe1
vnfd-id-ref: tg__0
vnfd-connection-point-ref: xe1
vnfd-id-ref: tg__0
- - id: downlink_1
- name: vnf__0 to tg__0 link 2
+
+ - id: uplink_1
+ name: tg__0 to vnf__0 link 3
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe2
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe2
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe2
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe2
- vnfd-id-ref: tg__0
- - id: downlink_2
- name: vnf__0 to tg__0 link 3
+ vnfd-id-ref: vnf__0
+
+ - id: downlink_1
+ name: vnf__0 to tg__0 link 4
type: ELAN
vnfd-connection-point-ref:
type: ELAN
vnfd-connection-point-ref:
- - member-vnf-index-ref: '1'
+ - member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe3
vnfd-id-ref: vnf__0
vnfd-connection-point-ref: xe3
vnfd-id-ref: vnf__0
- - member-vnf-index-ref: '2'
+ - member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe3
vnfd-id-ref: tg__0
vnfd-connection-point-ref: xe3
vnfd-id-ref: tg__0
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
cidr: '10.0.4.0/24'
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
cidr: '10.0.4.0/24'
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
cidr: '10.0.5.0/24'
gateway_ip: 'null'
port_security_enabled: False
cidr: '10.0.5.0/24'
gateway_ip: 'null'
port_security_enabled: False
networks:
mgmt:
cidr: '10.0.1.0/24'
networks:
mgmt:
cidr: '10.0.1.0/24'
- uplink_0:
- cidr: '10.0.2.0/24'
+{% for vport in range(1,vports,2|int) %}
+ uplink_{{ loop.index0 }}:
+ cidr: '10.0.{{ vport+1 }}.0/24'
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
-{% for vport in range(vports-1|int) %}
- downlink_{{ vport }}:
- cidr: '10.0.{{ vport+3 }}.0/24'
+
+ downlink_{{ loop.index0 }}:
+ cidr: '10.0.{{ vport+2 }}.0/24'
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
image: yardstick-samplevnfs
user: ubuntu
flavor:
image: yardstick-samplevnfs
user: ubuntu
flavor:
ram: 20480
disk: 6
extra_specs:
ram: 20480
disk: 6
extra_specs:
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
cidr: '10.0.4.0/24'
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
cidr: '10.0.4.0/24'
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
cidr: '10.0.5.0/24'
gateway_ip: 'null'
port_security_enabled: False
cidr: '10.0.5.0/24'
gateway_ip: 'null'
port_security_enabled: False
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
cidr: '10.0.4.0/24'
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
cidr: '10.0.4.0/24'
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
cidr: '10.0.5.0/24'
gateway_ip: 'null'
port_security_enabled: False
cidr: '10.0.5.0/24'
gateway_ip: 'null'
port_security_enabled: False
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
cidr: '10.0.4.0/24'
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
cidr: '10.0.4.0/24'
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
cidr: '10.0.5.0/24'
gateway_ip: 'null'
port_security_enabled: False
cidr: '10.0.5.0/24'
gateway_ip: 'null'
port_security_enabled: False
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
cidr: '10.0.4.0/24'
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
cidr: '10.0.4.0/24'
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
cidr: '10.0.5.0/24'
gateway_ip: 'null'
port_security_enabled: False
cidr: '10.0.5.0/24'
gateway_ip: 'null'
port_security_enabled: False
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
cidr: '10.0.4.0/24'
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
cidr: '10.0.4.0/24'
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
cidr: '10.0.5.0/24'
gateway_ip: 'null'
port_security_enabled: False
cidr: '10.0.5.0/24'
gateway_ip: 'null'
port_security_enabled: False
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
cidr: '10.0.4.0/24'
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
cidr: '10.0.4.0/24'
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
cidr: '10.0.5.0/24'
gateway_ip: 'null'
port_security_enabled: False
cidr: '10.0.5.0/24'
gateway_ip: 'null'
port_security_enabled: False
networks:
mgmt:
cidr: '10.0.1.0/24'
networks:
mgmt:
cidr: '10.0.1.0/24'
- uplink_0:
- cidr: '10.0.2.0/24'
+{% for vport in range(1,vports,2|int) %}
+ uplink_{{ loop.index0 }}:
+ cidr: '10.0.{{ vport+1 }}.0/24'
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
-{% for vport in range(vports-1|int) %}
- downlink_{{ vport }}:
- cidr: '10.0.{{ vport+3 }}.0/24'
+
+ downlink_{{ loop.index0 }}:
+ cidr: '10.0.{{ vport+2 }}.0/24'
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
cidr: '10.0.4.0/24'
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
cidr: '10.0.4.0/24'
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
cidr: '10.0.5.0/24'
gateway_ip: 'null'
port_security_enabled: False
cidr: '10.0.5.0/24'
gateway_ip: 'null'
port_security_enabled: False
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
cidr: '10.0.4.0/24'
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
cidr: '10.0.4.0/24'
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
cidr: '10.0.5.0/24'
gateway_ip: 'null'
port_security_enabled: False
cidr: '10.0.5.0/24'
gateway_ip: 'null'
port_security_enabled: False
networks:
mgmt:
cidr: '10.0.1.0/24'
networks:
mgmt:
cidr: '10.0.1.0/24'
- uplink_0:
- cidr: '10.0.2.0/24'
+{% for vport in range(1,vports,2|int) %}
+ uplink_{{ loop.index0 }}:
+ cidr: '10.0.{{ vport+1 }}.0/24'
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
-{% for vport in range(vports-1|int) %}
- downlink_{{ vport }}:
- cidr: '10.0.{{ vport+3 }}.0/24'
+
+ downlink_{{ loop.index0 }}:
+ cidr: '10.0.{{ vport+2 }}.0/24'
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
cidr: '10.0.4.0/24'
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
cidr: '10.0.4.0/24'
gateway_ip: 'null'
port_security_enabled: False
enable_dhcp: 'false'
cidr: '10.0.5.0/24'
gateway_ip: 'null'
port_security_enabled: False
cidr: '10.0.5.0/24'
gateway_ip: 'null'
port_security_enabled: False