aboutsummaryrefslogtreecommitdiffstats
path: root/samples
diff options
context:
space:
mode:
authorRoss Brattain <ross.b.brattain@intel.com>2017-09-12 09:57:38 -0700
committerRoss Brattain <ross.b.brattain@intel.com>2017-09-19 07:42:43 -0700
commit9b0b8ae33541c0ad8925521b1c3f1bc559fefbe6 (patch)
tree24c3e5279786bd0ccf9816e9d1076d067b6cee43 /samples
parent51ecde958cbaaedcb443bd7845eb1da9a1c013af (diff)
NSB: count from 0, vnf_0, tg_9, private->uplink, public->downlink
Also rename private to uplink, public to downlink for scale-out template we need to count from 0 so we can use range() without +1/-1 errors vnf_0, vnf_1 tg_0, tg_1 also fix Ixia defaults Change-Id: I6aecfbb95f99af20f012a9df19c19be77d1b5b77 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com> Signed-off-by: Edward MacGillivray <edward.s.macgillivray@intel.com> @media only all and (prefers-color-scheme: dark) { .highlight .hll { background-color: #49483e } .highlight .c { color: #75715e } /* Comment */ .highlight .err { color: #960050; background-color: #1e0010 } /* Error */ .highlight .k { color: #66d9ef } /* Keyword */ .highlight .l { color: #ae81ff } /* Literal */ .highlight .n { color: #f8f8f2 } /* Name */ .highlight .o { color: #f92672 } /* Operator */ .highlight .p { color: #f8f8f2 } /* Punctuation */ .highlight .ch { color: #75715e } /* Comment.Hashbang */ .highlight .cm { color: #75715e } /* Comment.Multiline */ .highlight .cp { color: #75715e } /* Comment.Preproc */ .highlight .cpf { color: #75715e } /* Comment.PreprocFile */ .highlight .c1 { color: #75715e } /* Comment.Single */ .highlight .cs { color: #75715e } /* Comment.Special */ .highlight .gd { color: #f92672 } /* Generic.Deleted */ .highlight .ge { font-style: italic } /* Generic.Emph */ .highlight .gi { color: #a6e22e } /* Generic.Inserted */ .highlight .gs { font-weight: bold } /* Generic.Strong */ .highlight .gu { color: #75715e } /* Generic.Subheading */ .highlight .kc { color: #66d9ef } /* Keyword.Constant */ .highlight .kd { color: #66d9ef } /* Keyword.Declaration */ .highlight .kn { color: #f92672 } /* Keyword.Namespace */ .highlight .kp { color: #66d9ef } /* Keyword.Pseudo */ .highlight .kr { color: #66d9ef } /* Keyword.Reserved */ .highlight .kt { color: #66d9ef } /* Keyword.Type */ .highlight .ld { color: #e6db74 } /* Literal.Date */ .highlight .m { color: #ae81ff } /* Literal.Number */ .highlight .s { color: #e6db74 } /* Literal.String */ .highlight .na { color: #a6e22e } /* Name.Attribute */ .highlight .nb { color: #f8f8f2 } /* Name.Builtin */ .highlight .nc { color: #a6e22e } /* Name.Class */ .highlight .no { color: #66d9ef } /* Name.Constant */ .highlight .nd { color: #a6e22e } /* Name.Decorator */ .highlight .ni { color: #f8f8f2 } /* Name.Entity */ .highlight .ne { color: #a6e22e } /* Name.Exception */ .highlight .nf { color: #a6e22e } /* Name.Function */ .highlight .nl { color: #f8f8f2 } /* Name.Label */ .highlight .nn { color: #f8f8f2 } /* Name.Namespace */ .highlight .nx { color: #a6e22e } /* Name.Other */ .highlight .py { color: #f8f8f2 } /* Name.Property */ .highlight .nt { color: #f92672 } /* Name.Tag */ .highlight .nv { color: #f8f8f2 } /* Name.Variable */ .highlight .ow { color: #f92672 } /* Operator.Word */ .highlight .w { color: #f8f8f2 } /* Text.Whitespace */ .highlight .mb { color: #ae81ff } /* Literal.Number.Bin */ .highlight .mf { color: #ae81ff } /* Literal.Number.Float */ .highlight .mh { color: #ae81ff } /* Literal.Number.Hex */ .highlight .mi { color: #ae81ff } /* Literal.Number.Integer */ .highlight .mo { color: #ae81ff } /* Literal.Number.Oct */ .highlight .sa { color: #e6db74 } /* Literal.String.Affix */ .highlight .sb { color: #e6db74 } /* Literal.String.Backtick */ .highlight .sc { color: #e6db74 } /* Literal.String.Char */ .highlight .dl { color: #e6db74 } /* Literal.String.Delimiter */ .highlight .sd { color: #e6db74 } /* Literal.String.Doc */ .highlight .s2 { color: #e6db74 } /* Literal.String.Double */ .highlight .se { color: #ae81ff } /* Literal.String.Escape */ .highlight .sh { color: #e6db74 } /* Literal.String.Heredoc */ .highlight .si { color: #e6db74 } /* Literal.String.Interpol */ .highlight .sx { color: #e6db74 } /* Literal.String.Other */ .highlight .sr { color: #e6db74 } /* Literal.String.Regex */ .highlight .s1 { color: #e6db74 } /* Literal.String.Single */ .highlight .ss { color: #e6db74 } /* Literal.String.Symbol */ .highlight .bp { color: #f8f8f2 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #a6e22e } /* Name.Function.Magic */ .highlight .vc { color: #f8f8f2 } /* Name.Variable.Class */ .highlight .vg { color: #f8f8f2 } /* Name.Variable.Global */ .highlight .vi { color: #f8f8f2 } /* Name.Variable.Instance */ .highlight .vm { color: #f8f8f2 } /* Name.Variable.Magic */ .highlight .il { color: #ae81ff } /* Literal.Number.Integer.Long */ } @media (prefers-color-scheme: light) { .highlight .hll { background-color: #ffffcc } .highlight .c { color: #888888 } /* Comment */ .highlight .err { color: #a61717; background-color: #e3d2d2 } /* Error */ .highlight .k { color: #008800; font-weight: bold } /* Keyword */ .highlight .ch { color: #888888 } /* Comment.Hashbang */ .highlight .cm { color: #888888 } /* Comment.Multiline */ .highlight .cp { color: #cc0000; font-weight: bold } /* Comment.Preproc */ .highlight .cpf { color: #888888 } /* Comment.PreprocFile */ .highlight .c1 { color: #888888 } /* Comment.Single */ .highlight .cs { color: #cc0000; font-weight: bold; background-color: #fff0f0 } /* Comment.Special */ .highlight .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */ .highlight .ge { font-style: italic } /* Generic.Emph */ .highlight .gr { color: #aa0000 } /* Generic.Error */ .highlight .gh { color: #333333 } /* Generic.Heading */ .highlight .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */ .highlight .go { color: #888888 } /* Generic.Output */ .highlight .gp { color: #555555 } /* Generic.Prompt */ .highlight .gs { font-weight: bold } /* Generic.Strong */ .highlight .gu { color: #666666 } /* Generic.Subheading */ .highlight .gt { color: #aa0000 } /* Generic.Traceback */ .highlight .kc { color: #008800; font-weight: bold } /* Keyword.Constant */ .highlight .kd { color: #008800; font-weight: bold } /* Keyword.Declaration */ .highlight .kn { color: #008800; font-weight: bold } /* Keyword.Namespace */ .highlight .kp { color: #008800 } /* Keyword.Pseudo */ .highlight .kr { color: #008800; font-weight: bold } /* Keyword.Reserved */ .highlight .kt { color: #888888; font-weight: bold } /* Keyword.Type */ .highlight .m { color: #0000DD; font-weight: bold } /* Literal.Number */ .highlight .s { color: #dd2200; background-color: #fff0f0 } /* Literal.String */ .highlight .na { color: #336699 } /* Name.Attribute */ .highlight .nb { color: #003388 } /* Name.Builtin */ .highlight .nc { color: #bb0066; font-weight: bold } /* Name.Class */ .highlight .no { color: #003366; font-weight: bold } /* Name.Constant */ .highlight .nd { color: #555555 } /* Name.Decorator */ .highlight .ne { color: #bb0066; font-weight: bold } /* Name.Exception */ .highlight .nf { color: #0066bb; font-weight: bold } /* Name.Function */ .highlight .nl { color: #336699; font-style: italic } /* Name.Label */ .highlight .nn { color: #bb0066; font-weight: bold } /* Name.Namespace */ .highlight .py { color: #336699; font-weight: bold } /* Name.Property */ .highlight .nt { color: #bb0066; font-weight: bold } /* Name.Tag */ .highlight .nv { color: #336699 } /* Name.Variable */ .highlight .ow { color: #008800 } /* Operator.Word */ .highlight .w { color: #bbbbbb } /* Text.Whitespace */ .highlight .mb { color: #0000DD; font-weight: bold } /* Literal.Number.Bin */ .highlight .mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */ .highlight .mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */ .highlight .mi { color: #0000DD; font-weight: bold } /* Literal.Number.Integer */ .highlight .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */ .highlight .sa { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Affix */ .highlight .sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */ .highlight .sc { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Char */ .highlight .dl { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Delimiter */ .highlight .sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */ .highlight .s2 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Double */ .highlight .se { color: #0044dd; background-color: #fff0f0 } /* Literal.String.Escape */ .highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */ .highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */ .highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */ .highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */ .highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */ .highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */ .highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */ }
# Copyright (c) 2017 Intel Corporation. #
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
#      http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
---
- hosts: localhost
  connection: local
  vars:
    scale_out:
      - 1
      - 2
    flow:
      traffic_type: 4
      pkt_size:
         uplink: {64B: 100}
         downlink: {64B: 100}
      count: 10
      rfc2544:
        allowed_drop_rate: 0.0001 - 0.0001
      vnf_config:
        lb_config: 'SW'
        lb_count: 1
        worker_config: '1C/1T'
        worker_threads: 1

    # Environment variables
    gen:
      user: root
      password: ""
      key_filename: /root/.ssh/id_rsa
      pcis:
        uplink:
          - "0000:05:00.0"
          - "0000:05:00.2"
        downlink:
          - "0000:05:00.1"
          - "0000:05:00.3"
      ip:
        mgmt:
          - '1.2.1.6/24'
        uplink:
          - '152.16.100.20/24'
          - '172.16.100.20/24'
        downlink:
          - '152.16.40.20/24'
          - '172.16.40.20/24'
      mac:
        uplink:
          - '00:00:00:9e:00:f8'
          - '00:00:00:9e:00:fa'
        downlink:
          - '00:00:00:9e:00:f9'
          - '00:00:00:9e:00:fb'

    vnf:
      ip: "192.168.100.101/24"
      user: root
      password: ""
      key_filename: /root/.ssh/id_rsa
      pcis:
        uplink:
          - "0000:05:00.0"
          - "0000:05:00.2"
        downlink:
          - "0000:05:00.1"
          - "0000:05:00.3"
      ip:
        mgmt:
          - '1.2.1.6/24'
        uplink:
          - '152.16.100.10/24'
          - '172.16.100.10/24'
        downlink:
          - '152.16.40.10/24'
          - '172.16.40.10/24'
      mac:
        uplink:
          - '00:00:00:9e:00:f8'
          - '00:00:00:9e:00:fa'
        downlink:
          - '00:00:00:9e:00:f9'
          - '00:00:00:9e:00:fb'

  tasks:
    - include: multi_port_baremetal_test_templates.yml
      with_items: "{{ scale_out }}"
-rw-r--r--samples/vnf_samples/nsut/ping/ping_tg_topology.yaml12
-rw-r--r--samples/vnf_samples/nsut/ping/tc_external_ping_heat_context.yaml5
-rw-r--r--samples/vnf_samples/nsut/ping/tc_ping_baremetal_context.yaml10
-rw-r--r--samples/vnf_samples/nsut/ping/tc_ping_heat_context.yaml4
-rw-r--r--samples/vnf_samples/nsut/ping/tc_ping_ovs_dpdk_context.yaml10
-rw-r--r--samples/vnf_samples/nsut/prox/baremetal/throughput/tc_ipv4_1flow_64B_packetsize.yaml4
-rw-r--r--samples/vnf_samples/nsut/prox/ovs-dpdk/http_tests/tc_FileSize-1K_Requests-1M_Concurrency-100.yaml6
-rw-r--r--samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_1rule_1flow_1518B_packetsize.yaml6
-rw-r--r--samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_1rule_1flow_64B_packetsize.yaml6
-rw-r--r--samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_1rule_1flow_IMIX_packetsize.yaml6
-rw-r--r--samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_worstcaserules_1flow_1518B_packetsize.yaml6
-rw-r--r--samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_worstcaserules_1flow_64B_packetsize.yaml6
-rw-r--r--samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_worstcaserules_1flow_IMIX_packetsize.yaml6
-rw-r--r--samples/vnf_samples/nsut/prox/prox-tg-topology-1.yaml20
-rw-r--r--samples/vnf_samples/nsut/prox/prox-tg-topology-2.yaml20
-rw-r--r--samples/vnf_samples/nsut/prox/prox-tg-topology-4.yaml36
-rw-r--r--samples/vnf_samples/nsut/prox/sriov/http_tests/tc_FileSize-1K_Requests-1M_Concurrency-100.yaml6
-rw-r--r--samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_1rule_1flow_1518B_packetsize.yaml6
-rw-r--r--samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_1rule_1flow_64B_packetsize.yaml6
-rw-r--r--samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_1rule_1flow_IMIX_packetsize.yaml6
-rw-r--r--samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_worstcaserules_1flow_1518B_packetsize.yaml6
-rw-r--r--samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_worstcaserules_1flow_64B_packetsize.yaml6
-rw-r--r--samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_worstcaserules_1flow_IMIX_packetsize.yaml6
-rw-r--r--samples/vnf_samples/nsut/prox/tc_prox_baremetal_acl-2.yaml8
-rw-r--r--samples/vnf_samples/nsut/prox/tc_prox_baremetal_acl-4.yaml8
-rw-r--r--samples/vnf_samples/nsut/prox/tc_prox_baremetal_binsearch.yaml8
-rw-r--r--samples/vnf_samples/nsut/prox/tc_prox_baremetal_buffering-1.yaml8
-rw-r--r--samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd-2.yaml8
-rw-r--r--samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd-4.yaml8
-rw-r--r--samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_pktTouch-2.yaml8
-rw-r--r--samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_pktTouch-4.yaml8
-rw-r--r--samples/vnf_samples/nsut/prox/tc_prox_baremetal_l3fwd-2.yaml8
-rw-r--r--samples/vnf_samples/nsut/prox/tc_prox_baremetal_l3fwd-4.yaml8
-rw-r--r--samples/vnf_samples/nsut/prox/tc_prox_baremetal_mpls_tagging-2.yaml8
-rw-r--r--samples/vnf_samples/nsut/prox/tc_prox_baremetal_mpls_tagging-4.yaml8
-rw-r--r--samples/vnf_samples/nsut/prox/tc_prox_baremetal_ramp.yaml8
-rw-r--r--samples/vnf_samples/nsut/prox/tc_prox_heat_context.yaml12
-rw-r--r--samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-2.yaml12
-rw-r--r--samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-4.yaml16
-rw-r--r--samples/vnf_samples/nsut/prox/tc_prox_heat_context_buffering-1.yaml10
-rw-r--r--samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-2.yaml8
-rw-r--r--samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-4.yaml16
-rw-r--r--samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_pktTouch-2.yaml12
-rw-r--r--samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_pktTouch-4.yaml16
-rw-r--r--samples/vnf_samples/nsut/prox/tc_prox_heat_context_l3fwd-2.yaml12
-rw-r--r--samples/vnf_samples/nsut/prox/tc_prox_heat_context_l3fwd-4.yaml16
-rw-r--r--samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-2.yaml12
-rw-r--r--samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-4.yaml16
-rw-r--r--samples/vnf_samples/nsut/udp_replay/tc_baremetal_rfc2544_ipv4_1flow_64B_trex.yaml10
-rw-r--r--samples/vnf_samples/nsut/udp_replay/tc_heat_rfc2544_ipv4_1flow_64B_trex.yaml12
-rw-r--r--samples/vnf_samples/nsut/udp_replay/udp_replay-vnf-topology.yaml20
-rw-r--r--samples/vnf_samples/nsut/vfw/ixia_traffic.cfg4
-rw-r--r--samples/vnf_samples/nsut/vfw/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml6
-rw-r--r--samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml10
-rw-r--r--samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_ixia_scale_up.yaml10
-rw-r--r--samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex.yaml10
-rw-r--r--samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_corelated_traffic.yaml12
-rw-r--r--samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_scale_up.yaml10
-rw-r--r--samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_with_latency_ipv4_1rule_1flow_64B_ixia.yaml10
-rw-r--r--samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_with_latency_ipv4_1rule_1flow_64B_trex.yaml10
-rw-r--r--samples/vnf_samples/nsut/vfw/tc_heat_external_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml14
-rw-r--r--samples/vnf_samples/nsut/vfw/tc_heat_external_rfc2544_ipv4_1rule_1flow_64B_trex.yaml10
-rw-r--r--samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml10
-rw-r--r--samples/vnf_samples/nsut/vfw/vfw-tg-topology-3node.yaml33
-rw-r--r--samples/vnf_samples/nsut/vfw/vfw-tg-topology-4port.yaml8
-rw-r--r--samples/vnf_samples/nsut/vfw/vfw-tg-topology.yaml20
-rw-r--r--samples/vnf_samples/nsut/vfw/vfw_vnf_topology_ixia.yaml20
-rw-r--r--samples/vnf_samples/nsut/vfw/vfw_vnf_topology_ixload.yaml20
-rw-r--r--samples/vnf_samples/nsut/vpe/ixia_traffic.cfg4
-rw-r--r--samples/vnf_samples/nsut/vpe/tc_baremetal_http_ipv4_ixload.yaml10
-rw-r--r--samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_1518B.yaml10
-rw-r--r--samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B.yaml10
-rw-r--r--samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B_ixia.yaml10
-rw-r--r--samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B_trex_corelated_traffic.yaml12
-rw-r--r--samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_IMIX.yaml10
-rw-r--r--samples/vnf_samples/nsut/vpe/vpe_vnf_topology-3node.yaml22
-rw-r--r--samples/vnf_samples/nsut/vpe/vpe_vnf_topology.yaml20
-rw-r--r--samples/vnf_samples/nsut/vpe/vpe_vnf_topology_ixia.yaml20
-rw-r--r--samples/vnf_samples/nsut/vpe/vpe_vnf_topology_ixload.yaml20
-rw-r--r--samples/vnf_samples/traffic_profiles/example.yaml28
-rw-r--r--samples/vnf_samples/traffic_profiles/http_tests/HTTP_1b-requests_65000_concurrency.yaml4
-rw-r--r--samples/vnf_samples/traffic_profiles/ipv4_throughput.yaml48
-rw-r--r--samples/vnf_samples/traffic_profiles/ipv4_throughput_cgnapt.yaml40
-rw-r--r--samples/vnf_samples/traffic_profiles/ipv4_throughput_vpe.yaml72
-rw-r--r--samples/vnf_samples/traffic_profiles/ixia_ipv4_latency.yaml80
-rw-r--r--samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_vpe.yaml64
118 files changed, 812 insertions, 804 deletions
diff --git a/samples/vnf_samples/nsut/2trex/tc_trex_baremetal_context.yaml b/samples/vnf_samples/nsut/2trex/tc_trex_baremetal_context.yaml
index e0ba6d96f..d96236e17 100644
--- a/samples/vnf_samples/nsut/2trex/tc_trex_baremetal_context.yaml
+++ b/samples/vnf_samples/nsut/2trex/tc_trex_baremetal_context.yaml
@@ -23,12 +23,12 @@ scenarios:
nodes: # This section is copied from pod.xml or resolved via Heat
trexgen__1: trafficgen_1.yardstick
- trexvnf__1: vnf.yardstick
+ trexvnf__0: vnf.yardstick
vnf_options:
trexgen__1:
- target_ip: trexvnf__1.xe0.local_ip # TODO: resolve to config vars
- trexvnf__1:
+ target_ip: trexvnf__0.xe0.local_ip # TODO: resolve to config vars
+ trexvnf__0:
target_ip: trexgen__1.xe1.local_ip # TODO: resolve to config vars
runner:
type: Duration
diff --git a/samples/vnf_samples/nsut/2trex/trex_tg_topology.yaml b/samples/vnf_samples/nsut/2trex/trex_tg_topology.yaml
index 1a9b50c84..822cf5eba 100644
--- a/samples/vnf_samples/nsut/2trex/trex_tg_topology.yaml
+++ b/samples/vnf_samples/nsut/2trex/trex_tg_topology.yaml
@@ -20,15 +20,15 @@ nsd:nsd-catalog:
description: trex-tg-topology
constituent-vnfd:
- member-vnf-index: '1'
- vnfd-id-ref: trexgen__1
+ vnfd-id-ref: trexgen__0
VNF model: ../../vnf_descriptors/tg_trex_tpl.yaml #VNF type
- member-vnf-index: '2'
- vnfd-id-ref: trexvnf__1
+ vnfd-id-ref: trexvnf__0
VNF model: ../../vnf_descriptors/tg_trex_tpl.yaml #VNF type
vld:
- - id: private
- name: trexgen__1 to trexvnf__1 link 1
+ - id: uplink
+ name: trexgen__0 to trexvnf__0 link 1
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '1'
@@ -38,8 +38,8 @@ nsd:nsd-catalog:
vnfd-connection-point-ref: xe0
vnfd-id-ref: trexgen
- - id: public
- name: trexvnf__1 to trexgen__1 link 2
+ - id: downlink
+ name: trexvnf__0 to trexgen__0 link 2
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '1'
diff --git a/samples/vnf_samples/nsut/acl/acl-tg-topology-3node.yaml b/samples/vnf_samples/nsut/acl/acl-tg-topology-3node.yaml
index 36cb2e88b..b51f3eb04 100644
--- a/samples/vnf_samples/nsut/acl/acl-tg-topology-3node.yaml
+++ b/samples/vnf_samples/nsut/acl/acl-tg-topology-3node.yaml
@@ -20,43 +20,43 @@ nsd:nsd-catalog:
description: 3tg-topology
constituent-vnfd:
- member-vnf-index: '1'
- vnfd-id-ref: tg__1
+ vnfd-id-ref: tg__0
VNF model: ../../vnf_descriptors/tg_rfc2544_tpl.yaml #VNF type
- member-vnf-index: '2'
- vnfd-id-ref: vnf__1
+ vnfd-id-ref: vnf__0
VNF model: ../../vnf_descriptors/acl_vnf.yaml #VNF type
- member-vnf-index: '3'
- vnfd-id-ref: tg__2
+ vnfd-id-ref: tg__1
VNF model: ../../vnf_descriptors/udp_replay_vnf.yaml #VNF type
vld:
- - id: private_1
- name: tg__1 to vnf__1 link 1
+ - id: uplink_0
+ name: tg__0 to vnf__0 link 1
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe0
- vnfd-id-ref: tg__1
+ vnfd-id-ref: tg__0
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe0
- vnfd-id-ref: vnf__1
- - id: private_2
- name: tg__1 to vnf__1 link 2
+ vnfd-id-ref: vnf__0
+ - id: uplink_1
+ name: tg__0 to vnf__0 link 2
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe1
- vnfd-id-ref: tg__1
+ vnfd-id-ref: tg__0
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe1
- vnfd-id-ref: tg__1
- - id: public_1
- name: vnf__1 to tg__2 link 2
+ vnfd-id-ref: tg__0
+ - id: downlink_0
+ name: vnf__0 to tg__1 link 2
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe1
- vnfd-id-ref: vnf__1
+ vnfd-id-ref: vnf__0
- member-vnf-index-ref: '3'
vnfd-connection-point-ref: xe0
- vnfd-id-ref: tg__2
+ vnfd-id-ref: tg__1
diff --git a/samples/vnf_samples/nsut/acl/acl-tg-topology.yaml b/samples/vnf_samples/nsut/acl/acl-tg-topology.yaml
index 9bc3e8559..00666092f 100644
--- a/samples/vnf_samples/nsut/acl/acl-tg-topology.yaml
+++ b/samples/vnf_samples/nsut/acl/acl-tg-topology.yaml
@@ -20,31 +20,31 @@ nsd:nsd-catalog:
description: 3tg-topology
constituent-vnfd:
- member-vnf-index: '1'
- vnfd-id-ref: tg__1
+ vnfd-id-ref: tg__0
VNF model: ../../vnf_descriptors/tg_rfc2544_tpl.yaml #VNF type
- member-vnf-index: '2'
- vnfd-id-ref: vnf__1
+ vnfd-id-ref: vnf__0
VNF model: ../../vnf_descriptors/acl_vnf.yaml #VNF type
vld:
- - id: private_1
- name: tg__1 to vnf__1 link 1
+ - id: uplink_0
+ name: tg__0 to vnf__0 link 1
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe0
- vnfd-id-ref: tg__1
+ vnfd-id-ref: tg__0
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe0
- vnfd-id-ref: vnf__1
+ vnfd-id-ref: vnf__0
- - id: public_1
- name: vnf__1 to tg__1 link 2
+ - id: downlink_0
+ name: vnf__0 to tg__0 link 2
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe1
- vnfd-id-ref: vnf__1
+ vnfd-id-ref: vnf__0
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe1
- vnfd-id-ref: tg__1
+ vnfd-id-ref: tg__0
diff --git a/samples/vnf_samples/nsut/acl/acl_vnf_topology_ixia.yaml b/samples/vnf_samples/nsut/acl/acl_vnf_topology_ixia.yaml
index 606d557e9..e6932acbd 100644
--- a/samples/vnf_samples/nsut/acl/acl_vnf_topology_ixia.yaml
+++ b/samples/vnf_samples/nsut/acl/acl_vnf_topology_ixia.yaml
@@ -20,31 +20,31 @@ nsd:nsd-catalog:
description: scenario with VACL,L3fwd and VNF
constituent-vnfd:
- member-vnf-index: '1'
- vnfd-id-ref: tg__1
+ vnfd-id-ref: tg__0
VNF model: ../../vnf_descriptors/ixia_rfc2544_tpl.yaml
- member-vnf-index: '2'
- vnfd-id-ref: vnf__1
+ vnfd-id-ref: vnf__0
VNF model: ../../vnf_descriptors/acl_vnf.yaml
vld:
- - id: private_1
- name: tg__1 to vnf__1 link 1
+ - id: uplink_0
+ name: tg__0 to vnf__0 link 1
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe0
- vnfd-id-ref: tg__1 #TREX
+ vnfd-id-ref: tg__0 #TREX
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe0
- vnfd-id-ref: vnf__1 #VNF
+ vnfd-id-ref: vnf__0 #VNF
- - id: public_1
- name: vnf__1 to tg__1 link 2
+ - id: downlink_0
+ name: vnf__0 to tg__0 link 2
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe1
- vnfd-id-ref: vnf__1 #L3fwd
+ vnfd-id-ref: vnf__0 #L3fwd
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe1
- vnfd-id-ref: tg__1 #VACL VNF
+ vnfd-id-ref: tg__0 #VACL VNF
diff --git a/samples/vnf_samples/nsut/acl/acl_vnf_topology_ixload.yaml b/samples/vnf_samples/nsut/acl/acl_vnf_topology_ixload.yaml
index 2fc173aed..97a316625 100644
--- a/samples/vnf_samples/nsut/acl/acl_vnf_topology_ixload.yaml
+++ b/samples/vnf_samples/nsut/acl/acl_vnf_topology_ixload.yaml
@@ -20,31 +20,31 @@ nsd:nsd-catalog:
description: scenario with HTTP and vACL VNF
constituent-vnfd:
- member-vnf-index: '1'
- vnfd-id-ref: tg__1
+ vnfd-id-ref: tg__0
VNF model: ../../vnf_descriptors/tg_ixload.yaml
- member-vnf-index: '2'
- vnfd-id-ref: vnf__1
+ vnfd-id-ref: vnf__0
VNF model: ../../vnf_descriptors/acl_vnf.yaml
vld:
- - id: private_1
- name: tg__1 to vnf__1 link 1
+ - id: uplink_0
+ name: tg__0 to vnf__0 link 1
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe0
- vnfd-id-ref: tg__1 # HTTP Client
+ vnfd-id-ref: tg__0 # HTTP Client
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe0
- vnfd-id-ref: vnf__1 # VNF
+ vnfd-id-ref: vnf__0 # VNF
- - id: public_1
- name: vnf__1 to tg__1 link 2
+ - id: downlink_0
+ name: vnf__0 to tg__0 link 2
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe1
- vnfd-id-ref: vnf__1 # HTTP Server
+ vnfd-id-ref: vnf__0 # HTTP Server
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe1
- vnfd-id-ref: tg__1 # VACL VNF
+ vnfd-id-ref: tg__0 # VACL VNF
diff --git a/samples/vnf_samples/nsut/acl/ixia_traffic.cfg b/samples/vnf_samples/nsut/acl/ixia_traffic.cfg
index f749865c5..3f7e33471 100644
--- a/samples/vnf_samples/nsut/acl/ixia_traffic.cfg
+++ b/samples/vnf_samples/nsut/acl/ixia_traffic.cfg
@@ -1,5 +1,5 @@
{
- "private_1": {
+ "uplink_0": {
"id": 1,
"bidir": "False",
"duration": 60,
@@ -23,7 +23,7 @@
},
"traffic_type": "continuous"
},
- "public_1": {
+ "downlink_0": {
"id": 2,
"bidir": "False",
"duration": 60,
diff --git a/samples/vnf_samples/nsut/acl/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml b/samples/vnf_samples/nsut/acl/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml
index 1220cae73..31ee32b7b 100644
--- a/samples/vnf_samples/nsut/acl/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml
@@ -19,18 +19,18 @@ scenarios:
traffic_profile: "../../traffic_profiles/http_tests/HTTP_1b-requests_65000_concurrency.yaml"
topology: acl_vnf_topology_ixload.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
framesize:
private: {64B: 100}
public: {64B: 100}
flow:
- src_ip: [{'tg__1': 'xe0'}]
- dst_ip: [{'tg__1': 'xe1'}]
+ src_ip: [{'tg__0': 'xe0'}]
+ dst_ip: [{'tg__0': 'xe1'}]
count: 1
traffic_type: 4
- vnf__1:
+ vnf__0:
rules: acl_1rule.yaml
vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
nfvi_enable: True
diff --git a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml
index 7359c6257..2da7d6675 100644
--- a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml
@@ -19,20 +19,20 @@ scenarios:
traffic_profile: "../../traffic_profiles/ixia_ipv4_latency.yaml"
topology: acl_vnf_topology_ixia.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
framesize:
private: {64B: 100}
public: {64B: 100}
flow:
- src_ip: [{'tg__1': 'xe0'}]
- dst_ip: [{'tg__1': 'xe1'}]
+ src_ip: [{'tg__0': 'xe0'}]
+ dst_ip: [{'tg__0': 'xe1'}]
count: 1
traffic_type: 4
rfc2544:
allowed_drop_rate: 0.0001 - 0.0001
- vnf__1:
+ vnf__0:
rules: acl_1rule.yaml
vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
nfvi_enable: True
diff --git a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_packetsize.yaml b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_packetsize.yaml
index 2503add5e..088ef5474 100644
--- a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_packetsize.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_packetsize.yaml
@@ -19,20 +19,20 @@ scenarios:
traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
topology: acl-tg-topology.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
framesize:
private: {64B: 100}
public: {64B: 100}
flow:
- src_ip: [{'tg__1': 'xe0'}]
- dst_ip: [{'tg__1': 'xe1'}]
+ src_ip: [{'tg__0': 'xe0'}]
+ dst_ip: [{'tg__0': 'xe1'}]
count: 1
traffic_type: 4
rfc2544:
allowed_drop_rate: 0.0001 - 0.0001
- vnf__1:
+ vnf__0:
rules: acl_1rule.yaml
vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
nfvi_enable: True
diff --git a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
index eb0dcb63d..3e1345a17 100644
--- a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
@@ -19,20 +19,20 @@ scenarios:
traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
topology: acl-tg-topology.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
framesize:
private: {64B: 100}
public: {64B: 100}
flow:
- src_ip: [{'tg__1': 'xe0'}]
- dst_ip: [{'tg__1': 'xe1'}]
+ src_ip: [{'tg__0': 'xe0'}]
+ dst_ip: [{'tg__0': 'xe1'}]
count: 1
traffic_type: 4
rfc2544:
allowed_drop_rate: 0.0001 - 0.0001
- vnf__1:
+ vnf__0:
rules: acl_1rule.yaml
vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
nfvi_enable: True
diff --git a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_corelated_traffic.yaml b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_corelated_traffic.yaml
index 1261aa0c8..9753812ac 100644
--- a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_corelated_traffic.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_corelated_traffic.yaml
@@ -19,22 +19,22 @@ scenarios:
traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
topology: acl-tg-topology-3node.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
- tg__2: trafficgen_2.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
+ tg__1: trafficgen_2.yardstick
options:
framesize:
private: {64B: 100}
public: {64B: 100}
flow:
- src_ip: [{'tg__1': 'xe0'}]
+ src_ip: [{'tg__0': 'xe0'}]
dst_ip: [{'tg__1': 'xe1'}]
count: 1
traffic_type: 4
rfc2544:
allowed_drop_rate: 0.0001 - 0.0001
correlated_traffic: true
- vnf__1:
+ vnf__0:
rules: acl_1rule.yaml
vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
nfvi_enable: True
diff --git a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_scale_up.yaml b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_scale_up.yaml
index ce9ada745..5bd0f175b 100644
--- a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_scale_up.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_scale_up.yaml
@@ -20,20 +20,20 @@ scenarios:
traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
topology: acl-tg-topology.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
framesize:
private: {64B: 100}
public: {64B: 100}
flow:
- src_ip: [{'tg__1': 'xe0'}]
- dst_ip: [{'tg__1': 'xe1'}]
+ src_ip: [{'tg__0': 'xe0'}]
+ dst_ip: [{'tg__0': 'xe1'}]
count: 1
traffic_type: 4
rfc2544:
allowed_drop_rate: 0.0001 - 0.0001
- vnf__1:
+ vnf__0:
rules: acl_1rule.yaml
vnf_config: {lb_config: 'HW', lb_count: 1, worker_config: '1C/1T', worker_threads: {{worker_thread}}}
nfvi_enable: True
diff --git a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_worstcaserules_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_worstcaserules_1flow_64B_trex.yaml
index eb0dcb63d..3e1345a17 100644
--- a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_worstcaserules_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_worstcaserules_1flow_64B_trex.yaml
@@ -19,20 +19,20 @@ scenarios:
traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
topology: acl-tg-topology.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
framesize:
private: {64B: 100}
public: {64B: 100}
flow:
- src_ip: [{'tg__1': 'xe0'}]
- dst_ip: [{'tg__1': 'xe1'}]
+ src_ip: [{'tg__0': 'xe0'}]
+ dst_ip: [{'tg__0': 'xe1'}]
count: 1
traffic_type: 4
rfc2544:
allowed_drop_rate: 0.0001 - 0.0001
- vnf__1:
+ vnf__0:
rules: acl_1rule.yaml
vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
nfvi_enable: True
diff --git a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_with_latency_ipv4_1rule_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_with_latency_ipv4_1rule_1flow_64B_trex.yaml
index e06ab8f2d..1cf37ca26 100644
--- a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_with_latency_ipv4_1rule_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_with_latency_ipv4_1rule_1flow_64B_trex.yaml
@@ -19,20 +19,20 @@ scenarios:
traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
topology: acl-tg-topology.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
framesize:
private: {64B: 100}
public: {64B: 100}
flow:
- src_ip: [{'tg__1': 'xe0'}]
- dst_ip: [{'tg__1': 'xe1'}]
+ src_ip: [{'tg__0': 'xe0'}]
+ dst_ip: [{'tg__0': 'xe1'}]
count: 1
traffic_type: 4
rfc2544:
allowed_drop_rate: 0.0001 - 0.0001
- vnf__1:
+ vnf__0:
rules: acl_1rule.yaml
vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
nfvi_enable: True
diff --git a/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
index f39d1be9e..c335c263a 100644
--- a/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
@@ -19,20 +19,20 @@ scenarios:
traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
topology: acl-tg-topology.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
framesize:
private: {64B: 100}
public: {64B: 100}
flow:
- src_ip: [{'tg__1': 'xe0'}]
- dst_ip: [{'tg__1': 'xe1'}]
+ src_ip: [{'tg__0': 'xe0'}]
+ dst_ip: [{'tg__0': 'xe1'}]
count: 1
traffic_type: 4
rfc2544:
allowed_drop_rate: 0.0001 - 0.0001
- vnf__1:
+ vnf__0:
rules: acl_1rule.yaml
vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
runner:
diff --git a/samples/vnf_samples/nsut/acl/tc_heat_trex_external_rfc2544_ipv4_1rule_1flow_64B_packetsize.yaml b/samples/vnf_samples/nsut/acl/tc_heat_trex_external_rfc2544_ipv4_1rule_1flow_64B_packetsize.yaml
index 982c0371d..f0869ecf8 100644
--- a/samples/vnf_samples/nsut/acl/tc_heat_trex_external_rfc2544_ipv4_1rule_1flow_64B_packetsize.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_heat_trex_external_rfc2544_ipv4_1rule_1flow_64B_packetsize.yaml
@@ -19,20 +19,20 @@ scenarios:
traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
topology: acl-tg-topology.yaml
nodes:
- tg__1: trafficgen_1.baremetal
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.baremetal
+ vnf__0: vnf.yardstick
options:
framesize:
private: {64B: 100}
public: {64B: 100}
flow:
- src_ip: [{'tg__1': 'xe0'}]
- dst_ip: [{'tg__1': 'xe1'}]
+ src_ip: [{'tg__0': 'xe0'}]
+ dst_ip: [{'tg__0': 'xe1'}]
count: 1
traffic_type: 4
rfc2544:
allowed_drop_rate: 0.0001 - 0.0001
- vnf__1:
+ vnf__0:
rules: acl_1rule.yaml
vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
nfvi_enable: True
diff --git a/samples/vnf_samples/nsut/cgnapt/cgnapt-vnf-topology-3node.yaml b/samples/vnf_samples/nsut/cgnapt/cgnapt-vnf-topology-3node.yaml
index 7b681b52a..e4c0fc9ee 100644
--- a/samples/vnf_samples/nsut/cgnapt/cgnapt-vnf-topology-3node.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/cgnapt-vnf-topology-3node.yaml
@@ -20,43 +20,43 @@ nsd:nsd-catalog:
description: 3tg-topology
constituent-vnfd:
- member-vnf-index: '1'
- vnfd-id-ref: tg__1
+ vnfd-id-ref: tg__0
VNF model: ../../vnf_descriptors/tg_rfc2544_tpl.yaml #VNF type
- member-vnf-index: '2'
- vnfd-id-ref: vnf__1
+ vnfd-id-ref: vnf__0
VNF model: ../../vnf_descriptors/cgnapt_vnf.yaml #VNF type
- member-vnf-index: '3'
- vnfd-id-ref: tg__2
+ vnfd-id-ref: tg__1
VNF model: ../../vnf_descriptors/udp_replay_vnf.yaml #VNF type
vld:
- - id: private_1
- name: tg__1 to vnf__1 link 1
+ - id: uplink_0
+ name: tg__0 to vnf__0 link 1
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe0
- vnfd-id-ref: tg__1
+ vnfd-id-ref: tg__0
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe0
- vnfd-id-ref: vnf__1
- - id: private_2
- name: tg__1 to vnf__1 link 2
+ vnfd-id-ref: vnf__0
+ - id: uplink_1
+ name: tg__0 to vnf__0 link 2
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe1
- vnfd-id-ref: tg__1
+ vnfd-id-ref: tg__0
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe1
- vnfd-id-ref: tg__1
- - id: public_1
- name: vnf__1 to tg__2 link 2
+ vnfd-id-ref: tg__0
+ - id: downlink_0
+ name: vnf__0 to tg__1 link 2
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe1
- vnfd-id-ref: vnf__1
+ vnfd-id-ref: vnf__0
- member-vnf-index-ref: '3'
vnfd-connection-point-ref: xe0
- vnfd-id-ref: tg__2
+ vnfd-id-ref: tg__1
diff --git a/samples/vnf_samples/nsut/cgnapt/cgnapt-vnf-topology.yaml b/samples/vnf_samples/nsut/cgnapt/cgnapt-vnf-topology.yaml
index e668c2eb9..d67f38a4f 100644
--- a/samples/vnf_samples/nsut/cgnapt/cgnapt-vnf-topology.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/cgnapt-vnf-topology.yaml
@@ -20,31 +20,31 @@ nsd:nsd-catalog:
description: 3tg-topology
constituent-vnfd:
- member-vnf-index: '1'
- vnfd-id-ref: tg__1
+ vnfd-id-ref: tg__0
VNF model: ../../vnf_descriptors/tg_rfc2544_tpl.yaml #VNF type
- member-vnf-index: '2'
- vnfd-id-ref: vnf__1
+ vnfd-id-ref: vnf__0
VNF model: ../../vnf_descriptors/cgnapt_vnf.yaml #VNF type
vld:
- - id: private_1
- name: tg__1 to vnf__1 link 1
+ - id: uplink_0
+ name: tg__0 to vnf__0 link 1
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe0
- vnfd-id-ref: tg__1
+ vnfd-id-ref: tg__0
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe0
- vnfd-id-ref: vnf__1
+ vnfd-id-ref: vnf__0
- - id: public_1
- name: vnf__1 to tg__1 link 2
+ - id: downlink_0
+ name: vnf__0 to tg__0 link 2
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe1
- vnfd-id-ref: vnf__1
+ vnfd-id-ref: vnf__0
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe1
- vnfd-id-ref: tg__1
+ vnfd-id-ref: tg__0
diff --git a/samples/vnf_samples/nsut/cgnapt/cgnapt_vnf_topology_ixia.yaml b/samples/vnf_samples/nsut/cgnapt/cgnapt_vnf_topology_ixia.yaml
index a13a64fd5..fbc9ab95c 100644
--- a/samples/vnf_samples/nsut/cgnapt/cgnapt_vnf_topology_ixia.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/cgnapt_vnf_topology_ixia.yaml
@@ -20,31 +20,31 @@ nsd:nsd-catalog:
description: scenario with vCGNAPT VNF
constituent-vnfd:
- member-vnf-index: '1'
- vnfd-id-ref: tg__1
+ vnfd-id-ref: tg__0
VNF model: ../../vnf_descriptors/ixia_rfc2544_tpl.yaml
- member-vnf-index: '2'
- vnfd-id-ref: vnf__1
+ vnfd-id-ref: vnf__0
VNF model: ../../vnf_descriptors/cgnapt_vnf.yaml
vld:
- - id: private_1
- name: tg__1 to vnf__1 link 1
+ - id: uplink_0
+ name: tg__0 to vnf__0 link 1
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe0
- vnfd-id-ref: tg__1
+ vnfd-id-ref: tg__0
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe0
- vnfd-id-ref: vnf__1
+ vnfd-id-ref: vnf__0
- - id: public_1
- name: vnf__1 to tg__1 link 2
+ - id: downlink_0
+ name: vnf__0 to tg__0 link 2
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe1
- vnfd-id-ref: vnf__1
+ vnfd-id-ref: vnf__0
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe1
- vnfd-id-ref: tg__1
+ vnfd-id-ref: tg__0
diff --git a/samples/vnf_samples/nsut/cgnapt/cgnapt_vnf_topology_ixload.yaml b/samples/vnf_samples/nsut/cgnapt/cgnapt_vnf_topology_ixload.yaml
index b4feaf03d..71535dfb7 100644
--- a/samples/vnf_samples/nsut/cgnapt/cgnapt_vnf_topology_ixload.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/cgnapt_vnf_topology_ixload.yaml
@@ -20,31 +20,31 @@ nsd:nsd-catalog:
description: scenario with HTTP and vCGNAPT VNF
constituent-vnfd:
- member-vnf-index: '1'
- vnfd-id-ref: tg__1
+ vnfd-id-ref: tg__0
VNF model: ../../vnf_descriptors/tg_ixload.yaml
- member-vnf-index: '2'
- vnfd-id-ref: vnf__1
+ vnfd-id-ref: vnf__0
VNF model: ../../vnf_descriptors/cgnapt_vnf.yaml
vld:
- - id: private_1
- name: tg__1 to vnf__1 link 1
+ - id: uplink_0
+ name: tg__0 to vnf__0 link 1
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe0
- vnfd-id-ref: tg__1 # HTTP Client
+ vnfd-id-ref: tg__0 # HTTP Client
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe0
- vnfd-id-ref: vnf__1 # VNF
+ vnfd-id-ref: vnf__0 # VNF
- - id: public_1
- name: vnf__1 to tg__1 link 2
+ - id: downlink_0
+ name: vnf__0 to tg__0 link 2
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe1
- vnfd-id-ref: vnf__1 # HTTP Server
+ vnfd-id-ref: vnf__0 # HTTP Server
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe1
- vnfd-id-ref: tg__1 # VCGNAPT VNF
+ vnfd-id-ref: tg__0 # VCGNAPT VNF
diff --git a/samples/vnf_samples/nsut/cgnapt/ixia_traffic.cfg b/samples/vnf_samples/nsut/cgnapt/ixia_traffic.cfg
index f749865c5..3f7e33471 100644
--- a/samples/vnf_samples/nsut/cgnapt/ixia_traffic.cfg
+++ b/samples/vnf_samples/nsut/cgnapt/ixia_traffic.cfg
@@ -1,5 +1,5 @@
{
- "private_1": {
+ "uplink_0": {
"id": 1,
"bidir": "False",
"duration": 60,
@@ -23,7 +23,7 @@
},
"traffic_type": "continuous"
},
- "public_1": {
+ "downlink_0": {
"id": 2,
"bidir": "False",
"duration": 60,
diff --git a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml
index 6d769d4f4..d5fda5804 100644
--- a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml
@@ -19,8 +19,8 @@ scenarios:
traffic_profile: "../../traffic_profiles/http_tests/HTTP_1b-requests_65000_concurrency.yaml"
topology: cgnapt_vnf_topology_ixload.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
framesize:
private: {64B: 100}
@@ -28,7 +28,7 @@ scenarios:
traffic_type: 4
rfc2544:
allowed_drop_rate: 0.0001 - 0.0001
- vnf__1:
+ vnf__0:
vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
nfvi_enable: True
runner:
diff --git a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_ixia.yaml b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_ixia.yaml
index 6160ca090..7d6203c0c 100644
--- a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_ixia.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_ixia.yaml
@@ -19,21 +19,21 @@ scenarios:
traffic_profile: "../../traffic_profiles/ixia_ipv4_latency.yaml"
topology: cgnapt_vnf_topology_ixia.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
framesize:
private: {64B: 100}
public: {64B: 100}
flow:
- src_ip: [{'tg__1': 'xe0'}]
- dst_ip: [{'tg__1': 'xe1'}]
+ src_ip: [{'tg__0': 'xe0'}]
+ dst_ip: [{'tg__0': 'xe1'}]
publicip: ["152.16.40.10"]
count: 1
traffic_type: 4
rfc2544:
allowed_drop_rate: 0.0001 - 0.0001
- vnf__1:
+ vnf__0:
vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
runner:
type: Iteration
diff --git a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_ixia_scale_up.yaml b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_ixia_scale_up.yaml
index 1dd2a6e91..cd74655d5 100644
--- a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_ixia_scale_up.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_ixia_scale_up.yaml
@@ -20,21 +20,21 @@ scenarios:
traffic_profile: "../../traffic_profiles/ixia_ipv4_latency_cgnapt.yaml"
topology: cgnapt_vnf_topology_ixia.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
framesize:
private: {64B: 100}
public: {64B: 100}
flow:
- src_ip: [{'tg__1': 'xe0'}]
- dst_ip: [{'tg__1': 'xe1'}]
+ src_ip: [{'tg__0': 'xe0'}]
+ dst_ip: [{'tg__0': 'xe1'}]
publicip: ["152.16.40.10"]
count: 1000
traffic_type: 4
rfc2544:
allowed_drop_rate: 0.0001 - 0.0001
- vnf__1:
+ vnf__0:
vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: {{worker_thread}}}
nfvi_enable: True
runner:
diff --git a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_trex.yaml
index f93176dde..3390cf022 100644
--- a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_trex.yaml
@@ -19,21 +19,21 @@ scenarios:
traffic_profile: ../../traffic_profiles/ipv4_throughput_cgnapt.yaml
topology: cgnapt-vnf-topology.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
framesize:
private: {64B: 100}
public: {64B: 100}
flow:
- src_ip: [{'tg__1': 'xe0'}]
- dst_ip: [{'tg__1': 'xe1'}]
+ src_ip: [{'tg__0': 'xe0'}]
+ dst_ip: [{'tg__0': 'xe1'}]
publicip: ["152.16.40.10"]
count: 1
traffic_type: 4
rfc2544:
allowed_drop_rate: 0.0001 - 0.0001
- vnf__1:
+ vnf__0:
vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
nfvi_enable: True
runner:
diff --git a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_trex_corelated_traffic.yaml b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_trex_corelated_traffic.yaml
index f110ab233..424422dd2 100644
--- a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_trex_corelated_traffic.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_trex_corelated_traffic.yaml
@@ -19,22 +19,22 @@ scenarios:
traffic_profile: ../../traffic_profiles/ipv4_throughput_cgnapt.yaml
topology: cgnapt-vnf-topology-3node.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
- tg__2: trafficgen_2.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
+ tg__1: trafficgen_2.yardstick
options:
framesize:
private: {64B: 100}
public: {64B: 100}
flow:
- src_ip: [{'tg__1': 'xe0'}]
- dst_ip: [{'tg__2': 'xe0'}]
+ src_ip: [{'tg__0': 'xe0'}]
+ dst_ip: [{'tg__1': 'xe0'}]
count: 1
traffic_type: 4
rfc2544:
allowed_drop_rate: 0.0001 - 0.0001
correlated_traffic: true
- vnf__1:
+ vnf__0:
vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
napt: 'dynamic'
nfvi_enable: True
diff --git a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_trex_scale_up.yaml b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_trex_scale_up.yaml
index dcc6c502b..3736715ac 100644
--- a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_trex_scale_up.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_trex_scale_up.yaml
@@ -20,21 +20,21 @@ scenarios:
traffic_profile: ../../traffic_profiles/ipv4_throughput_cgnapt.yaml
topology: cgnapt-vnf-topology.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
framesize:
private: {64B: 100}
public: {64B: 100}
flow:
- src_ip: [{'tg__1': 'xe0'}]
- dst_ip: [{'tg__1': 'xe1'}]
+ src_ip: [{'tg__0': 'xe0'}]
+ dst_ip: [{'tg__0': 'xe1'}]
publicip: ["152.16.40.10"]
count: 1
traffic_type: 4
rfc2544:
allowed_drop_rate: 0.0001 - 0.0001
- vnf__1:
+ vnf__0:
vnf_config: {lb_config: 'HW', lb_count: 1, worker_config: '1C/1T', worker_threads: {{worker_thread}}}
nfvi_enable: True
runner:
diff --git a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_with_latency_ipv4_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_with_latency_ipv4_1flow_64B_trex.yaml
index f55278523..0fbd402ac 100644
--- a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_with_latency_ipv4_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_with_latency_ipv4_1flow_64B_trex.yaml
@@ -19,22 +19,22 @@ scenarios:
traffic_profile: ../../traffic_profiles/ipv4_throughput_cgnapt.yaml
topology: cgnapt-vnf-topology.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
framesize:
private: {64B: 100}
public: {64B: 100}
flow:
- src_ip: [{'tg__1': 'xe0'}]
- dst_ip: [{'tg__1': 'xe1'}]
+ src_ip: [{'tg__0': 'xe0'}]
+ dst_ip: [{'tg__0': 'xe1'}]
publicip: ["152.16.40.10"]
count: 1
traffic_type: 4
rfc2544:
allowed_drop_rate: 0.0001 - 0.0001
latency: true
- vnf__1:
+ vnf__0:
vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
nfvi_enable: True
runner:
diff --git a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_with_latency_ipv4_1flow_dynamic_cgnapt_ixia.yaml b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_with_latency_ipv4_1flow_dynamic_cgnapt_ixia.yaml
index 55292a371..e400b1750 100644
--- a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_with_latency_ipv4_1flow_dynamic_cgnapt_ixia.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_with_latency_ipv4_1flow_dynamic_cgnapt_ixia.yaml
@@ -19,16 +19,16 @@ scenarios:
traffic_profile: "../../traffic_profiles/ixia_ipv4_latency.yaml"
topology: cgnapt-vnf-topology-ixia-3node.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
- tg__2: trafficgen_2.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
+ tg__1: trafficgen_2.yardstick
options:
framesize:
private: {64B: 100}
public: {64B: 100}
flow:
- src_ip: [{'tg__1': 'xe0'}]
- dst_ip: [{'tg__2': 'xe0'}]
+ src_ip: [{'tg__0': 'xe0'}]
+ dst_ip: [{'tg__1': 'xe0'}]
count: 1
traffic_type: 4
rfc2544:
@@ -36,7 +36,7 @@ scenarios:
correlated_traffic: true
latency: true
fec_port_mode: '10G'
- vnf__1:
+ vnf__0:
vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
napt: 'dynamic'
nfvi_enable: True
diff --git a/samples/vnf_samples/nsut/cgnapt/tc_heat_external_rfc2544_ipv4_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/cgnapt/tc_heat_external_rfc2544_ipv4_1flow_64B_trex.yaml
index c62e89f40..b3061a385 100644
--- a/samples/vnf_samples/nsut/cgnapt/tc_heat_external_rfc2544_ipv4_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_heat_external_rfc2544_ipv4_1flow_64B_trex.yaml
@@ -19,20 +19,20 @@ scenarios:
traffic_profile: ../../traffic_profiles/ipv4_throughput_cgnapt.yaml
topology: cgnapt-vnf-topology.yaml
nodes:
- tg__1: trafficgen_1.baremetal
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.baremetal
+ vnf__0: vnf.yardstick
options:
framesize:
private: {64B: 100}
public: {64B: 100}
flow:
- src_ip: [{'tg__1': 'xe0'}]
- dst_ip: [{'tg__1': 'xe1'}]
+ src_ip: [{'tg__0': 'xe0'}]
+ dst_ip: [{'tg__0': 'xe1'}]
count: 1
traffic_type: 4
rfc2544:
allowed_drop_rate: 0.0001 - 0.0001
- vnf__1:
+ vnf__0:
vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
runner:
type: Iteration
diff --git a/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex.yaml
index 8e8424891..50398b15e 100644
--- a/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex.yaml
@@ -19,20 +19,20 @@ scenarios:
traffic_profile: ../../traffic_profiles/ipv4_throughput_cgnapt.yaml
topology: cgnapt-vnf-topology.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
framesize:
private: {64B: 100}
public: {64B: 100}
flow:
- src_ip: [{'tg__1': 'xe0'}]
- dst_ip: [{'tg__1': 'xe1'}]
+ src_ip: [{'tg__0': 'xe0'}]
+ dst_ip: [{'tg__0': 'xe1'}]
count: 1
traffic_type: 4
rfc2544:
allowed_drop_rate: 0.0001 - 0.0001
- vnf__1:
+ vnf__0:
vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
runner:
type: Iteration
diff --git a/samples/vnf_samples/nsut/ping/ping_tg_topology.yaml b/samples/vnf_samples/nsut/ping/ping_tg_topology.yaml
index b2b852a79..244d0b6d6 100644
--- a/samples/vnf_samples/nsut/ping/ping_tg_topology.yaml
+++ b/samples/vnf_samples/nsut/ping/ping_tg_topology.yaml
@@ -20,15 +20,15 @@ nsd:nsd-catalog:
description: ping-tg-topology
constituent-vnfd:
- member-vnf-index: '1'
- vnfd-id-ref: tg__1
+ vnfd-id-ref: tg__0
VNF model: ../../vnf_descriptors/tg_ping_tpl.yaml #VNF type
- member-vnf-index: '2'
- vnfd-id-ref: vnf__1
+ vnfd-id-ref: vnf__0
VNF model: ../../vnf_descriptors/tg_ping_tpl.yaml #VNF type
vld:
- - id: private
- name: tg__1 to vnf__1 link 1
+ - id: uplink
+ name: tg__0 to vnf__0 link 1
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '1'
@@ -38,8 +38,8 @@ nsd:nsd-catalog:
vnfd-connection-point-ref: xe0
vnfd-id-ref: trexgen
- - id: public
- name: vnf__1 to tg__1 link 2
+ - id: downlink
+ name: vnf__0 to tg__0 link 2
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '1'
diff --git a/samples/vnf_samples/nsut/ping/tc_external_ping_heat_context.yaml b/samples/vnf_samples/nsut/ping/tc_external_ping_heat_context.yaml
index c5a52f27e..6e3dd3280 100644
--- a/samples/vnf_samples/nsut/ping/tc_external_ping_heat_context.yaml
+++ b/samples/vnf_samples/nsut/ping/tc_external_ping_heat_context.yaml
@@ -22,8 +22,8 @@ scenarios:
topology: ping_tg_topology.yaml
nodes:
- tg__1: trafficgen_1.baremetal
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.baremetal
+ vnf__0: vnf.yardstick
runner:
type: Duration
@@ -50,7 +50,6 @@ contexts:
external_network: "yardstick-public"
xe0:
cidr: '10.0.2.0/24'
-
xe1:
cidr: '10.0.3.0/24'
diff --git a/samples/vnf_samples/nsut/ping/tc_ping_baremetal_context.yaml b/samples/vnf_samples/nsut/ping/tc_ping_baremetal_context.yaml
index 5f2c55b81..63f252484 100644
--- a/samples/vnf_samples/nsut/ping/tc_ping_baremetal_context.yaml
+++ b/samples/vnf_samples/nsut/ping/tc_ping_baremetal_context.yaml
@@ -22,13 +22,13 @@ scenarios:
topology: ping_tg_topology.yaml # TODO: look in relative path where the tc.yaml is found
nodes: # This section is copied from pod.xml or resolved via Heat
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
vnf_options:
- tg__1:
- target_ip: pingvnf__1.xe0.local_ip # TODO: resolve to config vars
- vnf__1:
+ tg__0:
+ target_ip: pingvnf__0.xe0.local_ip # TODO: resolve to config vars
+ vnf__0:
target_ip: pinggen__1.xe1.local_ip # TODO: resolve to config vars
runner:
type: Duration
diff --git a/samples/vnf_samples/nsut/ping/tc_ping_heat_context.yaml b/samples/vnf_samples/nsut/ping/tc_ping_heat_context.yaml
index e6bf44311..a3a11f670 100644
--- a/samples/vnf_samples/nsut/ping/tc_ping_heat_context.yaml
+++ b/samples/vnf_samples/nsut/ping/tc_ping_heat_context.yaml
@@ -22,8 +22,8 @@ scenarios:
topology: ping_tg_topology.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
runner:
type: Duration
diff --git a/samples/vnf_samples/nsut/ping/tc_ping_ovs_dpdk_context.yaml b/samples/vnf_samples/nsut/ping/tc_ping_ovs_dpdk_context.yaml
index 7654b0f96..5733f0df8 100644
--- a/samples/vnf_samples/nsut/ping/tc_ping_ovs_dpdk_context.yaml
+++ b/samples/vnf_samples/nsut/ping/tc_ping_ovs_dpdk_context.yaml
@@ -22,13 +22,13 @@ scenarios:
topology: ping_tg_topology.yaml # TODO: look in relative path where the tc.yaml is found
nodes: # This section is copied from pod.xml or resolved via Heat
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
vnf_options:
- tg__1:
- target_ip: pingvnf__1.xe0.local_ip # TODO: resolve to config vars
- vnf__1:
+ tg__0:
+ target_ip: pingvnf__0.xe0.local_ip # TODO: resolve to config vars
+ vnf__0:
target_ip: pinggen__1.xe1.local_ip # TODO: resolve to config vars
runner:
type: Duration
diff --git a/samples/vnf_samples/nsut/prox/baremetal/throughput/tc_ipv4_1flow_64B_packetsize.yaml b/samples/vnf_samples/nsut/prox/baremetal/throughput/tc_ipv4_1flow_64B_packetsize.yaml
index e8ad24443..1fe2ed943 100644
--- a/samples/vnf_samples/nsut/prox/baremetal/throughput/tc_ipv4_1flow_64B_packetsize.yaml
+++ b/samples/vnf_samples/nsut/prox/baremetal/throughput/tc_ipv4_1flow_64B_packetsize.yaml
@@ -19,8 +19,8 @@ scenarios:
traffic_profile: "../../../../traffic_profiles/ipv4_throughput.yaml"
topology: "../../prox-tg-topology.yaml"
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
tc_options:
rfc2544:
allowed_drop_rate: 0.8 - 1
diff --git a/samples/vnf_samples/nsut/prox/ovs-dpdk/http_tests/tc_FileSize-1K_Requests-1M_Concurrency-100.yaml b/samples/vnf_samples/nsut/prox/ovs-dpdk/http_tests/tc_FileSize-1K_Requests-1M_Concurrency-100.yaml
index 4695f0bfe..73fea8122 100644
--- a/samples/vnf_samples/nsut/prox/ovs-dpdk/http_tests/tc_FileSize-1K_Requests-1M_Concurrency-100.yaml
+++ b/samples/vnf_samples/nsut/prox/ovs-dpdk/http_tests/tc_FileSize-1K_Requests-1M_Concurrency-100.yaml
@@ -22,9 +22,9 @@ scenarios:
topology: ../../acl-tg-topology-http.yaml
nodes:
- vnf__1: vnf.yardstick
- tg__1: trafficgen_1.yardstick
- tg__2: trafficgen_2.yardstick
+ vnf__0: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ tg__1: trafficgen_2.yardstick
options:
acl:
diff --git a/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_1rule_1flow_1518B_packetsize.yaml b/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_1rule_1flow_1518B_packetsize.yaml
index f08289de9..0ca0005b2 100644
--- a/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_1rule_1flow_1518B_packetsize.yaml
+++ b/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_1rule_1flow_1518B_packetsize.yaml
@@ -19,9 +19,9 @@ scenarios:
traffic_profile: "../../../../traffic_profiles/ipv4_throughput.yaml"
topology: ../../acl-tg-topology.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
- tg__2: trafficgen_2.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
+ tg__1: trafficgen_2.yardstick
tc_options:
rfc2544:
allowed_drop_rate: 0.8 - 1
diff --git a/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_1rule_1flow_64B_packetsize.yaml b/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_1rule_1flow_64B_packetsize.yaml
index 92f367855..d51b42f84 100644
--- a/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_1rule_1flow_64B_packetsize.yaml
+++ b/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_1rule_1flow_64B_packetsize.yaml
@@ -19,9 +19,9 @@ scenarios:
traffic_profile: "../../../../traffic_profiles/ipv4_throughput.yaml"
topology: ../../acl-tg-topology.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
- tg__2: trafficgen_2.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
+ tg__1: trafficgen_2.yardstick
tc_options:
rfc2544:
allowed_drop_rate: 0.8 - 1
diff --git a/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_1rule_1flow_IMIX_packetsize.yaml b/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_1rule_1flow_IMIX_packetsize.yaml
index bc6ea4d2b..37da8e6c7 100644
--- a/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_1rule_1flow_IMIX_packetsize.yaml
+++ b/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_1rule_1flow_IMIX_packetsize.yaml
@@ -19,9 +19,9 @@ scenarios:
traffic_profile: "../../../../traffic_profiles/ipv4_throughput.yaml"
topology: ../../acl-tg-topology.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
- tg__2: trafficgen_2.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
+ tg__1: trafficgen_2.yardstick
tc_options:
rfc2544:
allowed_drop_rate: 0.8 - 1
diff --git a/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_worstcaserules_1flow_1518B_packetsize.yaml b/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_worstcaserules_1flow_1518B_packetsize.yaml
index 05bf56fb7..cbe3e97ae 100644
--- a/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_worstcaserules_1flow_1518B_packetsize.yaml
+++ b/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_worstcaserules_1flow_1518B_packetsize.yaml
@@ -19,9 +19,9 @@ scenarios:
traffic_profile: "../../../../traffic_profiles/ipv4_throughput.yaml"
topology: ../../acl-tg-topology.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
- tg__2: trafficgen_2.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
+ tg__1: trafficgen_2.yardstick
tc_options:
rfc2544:
allowed_drop_rate: 0.8 - 1
diff --git a/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_worstcaserules_1flow_64B_packetsize.yaml b/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_worstcaserules_1flow_64B_packetsize.yaml
index d560f56cf..707b46e7f 100644
--- a/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_worstcaserules_1flow_64B_packetsize.yaml
+++ b/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_worstcaserules_1flow_64B_packetsize.yaml
@@ -19,9 +19,9 @@ scenarios:
traffic_profile: "../../../../traffic_profiles/ipv4_throughput.yaml"
topology: ../../acl-tg-topology.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
- tg__2: trafficgen_2.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
+ tg__1: trafficgen_2.yardstick
tc_options:
rfc2544:
allowed_drop_rate: 0.8 - 1
diff --git a/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_worstcaserules_1flow_IMIX_packetsize.yaml b/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_worstcaserules_1flow_IMIX_packetsize.yaml
index 68fdf96e4..b1003df3d 100644
--- a/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_worstcaserules_1flow_IMIX_packetsize.yaml
+++ b/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_worstcaserules_1flow_IMIX_packetsize.yaml
@@ -19,9 +19,9 @@ scenarios:
traffic_profile: "../../../../traffic_profiles/ipv4_throughput.yaml"
topology: ../../acl-tg-topology.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
- tg__2: trafficgen_2.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
+ tg__1: trafficgen_2.yardstick
tc_options:
rfc2544:
allowed_drop_rate: 0.8 - 1
diff --git a/samples/vnf_samples/nsut/prox/prox-tg-topology-1.yaml b/samples/vnf_samples/nsut/prox/prox-tg-topology-1.yaml
index b65d9d94b..ee7909b3b 100644
--- a/samples/vnf_samples/nsut/prox/prox-tg-topology-1.yaml
+++ b/samples/vnf_samples/nsut/prox/prox-tg-topology-1.yaml
@@ -20,30 +20,30 @@ nsd:nsd-catalog:
description: prox-tg-topology
constituent-vnfd:
- member-vnf-index: '1'
- vnfd-id-ref: tg__1
+ vnfd-id-ref: tg__0
VNF model: ../../vnf_descriptors/tg_prox_tpl-1.yaml
- member-vnf-index: '2'
- vnfd-id-ref: vnf__1
+ vnfd-id-ref: vnf__0
VNF model: ../../vnf_descriptors/prox_vnf-1.yaml
vld:
- - id: private
- name: tg__1 to vnf__1 link 1
+ - id: uplink
+ name: tg__0 to vnf__0 link 1
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe0
- vnfd-id-ref: tg__1
+ vnfd-id-ref: tg__0
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe0
- vnfd-id-ref: vnf__1
+ vnfd-id-ref: vnf__0
- - id: public
- name: vnf__1 to tg__1 link 2
+ - id: downlink
+ name: vnf__0 to tg__0 link 2
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe0
- vnfd-id-ref: vnf__1
+ vnfd-id-ref: vnf__0
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe0
- vnfd-id-ref: tg__1
+ vnfd-id-ref: tg__0
diff --git a/samples/vnf_samples/nsut/prox/prox-tg-topology-2.yaml b/samples/vnf_samples/nsut/prox/prox-tg-topology-2.yaml
index dc19136cd..9421935a9 100644
--- a/samples/vnf_samples/nsut/prox/prox-tg-topology-2.yaml
+++ b/samples/vnf_samples/nsut/prox/prox-tg-topology-2.yaml
@@ -20,30 +20,30 @@ nsd:nsd-catalog:
description: prox-tg-topology
constituent-vnfd:
- member-vnf-index: '1'
- vnfd-id-ref: tg__1
+ vnfd-id-ref: tg__0
VNF model: ../../vnf_descriptors/tg_prox_tpl-2.yaml
- member-vnf-index: '2'
- vnfd-id-ref: vnf__1
+ vnfd-id-ref: vnf__0
VNF model: ../../vnf_descriptors/prox_vnf-2.yaml
vld:
- - id: private
- name: tg__1 to vnf__1 link 1
+ - id: uplink
+ name: tg__0 to vnf__0 link 1
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe0
- vnfd-id-ref: tg__1
+ vnfd-id-ref: tg__0
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe0
- vnfd-id-ref: vnf__1
+ vnfd-id-ref: vnf__0
- - id: public
- name: vnf__1 to tg__1 link 2
+ - id: downlink
+ name: vnf__0 to tg__0 link 2
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe1
- vnfd-id-ref: vnf__1
+ vnfd-id-ref: vnf__0
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe1
- vnfd-id-ref: tg__1
+ vnfd-id-ref: tg__0
diff --git a/samples/vnf_samples/nsut/prox/prox-tg-topology-4.yaml b/samples/vnf_samples/nsut/prox/prox-tg-topology-4.yaml
index 17fe403b2..eda239e3b 100644
--- a/samples/vnf_samples/nsut/prox/prox-tg-topology-4.yaml
+++ b/samples/vnf_samples/nsut/prox/prox-tg-topology-4.yaml
@@ -20,50 +20,50 @@ nsd:nsd-catalog:
description: prox-tg-topology
constituent-vnfd:
- member-vnf-index: '1'
- vnfd-id-ref: tg__1
+ vnfd-id-ref: tg__0
VNF model: ../../vnf_descriptors/tg_prox_tpl-4.yaml
- member-vnf-index: '2'
- vnfd-id-ref: vnf__1
+ vnfd-id-ref: vnf__0
VNF model: ../../vnf_descriptors/prox_vnf-4.yaml
vld:
- - id: private
- name: tg__1 to vnf__1 link 1
+ - id: uplink_0
+ name: tg__0 to vnf__0 link 1
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe0
- vnfd-id-ref: tg__1
+ vnfd-id-ref: tg__0
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe0
- vnfd-id-ref: vnf__1
+ vnfd-id-ref: vnf__0
- - id: public
- name: vnf__1 to tg__1 link 2
+ - id: downlink_0
+ name: vnf__0 to tg__0 link 1
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe1
- vnfd-id-ref: vnf__1
+ vnfd-id-ref: vnf__0
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe1
- vnfd-id-ref: tg__1
- - id: public2
- name: vnf__1 to tg__1 link 3
+ vnfd-id-ref: tg__0
+ - id: downlink_1
+ name: vnf__0 to tg__0 link 2
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe2
- vnfd-id-ref: vnf__1
+ vnfd-id-ref: vnf__0
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe2
- vnfd-id-ref: tg__1
- - id: public3
- name: vnf__1 to tg__1 link 4
+ vnfd-id-ref: tg__0
+ - id: downlink_2
+ name: vnf__0 to tg__0 link 3
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe3
- vnfd-id-ref: vnf__1
+ vnfd-id-ref: vnf__0
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe3
- vnfd-id-ref: tg__1
+ vnfd-id-ref: tg__0
diff --git a/samples/vnf_samples/nsut/prox/sriov/http_tests/tc_FileSize-1K_Requests-1M_Concurrency-100.yaml b/samples/vnf_samples/nsut/prox/sriov/http_tests/tc_FileSize-1K_Requests-1M_Concurrency-100.yaml
index b98ffc51c..15892b886 100644
--- a/samples/vnf_samples/nsut/prox/sriov/http_tests/tc_FileSize-1K_Requests-1M_Concurrency-100.yaml
+++ b/samples/vnf_samples/nsut/prox/sriov/http_tests/tc_FileSize-1K_Requests-1M_Concurrency-100.yaml
@@ -17,9 +17,9 @@ scenarios:
topology: ../../acl-tg-topology-http.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
- tg__2: trafficgen_2.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
+ tg__1: trafficgen_2.yardstick
options:
acl:
diff --git a/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_1rule_1flow_1518B_packetsize.yaml b/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_1rule_1flow_1518B_packetsize.yaml
index bc7891e80..1238ed41c 100644
--- a/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_1rule_1flow_1518B_packetsize.yaml
+++ b/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_1rule_1flow_1518B_packetsize.yaml
@@ -14,9 +14,9 @@ scenarios:
traffic_profile: "../../../../traffic_profiles/ipv4_throughput.yaml"
topology: ../../acl-tg-topology.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
- tg__2: trafficgen_2.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
+ tg__1: trafficgen_2.yardstick
tc_options:
rfc2544:
allowed_drop_rate: 0.8 - 1
diff --git a/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_1rule_1flow_64B_packetsize.yaml b/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_1rule_1flow_64B_packetsize.yaml
index e3a105b0f..059a6502f 100644
--- a/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_1rule_1flow_64B_packetsize.yaml
+++ b/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_1rule_1flow_64B_packetsize.yaml
@@ -14,9 +14,9 @@ scenarios:
traffic_profile: "../../../../traffic_profiles/ipv4_throughput.yaml"
topology: ../../acl-tg-topology.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
- tg__2: trafficgen_2.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
+ tg__1: trafficgen_2.yardstick
tc_options:
rfc2544:
allowed_drop_rate: 0.8 - 1
diff --git a/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_1rule_1flow_IMIX_packetsize.yaml b/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_1rule_1flow_IMIX_packetsize.yaml
index 6d89feea0..b6aa48a0e 100644
--- a/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_1rule_1flow_IMIX_packetsize.yaml
+++ b/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_1rule_1flow_IMIX_packetsize.yaml
@@ -14,9 +14,9 @@ scenarios:
traffic_profile: "../../../../traffic_profiles/ipv4_throughput.yaml"
topology: ../../acl-tg-topology.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
- tg__2: trafficgen_2.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
+ tg__1: trafficgen_2.yardstick
tc_options:
rfc2544:
allowed_drop_rate: 0.8 - 1
diff --git a/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_worstcaserules_1flow_1518B_packetsize.yaml b/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_worstcaserules_1flow_1518B_packetsize.yaml
index 571f4f47b..baa4b5997 100644
--- a/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_worstcaserules_1flow_1518B_packetsize.yaml
+++ b/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_worstcaserules_1flow_1518B_packetsize.yaml
@@ -14,9 +14,9 @@ scenarios:
traffic_profile: "../../../../traffic_profiles/ipv4_throughput.yaml"
topology: ../../acl-tg-topology.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
- tg__2: trafficgen_2.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
+ tg__1: trafficgen_2.yardstick
tc_options:
rfc2544:
allowed_drop_rate: 0.8 - 1
diff --git a/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_worstcaserules_1flow_64B_packetsize.yaml b/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_worstcaserules_1flow_64B_packetsize.yaml
index c70846566..590150602 100644
--- a/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_worstcaserules_1flow_64B_packetsize.yaml
+++ b/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_worstcaserules_1flow_64B_packetsize.yaml
@@ -14,9 +14,9 @@ scenarios:
traffic_profile: "../../../../traffic_profiles/ipv4_throughput.yaml"
topology: ../../acl-tg-topology.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
- tg__2: trafficgen_2.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
+ tg__1: trafficgen_2.yardstick
tc_options:
rfc2544:
allowed_drop_rate: 0.8 - 1
diff --git a/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_worstcaserules_1flow_IMIX_packetsize.yaml b/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_worstcaserules_1flow_IMIX_packetsize.yaml
index 026719799..517dd9024 100644
--- a/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_worstcaserules_1flow_IMIX_packetsize.yaml
+++ b/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_worstcaserules_1flow_IMIX_packetsize.yaml
@@ -14,9 +14,9 @@ scenarios:
traffic_profile: "../../../../traffic_profiles/ipv4_throughput.yaml"
topology: ../../acl-tg-topology.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
- tg__2: trafficgen_2.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
+ tg__1: trafficgen_2.yardstick
tc_options:
rfc2544:
allowed_drop_rate: 0.8 - 1
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_acl-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_acl-2.yaml
index 7ced79c7b..4b51998f4 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_acl-2.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_acl-2.yaml
@@ -22,18 +22,18 @@ scenarios:
topology: prox-tg-topology-2.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
- vnf__1:
+ vnf__0:
prox_path: /root/dppd-PROX-v037/build/prox
prox_config: "configs/handle_acl-2.cfg"
prox_args:
"-t": ""
prox_files: "configs/acl_rules-2.lua"
- tg__1:
+ tg__0:
prox_path: /root/dppd-PROX-v037/build/prox
prox_config: "configs/gen_acl-2.cfg"
prox_args:
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_acl-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_acl-4.yaml
index e9def4cc7..ef9eaf79b 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_acl-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_acl-4.yaml
@@ -22,18 +22,18 @@ scenarios:
topology: prox-tg-topology-4.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
- vnf__1:
+ vnf__0:
prox_path: /root/dppd-PROX-v037/build/prox
prox_config: "configs/handle_acl-4.cfg"
prox_args:
"-t": ""
prox_files: "configs/acl_rules-2.lua"
- tg__1:
+ tg__0:
prox_path: /root/dppd-PROX-v037/build/prox
prox_config: "configs/gen_acl-4.cfg"
prox_args:
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_binsearch.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_binsearch.yaml
index 0173fdc3e..4cc383636 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_binsearch.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_binsearch.yaml
@@ -22,17 +22,17 @@ scenarios:
topology: prox-tg-topology-2.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
- vnf__1:
+ vnf__0:
prox_path: /root/dppd-PROX-v035/build/prox
prox_config: "configs/handle_none-2.cfg"
prox_args:
"-t": ""
- tg__1:
+ tg__0:
prox_path: /root/dppd-PROX-v035/build/prox
prox_config: "configs/gen_all-2.cfg"
prox_args:
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_buffering-1.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_buffering-1.yaml
index 6344b415f..7b28a923b 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_buffering-1.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_buffering-1.yaml
@@ -22,17 +22,17 @@ scenarios:
topology: prox-tg-topology-1.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
- vnf__1:
+ vnf__0:
prox_path: /root/dppd-PROX-v037/build/prox
prox_config: "configs/handle_buffering-1.cfg"
prox_args:
"-t": ""
- tg__1:
+ tg__0:
prox_path: /root/dppd-PROX-v037/build/prox
prox_config: "configs/gen_buffering-1.cfg"
prox_args:
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd-2.yaml
index d4672e839..49a079ab8 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd-2.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd-2.yaml
@@ -22,17 +22,17 @@ scenarios:
topology: prox-tg-topology-2.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
- vnf__1:
+ vnf__0:
prox_path: /root/dppd-PROX-v037/build/prox
prox_config: "configs/handle_l2fwd-2.cfg"
prox_args:
"-t": ""
- tg__1:
+ tg__0:
prox_path: /root/dppd-PROX-v037/build/prox
prox_config: "configs/gen_l2fwd-2.cfg"
prox_args:
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd-4.yaml
index e6bcac40b..a0aec0160 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd-4.yaml
@@ -22,17 +22,17 @@ scenarios:
topology: prox-tg-topology-4.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
- vnf__1:
+ vnf__0:
prox_path: /root/dppd-PROX-v037/build/prox
prox_config: "configs/handle_l2fwd-4.cfg"
prox_args:
"-t": ""
- tg__1:
+ tg__0:
prox_path: /root/dppd-PROX-v037/build/prox
prox_config: "configs/gen_l2fwd-4.cfg"
prox_args:
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_pktTouch-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_pktTouch-2.yaml
index 9ebfceb73..101fb9dd3 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_pktTouch-2.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_pktTouch-2.yaml
@@ -22,17 +22,17 @@ scenarios:
topology: prox-tg-topology-2.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
- vnf__1:
+ vnf__0:
prox_path: /root/dppd-PROX-v037/build/prox
prox_config: "configs/handle_l2fwd_pktTouch-2.cfg"
prox_args:
"-t": ""
- tg__1:
+ tg__0:
prox_path: /root/dppd-PROX-v037/build/prox
prox_config: "configs/gen_l2fwd_pktTouch-2.cfg"
prox_args:
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_pktTouch-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_pktTouch-4.yaml
index e8ba5ef9a..5bc22874c 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_pktTouch-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_pktTouch-4.yaml
@@ -22,17 +22,17 @@ scenarios:
topology: prox-tg-topology-4.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
- vnf__1:
+ vnf__0:
prox_path: /root/dppd-PROX-v037/build/prox
prox_config: "configs/handle_l2fwd_pktTouch-4.cfg"
prox_args:
"-t": ""
- tg__1:
+ tg__0:
prox_path: /root/dppd-PROX-v037/build/prox
prox_config: "configs/gen_l2fwd_pktTouch-4.cfg"
prox_args:
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l3fwd-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l3fwd-2.yaml
index f6dc7310e..b3ed8bb58 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l3fwd-2.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l3fwd-2.yaml
@@ -22,11 +22,11 @@ scenarios:
topology: prox-tg-topology-2.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
- vnf__1:
+ vnf__0:
prox_path: /root/dppd-PROX-v037/build/prox
prox_config: "configs/handle_l3fwd-2.cfg"
prox_args:
@@ -34,7 +34,7 @@ scenarios:
prox_files:
"configs/ipv4.lua" : ""
- tg__1:
+ tg__0:
prox_path: /root/dppd-PROX-v037/build/prox
prox_config: "configs/gen_l3fwd-2.cfg"
prox_args:
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l3fwd-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l3fwd-4.yaml
index 4d37f391f..9d50566e7 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l3fwd-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l3fwd-4.yaml
@@ -22,11 +22,11 @@ scenarios:
topology: prox-tg-topology-4.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
- vnf__1:
+ vnf__0:
prox_path: /root/dppd-PROX-v037/build/prox
prox_config: "configs/handle_l3fwd-4.cfg"
prox_args:
@@ -34,7 +34,7 @@ scenarios:
prox_files:
"configs/ipv4.lua" : ""
- tg__1:
+ tg__0:
prox_path: /root/dppd-PROX-v037/build/prox
prox_config: "configs/gen_l3fwd-4.cfg"
prox_args:
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_mpls_tagging-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_mpls_tagging-2.yaml
index 59f279529..2994ee378 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_mpls_tagging-2.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_mpls_tagging-2.yaml
@@ -22,17 +22,17 @@ scenarios:
topology: prox-tg-topology-2.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
- vnf__1:
+ vnf__0:
prox_path: /root/dppd-PROX-v037/build/prox
prox_config: "configs/handle_mpls_tag_untag-2.cfg"
prox_args:
"-t": ""
- tg__1:
+ tg__0:
prox_path: /root/dppd-PROX-v037/build/prox
prox_config: "configs/gen_mpls_tag_untag-2.cfg"
prox_args:
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_mpls_tagging-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_mpls_tagging-4.yaml
index 11db293b7..6ed8aed3a 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_mpls_tagging-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_mpls_tagging-4.yaml
@@ -22,17 +22,17 @@ scenarios:
topology: prox-tg-topology-4.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
- vnf__1:
+ vnf__0:
prox_path: /root/dppd-PROX-v037/build/prox
prox_config: "configs/handle_mpls_tag_untag-4.cfg"
prox_args:
"-t": ""
- tg__1:
+ tg__0:
prox_path: /root/dppd-PROX-v037/build/prox
prox_config: "configs/gen_mpls_tag_untag-4.cfg"
prox_args:
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_ramp.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_ramp.yaml
index c21266cef..fc28b929a 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_ramp.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_ramp.yaml
@@ -22,17 +22,17 @@ scenarios:
topology: prox-tg-topology-2.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
- vnf__1:
+ vnf__0:
prox_path: /root/dppd-PROX-v035/build/prox
prox_config: "configs/handle_none-2.cfg"
prox_args:
"-t": ""
- tg__1:
+ tg__0:
prox_path: /root/dppd-PROX-v035/build/prox
prox_config: "configs/gen_all-2.cfg"
prox_args:
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context.yaml
index 67552ec88..7834a5c9b 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context.yaml
@@ -22,17 +22,17 @@ scenarios:
topology: prox-tg-topology-2.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
- vnf__1:
+ vnf__0:
prox_path: /root/dppd-PROX-v035/build/prox
prox_config: "configs/l3-swap-2.cfg"
prox_args:
"-t": ""
- tg__1:
+ tg__0:
prox_path: /root/dppd-PROX-v035/build/prox
prox_config: "configs/l3-gen-2.cfg"
prox_args:
@@ -76,7 +76,7 @@ context:
external_network: "yardstick-public"
xe0:
cidr: '10.0.2.0/24'
- vld_id: public
+ vld_id: downlink
xe1:
cidr: '10.0.3.0/24'
- vld_id: private
+ vld_id: uplink
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-2.yaml
index 5310a5c8a..123cec976 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-2.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-2.yaml
@@ -22,18 +22,18 @@ scenarios:
topology: prox-tg-topology-2.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
- vnf__1:
+ vnf__0:
prox_path: /root/dppd-PROX-v037/build/prox
prox_config: "configs/handle_acl-2.cfg"
prox_args:
"-t": ""
prox_files: "configs/acl_rules-2.lua"
- tg__1:
+ tg__0:
prox_path: /root/dppd-PROX-v037/build/prox
prox_config: "configs/gen_acl-2.cfg"
prox_args:
@@ -77,13 +77,13 @@ context:
external_network: "yardstick-public"
xe0:
cidr: '10.0.2.0/24'
- vld_id: public
+ vld_id: downlink
allowed_address_pairs:
- ip_address:
'0.0.0.0/0'
xe1:
cidr: '10.0.3.0/24'
- vld_id: private
+ vld_id: uplink
allowed_address_pairs:
- ip_address:
'0.0.0.0/0'
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-4.yaml
index 5ed96736c..9ede5a060 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-4.yaml
@@ -22,18 +22,18 @@ scenarios:
topology: prox-tg-topology-4.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
- vnf__1:
+ vnf__0:
prox_path: /root/dppd-PROX-v037/build/prox
prox_config: "configs/handle_acl-4.cfg"
prox_args:
"-t": ""
prox_files: "configs/acl_rules-2.lua"
- tg__1:
+ tg__0:
prox_path: /root/dppd-PROX-v037/build/prox
prox_config: "configs/gen_acl-4.cfg"
prox_args:
@@ -77,25 +77,25 @@ context:
external_network: "yardstick-public"
xe0:
cidr: '10.0.2.0/24'
- vld_id: public
+ vld_id: downlink
allowed_address_pairs:
- ip_address:
'0.0.0.0/0'
xe1:
cidr: '10.0.3.0/24'
- vld_id: private
+ vld_id: uplink
allowed_address_pairs:
- ip_address:
'0.0.0.0/0'
xe2:
cidr: '10.0.4.0/24'
- vld_id: public
+ vld_id: downlink
allowed_address_pairs:
- ip_address:
'0.0.0.0/0'
xe3:
cidr: '10.0.5.0/24'
- vld_id: private
+ vld_id: uplink
allowed_address_pairs:
- ip_address:
'0.0.0.0/0'
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_buffering-1.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_buffering-1.yaml
index 43742c383..a62fa5f2c 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_buffering-1.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_buffering-1.yaml
@@ -22,17 +22,17 @@ scenarios:
topology: prox-tg-topology-1.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
- vnf__1:
+ vnf__0:
prox_path: /root/dppd-PROX-v037/build/prox
prox_config: "configs/handle_buffering-1.cfg"
prox_args:
"-t": ""
- tg__1:
+ tg__0:
prox_path: /root/dppd-PROX-v037/build/prox
prox_config: "configs/gen_buffering-1.cfg"
prox_args:
@@ -74,7 +74,7 @@ context:
external_network: "yardstick-public"
xe0:
cidr: '10.0.2.0/24'
- vld_id: public
+ vld_id: downlink
allowed_address_pairs:
- ip_address:
'0.0.0.0/0'
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-2.yaml
index 270ff0411..6193fd3fb 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-2.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-2.yaml
@@ -22,17 +22,17 @@ scenarios:
topology: prox-tg-topology-2.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
- vnf__1:
+ vnf__0:
prox_path: /root/dppd-PROX-v037/build/prox
prox_config: "configs/handle_l2fwd-2.cfg"
prox_args:
"-t": ""
- tg__1:
+ tg__0:
prox_path: /root/dppd-PROX-v037/build/prox
prox_config: "configs/gen_l2fwd-2.cfg"
prox_args:
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-4.yaml
index 0650a0966..881bcfb0e 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-4.yaml
@@ -22,17 +22,17 @@ scenarios:
topology: prox-tg-topology-4.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
- vnf__1:
+ vnf__0:
prox_path: /root/dppd-PROX-v037/build/prox
prox_config: "configs/handle_l2fwd-4.cfg"
prox_args:
"-t": ""
- tg__1:
+ tg__0:
prox_path: /root/dppd-PROX-v037/build/prox
prox_config: "configs/gen_l2fwd-4.cfg"
prox_args:
@@ -73,25 +73,25 @@ context:
cidr: '10.0.1.0/24'
xe0:
cidr: '10.0.2.0/24'
- vld_id: public
+ vld_id: downlink
allowed_address_pairs:
- ip_address:
'0.0.0.0/0'
xe1:
cidr: '10.0.3.0/24'
- vld_id: private
+ vld_id: uplink
allowed_address_pairs:
- ip_address:
'0.0.0.0/0'
xe2:
cidr: '10.0.4.0/24'
- vld_id: public
+ vld_id: downlink
allowed_address_pairs:
- ip_address:
'0.0.0.0/0'
xe3:
cidr: '10.0.5.0/24'
- vld_id: private
+ vld_id: uplink
allowed_address_pairs:
- ip_address:
'0.0.0.0/0'
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_pktTouch-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_pktTouch-2.yaml
index 20cf43d70..48a85d4f3 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_pktTouch-2.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_pktTouch-2.yaml
@@ -22,17 +22,17 @@ scenarios:
topology: prox-tg-topology-2.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
- vnf__1:
+ vnf__0:
prox_path: /root/dppd-PROX-v037/build/prox
prox_config: "configs/handle_l2fwd_pktTouch-2.cfg"
prox_args:
"-t": ""
- tg__1:
+ tg__0:
prox_path: /root/dppd-PROX-v037/build/prox
prox_config: "configs/gen_l2fwd_pktTouch-2.cfg"
prox_args:
@@ -73,13 +73,13 @@ context:
cidr: '10.0.1.0/24'
xe0:
cidr: '10.0.2.0/24'
- vld_id: public
+ vld_id: downlink
allowed_address_pairs:
- ip_address:
'0.0.0.0/0'
xe1:
cidr: '10.0.3.0/24'
- vld_id: private
+ vld_id: uplink
allowed_address_pairs:
- ip_address:
'0.0.0.0/0'
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_pktTouch-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_pktTouch-4.yaml
index 570bdd0fb..5bc06e8c2 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_pktTouch-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_pktTouch-4.yaml
@@ -22,17 +22,17 @@ scenarios:
topology: prox-tg-topology-4.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
- vnf__1:
+ vnf__0:
prox_path: /root/dppd-PROX-v037/build/prox
prox_config: "configs/handle_l2fwd_pktTouch-4.cfg"
prox_args:
"-t": ""
- tg__1:
+ tg__0:
prox_path: /root/dppd-PROX-v037/build/prox
prox_config: "configs/gen_l2fwd_pktTouch-4.cfg"
prox_args:
@@ -73,25 +73,25 @@ context:
cidr: '10.0.1.0/24'
xe0:
cidr: '10.0.2.0/24'
- vld_id: public
+ vld_id: downlink
allowed_address_pairs:
- ip_address:
'0.0.0.0/0'
xe1:
cidr: '10.0.3.0/24'
- vld_id: private
+ vld_id: uplink
allowed_address_pairs:
- ip_address:
'0.0.0.0/0'
xe2:
cidr: '10.0.4.0/24'
- vld_id: public
+ vld_id: downlink
allowed_address_pairs:
- ip_address:
'0.0.0.0/0'
xe3:
cidr: '10.0.5.0/24'
- vld_id: private
+ vld_id: uplink
allowed_address_pairs:
- ip_address:
'0.0.0.0/0'
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l3fwd-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l3fwd-2.yaml
index 068f0a2da..c7a7aa881 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l3fwd-2.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l3fwd-2.yaml
@@ -22,11 +22,11 @@ scenarios:
topology: prox-tg-topology-2.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
- vnf__1:
+ vnf__0:
prox_path: /root/dppd-PROX-v037.1/build/prox
prox_config: "configs/handle_l3fwd-2.cfg"
prox_args:
@@ -34,7 +34,7 @@ scenarios:
prox_files:
"configs/ipv4.lua" : ""
- tg__1:
+ tg__0:
prox_path: /root/dppd-PROX-v037.1/build/prox
prox_config: "configs/gen_l3fwd-2.cfg"
prox_args:
@@ -77,13 +77,13 @@ context:
external_network: "yardstick-public"
xe0:
cidr: '10.0.2.0/24'
- vld_id: public
+ vld_id: downlink
allowed_address_pairs:
- ip_address:
'0.0.0.0/0'
xe1:
cidr: '10.0.3.0/24'
- vld_id: private
+ vld_id: uplink
allowed_address_pairs:
- ip_address:
'0.0.0.0/0' \ No newline at end of file
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l3fwd-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l3fwd-4.yaml
index d51cd31a7..f5172d545 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l3fwd-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l3fwd-4.yaml
@@ -22,11 +22,11 @@ scenarios:
topology: prox-tg-topology-4.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
- vnf__1:
+ vnf__0:
prox_path: /root/dppd-PROX-v037.1/build/prox
prox_config: "configs/handle_l3fwd-4.cfg"
prox_args:
@@ -34,7 +34,7 @@ scenarios:
prox_files:
"configs/ipv4.lua" : ""
- tg__1:
+ tg__0:
prox_path: /root/dppd-PROX-v037.1/build/prox
prox_config: "configs/gen_l3fwd-4.cfg"
prox_args:
@@ -77,25 +77,25 @@ context:
external_network: "yardstick-public"
xe0:
cidr: '10.0.2.0/24'
- vld_id: public
+ vld_id: downlink
allowed_address_pairs:
- ip_address:
'0.0.0.0/0'
xe1:
cidr: '10.0.3.0/24'
- vld_id: private
+ vld_id: uplink
allowed_address_pairs:
- ip_address:
'0.0.0.0/0'
xe2:
cidr: '10.0.4.0/24'
- vld_id: public
+ vld_id: downlink
allowed_address_pairs:
- ip_address:
'0.0.0.0/0'
xe3:
cidr: '10.0.5.0/24'
- vld_id: private
+ vld_id: uplink
allowed_address_pairs:
- ip_address:
'0.0.0.0/0' \ No newline at end of file
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-2.yaml
index 0f7119514..10d0984c0 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-2.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-2.yaml
@@ -22,17 +22,17 @@ scenarios:
topology: prox-tg-topology-2.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
- vnf__1:
+ vnf__0:
prox_path: /root/dppd-PROX-v037/build/prox
prox_config: "configs/handle_mpls_tag_untag-2.cfg"
prox_args:
"-t": ""
- tg__1:
+ tg__0:
prox_path: /root/dppd-PROX-v037/build/prox
prox_config: "configs/gen_mpls_tag_untag-2.cfg"
prox_args:
@@ -75,13 +75,13 @@ context:
external_network: "yardstick-public"
xe0:
cidr: '10.0.2.0/24'
- vld_id: public
+ vld_id: downlink
allowed_address_pairs:
- ip_address:
'0.0.0.0/0'
xe1:
cidr: '10.0.3.0/24'
- vld_id: private
+ vld_id: uplink
allowed_address_pairs:
- ip_address:
'0.0.0.0/0'
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-4.yaml
index 4b3bd789a..75555ccc6 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-4.yaml
@@ -22,17 +22,17 @@ scenarios:
topology: prox-tg-topology-4.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
- vnf__1:
+ vnf__0:
prox_path: /root/dppd-PROX-v037/build/prox
prox_config: "configs/handle_mpls_tag_untag-4.cfg"
prox_args:
"-t": ""
- tg__1:
+ tg__0:
prox_path: /root/dppd-PROX-v037/build/prox
prox_config: "configs/gen_mpls_tag_untag-4.cfg"
prox_args:
@@ -75,25 +75,25 @@ context:
external_network: "yardstick-public"
xe0:
cidr: '10.0.2.0/24'
- vld_id: public
+ vld_id: downlink
allowed_address_pairs:
- ip_address:
'0.0.0.0/0'
xe1:
cidr: '10.0.3.0/24'
- vld_id: private
+ vld_id: uplink
allowed_address_pairs:
- ip_address:
'0.0.0.0/0'
xe2:
cidr: '10.0.4.0/24'
- vld_id: public
+ vld_id: downlink
allowed_address_pairs:
- ip_address:
'0.0.0.0/0'
xe3:
cidr: '10.0.5.0/24'
- vld_id: private
+ vld_id: uplink
allowed_address_pairs:
- ip_address:
'0.0.0.0/0'
diff --git a/samples/vnf_samples/nsut/udp_replay/tc_baremetal_rfc2544_ipv4_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/udp_replay/tc_baremetal_rfc2544_ipv4_1flow_64B_trex.yaml
index 8640df9a0..78e92ce74 100644
--- a/samples/vnf_samples/nsut/udp_replay/tc_baremetal_rfc2544_ipv4_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/udp_replay/tc_baremetal_rfc2544_ipv4_1flow_64B_trex.yaml
@@ -19,20 +19,20 @@ scenarios:
traffic_profile: ../../traffic_profiles/ipv4_throughput_cgnapt.yaml
topology: udp_replay-vnf-topology.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
framesize:
private: {64B: 100}
public: {64B: 100}
flow:
- src_ip: [{'tg__1': 'xe0'}]
- dst_ip: [{'tg__1': 'xe1'}]
+ src_ip: [{'tg__0': 'xe0'}]
+ dst_ip: [{'tg__0': 'xe1'}]
count: 1
traffic_type: 4
rfc2544:
allowed_drop_rate: 0.0001 - 0.0001
- vnf__1:
+ vnf__0:
nfvi_enable: True
runner:
type: Iteration
diff --git a/samples/vnf_samples/nsut/udp_replay/tc_heat_rfc2544_ipv4_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/udp_replay/tc_heat_rfc2544_ipv4_1flow_64B_trex.yaml
index 09a20c33d..c8654a5a2 100644
--- a/samples/vnf_samples/nsut/udp_replay/tc_heat_rfc2544_ipv4_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/udp_replay/tc_heat_rfc2544_ipv4_1flow_64B_trex.yaml
@@ -19,14 +19,14 @@ scenarios:
traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
topology: udp_replay-vnf-topology.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
packetsize: 64
traffic_type: 4
- vnf__1:
+ vnf__0:
hw_csum: false
- tg__1:
+ tg__0:
hw_csum: false
rfc2544:
allowed_drop_rate: 0.0001 - 0.0001
@@ -67,13 +67,13 @@ context:
cidr: '10.0.1.0/24'
xe0:
cidr: '10.0.2.0/24'
- vld_id: public
+ vld_id: downlink
enable_dhcp: False
gateway_ip: null
port_security_enabled: False
xe1:
cidr: '10.0.3.0/24'
- vld_id: private
+ vld_id: uplink
enable_dhcp: False
gateway_ip: null
port_security_enabled: False
diff --git a/samples/vnf_samples/nsut/udp_replay/udp_replay-vnf-topology.yaml b/samples/vnf_samples/nsut/udp_replay/udp_replay-vnf-topology.yaml
index b13de7e90..b76f90b49 100644
--- a/samples/vnf_samples/nsut/udp_replay/udp_replay-vnf-topology.yaml
+++ b/samples/vnf_samples/nsut/udp_replay/udp_replay-vnf-topology.yaml
@@ -20,31 +20,31 @@ nsd:nsd-catalog:
description: 3tg-topology
constituent-vnfd:
- member-vnf-index: '1'
- vnfd-id-ref: tg__1
+ vnfd-id-ref: tg__0
VNF model: ../../vnf_descriptors/tg_rfc2544_tpl.yaml #VNF type
- member-vnf-index: '2'
- vnfd-id-ref: vnf__1
+ vnfd-id-ref: vnf__0
VNF model: ../../vnf_descriptors/udp_replay_vnf.yaml #VNF type
vld:
- - id: private_1
- name: tg__1 to vnf__1 link 1
+ - id: uplink_0
+ name: tg__0 to vnf__0 link 1
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe0
- vnfd-id-ref: tg__1
+ vnfd-id-ref: tg__0
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe0
- vnfd-id-ref: vnf__1
+ vnfd-id-ref: vnf__0
- - id: public_1
- name: vnf__1 to tg__1 link 2
+ - id: downlink_0
+ name: vnf__0 to tg__0 link 2
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe1
- vnfd-id-ref: vnf__1
+ vnfd-id-ref: vnf__0
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe1
- vnfd-id-ref: tg__1
+ vnfd-id-ref: tg__0
diff --git a/samples/vnf_samples/nsut/vfw/ixia_traffic.cfg b/samples/vnf_samples/nsut/vfw/ixia_traffic.cfg
index f749865c5..3f7e33471 100644
--- a/samples/vnf_samples/nsut/vfw/ixia_traffic.cfg
+++ b/samples/vnf_samples/nsut/vfw/ixia_traffic.cfg
@@ -1,5 +1,5 @@
{
- "private_1": {
+ "uplink_0": {
"id": 1,
"bidir": "False",
"duration": 60,
@@ -23,7 +23,7 @@
},
"traffic_type": "continuous"
},
- "public_1": {
+ "downlink_0": {
"id": 2,
"bidir": "False",
"duration": 60,
diff --git a/samples/vnf_samples/nsut/vfw/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml b/samples/vnf_samples/nsut/vfw/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml
index 0897fed18..5b2dae20f 100644
--- a/samples/vnf_samples/nsut/vfw/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml
+++ b/samples/vnf_samples/nsut/vfw/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml
@@ -19,8 +19,8 @@ scenarios:
traffic_profile: "../../traffic_profiles/http_tests/HTTP_1b-requests_65000_concurrency.yaml"
topology: vfw_vnf_topology_ixload.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
framesize:
private: {64B: 100}
@@ -28,7 +28,7 @@ scenarios:
traffic_type: 4
rfc2544:
allowed_drop_rate: 0.0001 - 0.0001
- vnf__1:
+ vnf__0:
rules: acl_1rule.yaml
vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
nfvi_enable: True
diff --git a/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml b/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml
index 9808398f2..b6eb5c191 100644
--- a/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml
+++ b/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml
@@ -19,20 +19,20 @@ scenarios:
traffic_profile: "../../traffic_profiles/ixia_ipv4_latency.yaml"
topology: vfw_vnf_topology_ixia.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
framesize:
private: {64B: 100}
public: {64B: 100}
flow:
- src_ip: [{'tg__1': 'xe0'}]
- dst_ip: [{'tg__1': 'xe1'}]
+ src_ip: [{'tg__0': 'xe0'}]
+ dst_ip: [{'tg__0': 'xe1'}]
count: 1
traffic_type: 4
rfc2544:
allowed_drop_rate: 0.0001 - 0.0001
- vnf__1:
+ vnf__0:
rules: acl_1rule.yaml
vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
nfvi_enable: True
diff --git a/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_ixia_scale_up.yaml b/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_ixia_scale_up.yaml
index 5a90acdf9..161a27678 100644
--- a/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_ixia_scale_up.yaml
+++ b/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_ixia_scale_up.yaml
@@ -20,20 +20,20 @@ scenarios:
traffic_profile: "../../traffic_profiles/ixia_ipv4_latency.yaml"
topology: vfw_vnf_topology_ixia.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
framesize:
private: {64B: 100}
public: {64B: 100}
flow:
- src_ip: [{'tg__1': 'xe0'}]
- dst_ip: [{'tg__1': 'xe1'}]
+ src_ip: [{'tg__0': 'xe0'}]
+ dst_ip: [{'tg__0': 'xe1'}]
count: 1000
traffic_type: 4
rfc2544:
allowed_drop_rate: 0.0001 - 0.0001
- vnf__1:
+ vnf__0:
rules: acl_1rule.yaml
nfvi_enable: True
vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: {{worker_thread}}}
diff --git a/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
index b0150d851..249511418 100644
--- a/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
@@ -19,20 +19,20 @@ scenarios:
traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
topology: vfw-tg-topology.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
framesize:
private: {64B: 100}
public: {64B: 100}
flow:
- src_ip: [{'tg__1': 'xe0'}]
- dst_ip: [{'tg__1': 'xe1'}]
+ src_ip: [{'tg__0': 'xe0'}]
+ dst_ip: [{'tg__0': 'xe1'}]
count: 1
traffic_type: 4
rfc2544:
allowed_drop_rate: 0.0001 - 0.0001
- vnf__1:
+ vnf__0:
rules: acl_1rule.yaml
vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
nfvi_enable: True
diff --git a/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_corelated_traffic.yaml b/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_corelated_traffic.yaml
index 6a55bfb77..e58130ab6 100644
--- a/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_corelated_traffic.yaml
+++ b/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_corelated_traffic.yaml
@@ -19,22 +19,22 @@ scenarios:
traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
topology: vfw-tg-topology-3node.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
- tg__2: trafficgen_2.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
+ tg__1: trafficgen_2.yardstick
options:
framesize:
private: {64B: 100}
public: {64B: 100}
flow:
- src_ip: [{'tg__1': 'xe0'}]
- dst_ip: [{'tg__2': 'xe0'}]
+ src_ip: [{'tg__0': 'xe0'}]
+ dst_ip: [{'tg__1': 'xe0'}]
count: 1
traffic_type: 4
rfc2544:
allowed_drop_rate: 0.0001 - 0.0001
correlated_traffic: true
- vnf__1:
+ vnf__0:
rules: acl_1rule.yaml
vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
nfvi_enable: True
diff --git a/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_scale_up.yaml b/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_scale_up.yaml
index 9773c3adb..8b21c27f0 100644
--- a/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_scale_up.yaml
+++ b/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_scale_up.yaml
@@ -20,20 +20,20 @@ scenarios:
traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
topology: vfw-tg-topology.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
framesize:
private: {64B: 100}
public: {64B: 100}
flow:
- src_ip: [{'tg__1': 'xe0'}]
- dst_ip: [{'tg__1': 'xe1'}]
+ src_ip: [{'tg__0': 'xe0'}]
+ dst_ip: [{'tg__0': 'xe1'}]
count: 1
traffic_type: 4
rfc2544:
allowed_drop_rate: 0.0001 - 0.0001
- vnf__1:
+ vnf__0:
rules: acl_1rule.yaml
vnf_config: {lb_config: 'HW', lb_count: 1, worker_config: '1C/1T', worker_threads: {{worker_thread}}}
nfvi_enable: True
diff --git a/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_with_latency_ipv4_1rule_1flow_64B_ixia.yaml b/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_with_latency_ipv4_1rule_1flow_64B_ixia.yaml
index 4656cc85f..1e2c8e53f 100644
--- a/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_with_latency_ipv4_1rule_1flow_64B_ixia.yaml
+++ b/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_with_latency_ipv4_1rule_1flow_64B_ixia.yaml
@@ -19,21 +19,21 @@ scenarios:
traffic_profile: "../../traffic_profiles/ixia_ipv4_latency.yaml"
topology: vfw_vnf_topology_ixia.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
framesize:
private: {64B: 100}
public: {64B: 100}
flow:
- src_ip: [{'tg__1': 'xe0'}]
- dst_ip: [{'tg__1': 'xe1'}]
+ src_ip: [{'tg__0': 'xe0'}]
+ dst_ip: [{'tg__0': 'xe1'}]
count: 1
traffic_type: 4
rfc2544:
allowed_drop_rate: 0.0001 - 0.0001
latency: true
- vnf__1:
+ vnf__0:
rules: acl_1rule.yaml
vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
nfvi_enable: True
diff --git a/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_with_latency_ipv4_1rule_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_with_latency_ipv4_1rule_1flow_64B_trex.yaml
index d11f097c5..38ed9282a 100644
--- a/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_with_latency_ipv4_1rule_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_with_latency_ipv4_1rule_1flow_64B_trex.yaml
@@ -19,21 +19,21 @@ scenarios:
traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
topology: vfw-tg-topology.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
framesize:
private: {64B: 100}
public: {64B: 100}
flow:
- src_ip: [{'tg__1': 'xe0'}]
- dst_ip: [{'tg__1': 'xe1'}]
+ src_ip: [{'tg__0': 'xe0'}]
+ dst_ip: [{'tg__0': 'xe1'}]
count: 1
traffic_type: 4
rfc2544:
allowed_drop_rate: 0.0001 - 0.0001
latency: true
- vnf__1:
+ vnf__0:
rules: acl_1rule.yaml
vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
nfvi_enable: True
diff --git a/samples/vnf_samples/nsut/vfw/tc_heat_external_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml b/samples/vnf_samples/nsut/vfw/tc_heat_external_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml
index 06b19ebad..d00b443d5 100644
--- a/samples/vnf_samples/nsut/vfw/tc_heat_external_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml
+++ b/samples/vnf_samples/nsut/vfw/tc_heat_external_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml
@@ -19,20 +19,20 @@ scenarios:
traffic_profile: ../../traffic_profiles/ixia_ipv4_latency.yaml
topology: vfw_vnf_topology_ixia.yaml
nodes:
- tg__1: trafficgen_1.yardstick1
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick1
+ vnf__0: vnf.yardstick
options:
framesize:
private: {64B: 100}
public: {64B: 100}
flow:
- src_ip: [{'tg__1': 'xe0'}]
- dst_ip: [{'tg__1': 'xe1'}]
+ src_ip: [{'tg__0': 'xe0'}]
+ dst_ip: [{'tg__0': 'xe1'}]
count: 1
traffic_type: 4
rfc2544:
allowed_drop_rate: 0.0001 - 0.0001
- vnf__1:
+ vnf__0:
rules: acl_1rule.yaml
vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
runner:
@@ -68,14 +68,14 @@ contexts:
cidr: '10.0.1.0/24'
xe0:
cidr: '10.0.2.0/24'
- vld_id: public_1
+ vld_id: downlink_0
gateway_ip: 'null'
provider: true
physical_network: phystenant1
port_security_enabled: False
xe1:
cidr: '10.0.3.0/24'
- vld_id: private_1
+ vld_id: uplink_0
gateway_ip: 'null'
provider: true
physical_network: phystenant2
diff --git a/samples/vnf_samples/nsut/vfw/tc_heat_external_rfc2544_ipv4_1rule_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/vfw/tc_heat_external_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
index cab0b9a14..86974d270 100644
--- a/samples/vnf_samples/nsut/vfw/tc_heat_external_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/vfw/tc_heat_external_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
@@ -19,20 +19,20 @@ scenarios:
traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
topology: vfw-tg-topology.yaml
nodes:
- tg__1: trafficgen_1.baremetal
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.baremetal
+ vnf__0: vnf.yardstick
options:
framesize:
private: {64B: 100}
public: {64B: 100}
flow:
- src_ip: [{'tg__1': 'xe0'}]
- dst_ip: [{'tg__1': 'xe1'}]
+ src_ip: [{'tg__0': 'xe0'}]
+ dst_ip: [{'tg__0': 'xe1'}]
count: 1
traffic_type: 4
rfc2544:
allowed_drop_rate: 0.0001 - 0.0001
- vnf__1:
+ vnf__0:
rules: acl_1rule.yaml
vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
runner:
diff --git a/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
index 13fb850ab..16815bf45 100644
--- a/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
@@ -19,20 +19,20 @@ scenarios:
traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
topology: vfw-tg-topology.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
framesize:
private: {64B: 100}
public: {64B: 100}
flow:
- src_ip: [{'tg__1': 'xe0'}]
- dst_ip: [{'tg__1': 'xe1'}]
+ src_ip: [{'tg__0': 'xe0'}]
+ dst_ip: [{'tg__0': 'xe1'}]
count: 1
traffic_type: 4
rfc2544:
allowed_drop_rate: 0.0001 - 0.0001
- vnf__1:
+ vnf__0:
rules: acl_1rule.yaml
vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
runner:
diff --git a/samples/vnf_samples/nsut/vfw/vfw-tg-topology-3node.yaml b/samples/vnf_samples/nsut/vfw/vfw-tg-topology-3node.yaml
index e1496efad..c1b439a03 100644
--- a/samples/vnf_samples/nsut/vfw/vfw-tg-topology-3node.yaml
+++ b/samples/vnf_samples/nsut/vfw/vfw-tg-topology-3node.yaml
@@ -20,34 +20,43 @@ nsd:nsd-catalog:
description: 3tg-topology
constituent-vnfd:
- member-vnf-index: '1'
- vnfd-id-ref: tg__1
+ vnfd-id-ref: tg__0
VNF model: ../../vnf_descriptors/tg_rfc2544_tpl.yaml #VNF type
- member-vnf-index: '2'
- vnfd-id-ref: vnf__1
+ vnfd-id-ref: vnf__0
VNF model: ../../vnf_descriptors/vfw_vnf.yaml #VNF type
- member-vnf-index: '3'
- vnfd-id-ref: tg__2
+ vnfd-id-ref: tg__1
VNF model: ../../vnf_descriptors/udp_replay_vnf.yaml #VNF type
vld:
- - id: private_1
- name: tg__1 to vnf__1 link 1
+ - id: uplink_0
+ name: tg__0 to vnf__0 link 1
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe0
- vnfd-id-ref: tg__1
+ vnfd-id-ref: tg__0
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe0
- vnfd-id-ref: vnf__1
-
- - id: public_1
- name: vnf__1 to tg__2 link 2
+ vnfd-id-ref: vnf__0
+ - id: uplink_1
+ name: tg__0 to vnf__0 link 2
+ type: ELAN
+ vnfd-connection-point-ref:
+ - member-vnf-index-ref: '1'
+ vnfd-connection-point-ref: xe1
+ vnfd-id-ref: tg__0
+ - member-vnf-index-ref: '1'
+ vnfd-connection-point-ref: xe1
+ vnfd-id-ref: tg__0
+ - id: downlink_0
+ name: vnf__0 to tg__1 link 2
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe1
- vnfd-id-ref: vnf__1
+ vnfd-id-ref: vnf__0
- member-vnf-index-ref: '3'
vnfd-connection-point-ref: xe0
- vnfd-id-ref: tg__2
+ vnfd-id-ref: tg__1
diff --git a/samples/vnf_samples/nsut/vfw/vfw-tg-topology-4port.yaml b/samples/vnf_samples/nsut/vfw/vfw-tg-topology-4port.yaml
index 7babb820a..93e5bf7a1 100644
--- a/samples/vnf_samples/nsut/vfw/vfw-tg-topology-4port.yaml
+++ b/samples/vnf_samples/nsut/vfw/vfw-tg-topology-4port.yaml
@@ -27,7 +27,7 @@ nsd:nsd-catalog:
VNF model: ../../vnf_descriptors/vfw_vnf.yaml #VNF type
vld:
- - id: private_0
+ - id: uplink_0
name: tg__0 to vnf__0 link 1
type: ELAN
vnfd-connection-point-ref:
@@ -37,7 +37,7 @@ nsd:nsd-catalog:
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe0
vnfd-id-ref: vnf__0
- - id: public_0
+ - id: downlink_0
name: vnf__0 to tg__0 link 2
type: ELAN
vnfd-connection-point-ref:
@@ -48,7 +48,7 @@ nsd:nsd-catalog:
vnfd-connection-point-ref: xe1
vnfd-id-ref: tg__0
- - id: private_1
+ - id: uplink_1
name: tg__0 to vnf__0 link 3
type: ELAN
vnfd-connection-point-ref:
@@ -58,7 +58,7 @@ nsd:nsd-catalog:
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe2
vnfd-id-ref: vnf__0
- - id: public_1
+ - id: downlink_1
name: vnf__0 to tg__0 link 4
type: ELAN
vnfd-connection-point-ref:
diff --git a/samples/vnf_samples/nsut/vfw/vfw-tg-topology.yaml b/samples/vnf_samples/nsut/vfw/vfw-tg-topology.yaml
index b224ec14d..2a76df5c5 100644
--- a/samples/vnf_samples/nsut/vfw/vfw-tg-topology.yaml
+++ b/samples/vnf_samples/nsut/vfw/vfw-tg-topology.yaml
@@ -20,31 +20,31 @@ nsd:nsd-catalog:
description: 3tg-topology
constituent-vnfd:
- member-vnf-index: '1'
- vnfd-id-ref: tg__1
+ vnfd-id-ref: tg__0
VNF model: ../../vnf_descriptors/tg_rfc2544_tpl.yaml #VNF type
- member-vnf-index: '2'
- vnfd-id-ref: vnf__1
+ vnfd-id-ref: vnf__0
VNF model: ../../vnf_descriptors/vfw_vnf.yaml #VNF type
vld:
- - id: private_1
- name: tg__1 to vnf__1 link 1
+ - id: uplink_0
+ name: tg__0 to vnf__0 link 1
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe0
- vnfd-id-ref: tg__1
+ vnfd-id-ref: tg__0
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe0
- vnfd-id-ref: vnf__1
+ vnfd-id-ref: vnf__0
- - id: public_1
- name: vnf__1 to tg__1 link 2
+ - id: downlink_0
+ name: vnf__0 to tg__0 link 2
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe1
- vnfd-id-ref: vnf__1
+ vnfd-id-ref: vnf__0
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe1
- vnfd-id-ref: tg__1
+ vnfd-id-ref: tg__0
diff --git a/samples/vnf_samples/nsut/vfw/vfw_vnf_topology_ixia.yaml b/samples/vnf_samples/nsut/vfw/vfw_vnf_topology_ixia.yaml
index 3585ba6d9..6c722d63b 100644
--- a/samples/vnf_samples/nsut/vfw/vfw_vnf_topology_ixia.yaml
+++ b/samples/vnf_samples/nsut/vfw/vfw_vnf_topology_ixia.yaml
@@ -20,31 +20,31 @@ nsd:nsd-catalog:
description: scenario with vFW VNF
constituent-vnfd:
- member-vnf-index: '1'
- vnfd-id-ref: tg__1
+ vnfd-id-ref: tg__0
VNF model: ../../vnf_descriptors/ixia_rfc2544_tpl.yaml
- member-vnf-index: '2'
- vnfd-id-ref: vnf__1
+ vnfd-id-ref: vnf__0
VNF model: ../../vnf_descriptors/vfw_vnf.yaml
vld:
- - id: private_1
- name: tg__1 to vnf__1 link 1
+ - id: uplink_0
+ name: tg__0 to vnf__0 link 1
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe0
- vnfd-id-ref: tg__1
+ vnfd-id-ref: tg__0
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe0
- vnfd-id-ref: vnf__1
+ vnfd-id-ref: vnf__0
- - id: public_1
- name: vnf__1 to tg__1 link 2
+ - id: downlink_0
+ name: vnf__0 to tg__0 link 2
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe1
- vnfd-id-ref: vnf__1
+ vnfd-id-ref: vnf__0
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe1
- vnfd-id-ref: tg__1
+ vnfd-id-ref: tg__0
diff --git a/samples/vnf_samples/nsut/vfw/vfw_vnf_topology_ixload.yaml b/samples/vnf_samples/nsut/vfw/vfw_vnf_topology_ixload.yaml
index 9e7062321..f14de0a74 100644
--- a/samples/vnf_samples/nsut/vfw/vfw_vnf_topology_ixload.yaml
+++ b/samples/vnf_samples/nsut/vfw/vfw_vnf_topology_ixload.yaml
@@ -20,31 +20,31 @@ nsd:nsd-catalog:
description: scenario with HTTP and vFW VNF
constituent-vnfd:
- member-vnf-index: '1'
- vnfd-id-ref: tg__1
+ vnfd-id-ref: tg__0
VNF model: ../../vnf_descriptors/tg_ixload.yaml
- member-vnf-index: '2'
- vnfd-id-ref: vnf__1
+ vnfd-id-ref: vnf__0
VNF model: ../../vnf_descriptors/vfw_vnf.yaml
vld:
- - id: private_1
- name: tg__1 to vnf__1 link 1
+ - id: uplink_0
+ name: tg__0 to vnf__0 link 1
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe0
- vnfd-id-ref: tg__1 # HTTP Client
+ vnfd-id-ref: tg__0 # HTTP Client
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe0
- vnfd-id-ref: vnf__1 # VNF
+ vnfd-id-ref: vnf__0 # VNF
- - id: public_1
- name: vnf__1 to tg__1 link 2
+ - id: downlink_0
+ name: vnf__0 to tg__0 link 2
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe1
- vnfd-id-ref: vnf__1 # HTTP Server
+ vnfd-id-ref: vnf__0 # HTTP Server
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe1
- vnfd-id-ref: tg__1 # VFW VNF
+ vnfd-id-ref: tg__0 # VFW VNF
diff --git a/samples/vnf_samples/nsut/vpe/ixia_traffic.cfg b/samples/vnf_samples/nsut/vpe/ixia_traffic.cfg
index cdeee6e35..a0cf372cf 100644
--- a/samples/vnf_samples/nsut/vpe/ixia_traffic.cfg
+++ b/samples/vnf_samples/nsut/vpe/ixia_traffic.cfg
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{
- "private_1": {
+ "uplink_0": {
"id": 1,
"bidir": "False",
"duration": 60,
@@ -36,7 +36,7 @@
},
"traffic_type": "continuous"
},
- "public_1": {
+ "downlink_0": {
"id": 2,
"bidir": "False",
"duration": 60,
diff --git a/samples/vnf_samples/nsut/vpe/tc_baremetal_http_ipv4_ixload.yaml b/samples/vnf_samples/nsut/vpe/tc_baremetal_http_ipv4_ixload.yaml
index a40179390..1914f1a09 100644
--- a/samples/vnf_samples/nsut/vpe/tc_baremetal_http_ipv4_ixload.yaml
+++ b/samples/vnf_samples/nsut/vpe/tc_baremetal_http_ipv4_ixload.yaml
@@ -19,18 +19,18 @@ scenarios:
traffic_profile: "../../traffic_profiles/ipv4_throughput_vpe.yaml"
topology: vpe_vnf_topology_ixload.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
framesize:
private: {64B: 100}
public: {64B: 100}
flow:
- src_ip: [{'tg__1': 'xe0'}]
- dst_ip: [{'tg__1': 'xe1'}]
+ src_ip: [{'tg__0': 'xe0'}]
+ dst_ip: [{'tg__0': 'xe1'}]
count: 1
traffic_type: 4
- vnf__1:
+ vnf__0:
nfvi_enable: True
vnf_config: vpe_config
runner:
diff --git a/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_1518B.yaml b/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_1518B.yaml
index bff9743e0..42c0de85a 100644
--- a/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_1518B.yaml
+++ b/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_1518B.yaml
@@ -19,20 +19,20 @@ scenarios:
traffic_profile: "../../traffic_profiles/ipv4_throughput_vpe.yaml"
topology: vpe_vnf_topology.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
framesize:
private: {1518B: 100}
public: {1518B: 100}
flow:
- src_ip: [{'tg__1': 'xe0'}]
- dst_ip: [{'tg__1': 'xe1'}]
+ src_ip: [{'tg__0': 'xe0'}]
+ dst_ip: [{'tg__0': 'xe1'}]
count: 1
traffic_type: 4
rfc2544:
allowed_drop_rate: 0.0001 - 0.0001
- vnf__1:
+ vnf__0:
nfvi_enable: True
vnf_config: vpe_config
runner:
diff --git a/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B.yaml b/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B.yaml
index 50874ac5c..ffb2b41ac 100644
--- a/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B.yaml
+++ b/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B.yaml
@@ -19,20 +19,20 @@ scenarios:
traffic_profile: "../../traffic_profiles/ipv4_throughput_vpe.yaml"
topology: vpe_vnf_topology.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
framesize:
private: {64B: 100}
public: {64B: 100}
flow:
- src_ip: [{'tg__1': 'xe0'}]
- dst_ip: [{'tg__1': 'xe1'}]
+ src_ip: [{'tg__0': 'xe0'}]
+ dst_ip: [{'tg__0': 'xe1'}]
count: 1
traffic_type: 4
rfc2544:
allowed_drop_rate: 0.0001 - 0.0001
- vnf__1:
+ vnf__0:
nfvi_enable: True
vnf_config: vpe_config
runner:
diff --git a/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B_ixia.yaml b/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B_ixia.yaml
index 394d07861..0d732a8de 100644
--- a/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B_ixia.yaml
+++ b/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B_ixia.yaml
@@ -19,20 +19,20 @@ scenarios:
traffic_profile: "../../traffic_profiles/ixia_ipv4_latency_vpe.yaml"
topology: vpe_vnf_topology_ixia.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
framesize:
private: {64B: 100}
public: {64B: 100}
flow:
- src_ip: [{'tg__1': 'xe0'}]
- dst_ip: [{'tg__1': 'xe1'}]
+ src_ip: [{'tg__0': 'xe0'}]
+ dst_ip: [{'tg__0': 'xe1'}]
count: 1
traffic_type: 4
rfc2544:
allowed_drop_rate: 0.0001 - 0.0001
- vnf__1:
+ vnf__0:
nfvi_enable: True
vnf_config: vpe_config
runner:
diff --git a/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B_trex_corelated_traffic.yaml b/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B_trex_corelated_traffic.yaml
index 972d58bdf..b04f6aa97 100644
--- a/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B_trex_corelated_traffic.yaml
+++ b/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B_trex_corelated_traffic.yaml
@@ -19,22 +19,22 @@ scenarios:
traffic_profile: "../../traffic_profiles/ipv4_throughput_vpe.yaml"
topology: vpe_vnf_topology-3node.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
- tg__2: trafficgen_2.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
+ tg__1: trafficgen_2.yardstick
options:
framesize:
private: {64B: 100}
public: {64B: 100}
flow:
- src_ip: [{'tg__1': 'xe0'}]
- dst_ip: [{'tg__2': 'xe0'}]
+ src_ip: [{'tg__0': 'xe0'}]
+ dst_ip: [{'tg__1': 'xe0'}]
count: 1
traffic_type: 4
rfc2544:
allowed_drop_rate: 0.0001 - 0.0001
correlated_traffic: true
- vnf__1:
+ vnf__0:
nfvi_enable: True
vnf_config: vpe_config
runner:
diff --git a/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_IMIX.yaml b/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_IMIX.yaml
index 092f068c9..8bdf39e38 100644
--- a/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_IMIX.yaml
+++ b/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_IMIX.yaml
@@ -19,21 +19,21 @@ scenarios:
traffic_profile: "../../traffic_profiles/ipv4_throughput_vpe.yaml"
topology: vpe_vnf_topology.yaml
nodes:
- tg__1: trafficgen_1.yardstick
- vnf__1: vnf.yardstick
+ tg__0: trafficgen_1.yardstick
+ vnf__0: vnf.yardstick
options:
framesize:
private: {64B: 5, 128B: 11, 256B: 16, 373B: 10, 570B: 35, 1400B: 10, 1500B: 13}
public: {64B: 5, 128B: 3, 256B: 4, 373B: 6, 570B: 8, 1400B: 36, 1500B: 38}
flow:
- src_ip: [{'tg__1': 'xe0'}]
- dst_ip: [{'tg__1': 'xe1'}]
+ src_ip: [{'tg__0': 'xe0'}]
+ dst_ip: [{'tg__0': 'xe1'}]
count: 1
traffic_type: 4
rfc2544:
allowed_drop_rate: 0.0001 - 0.0001
- vnf__1:
+ vnf__0:
nfvi_enable: True
vnf_config: vpe_config
runner:
diff --git a/samples/vnf_samples/nsut/vpe/vpe_vnf_topology-3node.yaml b/samples/vnf_samples/nsut/vpe/vpe_vnf_topology-3node.yaml
index c56a7e173..8a1d335de 100644
--- a/samples/vnf_samples/nsut/vpe/vpe_vnf_topology-3node.yaml
+++ b/samples/vnf_samples/nsut/vpe/vpe_vnf_topology-3node.yaml
@@ -20,34 +20,34 @@ nsd:nsd-catalog:
description: scenario with VPE,L3fwd and VNF
constituent-vnfd:
- member-vnf-index: '1'
- vnfd-id-ref: tg__1
+ vnfd-id-ref: tg__0
VNF model: ../../vnf_descriptors/tg_rfc2544_tpl.yaml #tg_vpe_upstream.yaml #VPE VNF
- member-vnf-index: '2'
- vnfd-id-ref: vnf__1
+ vnfd-id-ref: vnf__0
VNF model: ../../vnf_descriptors/vpe_vnf.yaml #tg_l3fwd.yaml #tg_trex_tpl.yaml #TREX
- member-vnf-index: '3'
- vnfd-id-ref: tg__2
+ vnfd-id-ref: tg__1
VNF model: ../../vnf_descriptors/udp_replay_vnf.yaml #tg_vpe_upstream.yaml #VPE VNF
vld:
- - id: private
- name: tg__1 to vnf__1 link 1
+ - id: uplink
+ name: tg__0 to vnf__0 link 1
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe0
- vnfd-id-ref: tg__1 #TREX
+ vnfd-id-ref: tg__0 #TREX
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe0
- vnfd-id-ref: vnf__1 #VNF
+ vnfd-id-ref: vnf__0 #VNF
- - id: public
- name: vnf__1 to tg__2 link 2
+ - id: downlink
+ name: vnf__0 to tg__1 link 2
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe1
- vnfd-id-ref: vnf__1 #L3fwd
+ vnfd-id-ref: vnf__0 #L3fwd
- member-vnf-index-ref: '3'
vnfd-connection-point-ref: xe0
- vnfd-id-ref: tg__2 #VPE VNF
+ vnfd-id-ref: tg__1 #VPE VNF
diff --git a/samples/vnf_samples/nsut/vpe/vpe_vnf_topology.yaml b/samples/vnf_samples/nsut/vpe/vpe_vnf_topology.yaml
index 0de4b6e79..5ad45028a 100644
--- a/samples/vnf_samples/nsut/vpe/vpe_vnf_topology.yaml
+++ b/samples/vnf_samples/nsut/vpe/vpe_vnf_topology.yaml
@@ -20,31 +20,31 @@ nsd:nsd-catalog:
description: scenario with VPE,L3fwd and VNF
constituent-vnfd:
- member-vnf-index: '1'
- vnfd-id-ref: tg__1
+ vnfd-id-ref: tg__0
VNF model: ../../vnf_descriptors/tg_rfc2544_tpl.yaml #tg_vpe_upstream.yaml #VPE VNF
- member-vnf-index: '2'
- vnfd-id-ref: vnf__1
+ vnfd-id-ref: vnf__0
VNF model: ../../vnf_descriptors/vpe_vnf.yaml #tg_l3fwd.yaml #tg_trex_tpl.yaml #TREX
vld:
- - id: private
- name: tg__1 to vnf__1 link 1
+ - id: uplink
+ name: tg__0 to vnf__0 link 1
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe0
- vnfd-id-ref: tg__1 #TREX
+ vnfd-id-ref: tg__0 #TREX
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe0
- vnfd-id-ref: vnf__1 #VNF
+ vnfd-id-ref: vnf__0 #VNF
- - id: public
- name: vnf__1 to tg__1 link 2
+ - id: downlink
+ name: vnf__0 to tg__0 link 2
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe1
- vnfd-id-ref: vnf__1 #L3fwd
+ vnfd-id-ref: vnf__0 #L3fwd
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe1
- vnfd-id-ref: tg__1 #VPE VNF
+ vnfd-id-ref: tg__0 #VPE VNF
diff --git a/samples/vnf_samples/nsut/vpe/vpe_vnf_topology_ixia.yaml b/samples/vnf_samples/nsut/vpe/vpe_vnf_topology_ixia.yaml
index 610805d3b..315a30845 100644
--- a/samples/vnf_samples/nsut/vpe/vpe_vnf_topology_ixia.yaml
+++ b/samples/vnf_samples/nsut/vpe/vpe_vnf_topology_ixia.yaml
@@ -20,31 +20,31 @@ nsd:nsd-catalog:
description: scenario with VPE,L3fwd and VNF
constituent-vnfd:
- member-vnf-index: '1'
- vnfd-id-ref: tg__1
+ vnfd-id-ref: tg__0
VNF model: ../../vnf_descriptors/ixia_rfc2544_tpl.yaml
- member-vnf-index: '2'
- vnfd-id-ref: vnf__1
+ vnfd-id-ref: vnf__0
VNF model: ../../vnf_descriptors/vpe_vnf.yaml
vld:
- - id: private
- name: tg__1 to vnf__1 link 1
+ - id: uplink
+ name: tg__0 to vnf__0 link 1
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe0
- vnfd-id-ref: tg__1 #TREX
+ vnfd-id-ref: tg__0 #TREX
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe0
- vnfd-id-ref: vnf__1 #VNF
+ vnfd-id-ref: vnf__0 #VNF
- - id: public
- name: vnf__1 to tg__1 link 2
+ - id: downlink
+ name: vnf__0 to tg__0 link 2
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe1
- vnfd-id-ref: vnf__1 #L3fwd
+ vnfd-id-ref: vnf__0 #L3fwd
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe1
- vnfd-id-ref: tg__1 #VPE VNF
+ vnfd-id-ref: tg__0 #VPE VNF
diff --git a/samples/vnf_samples/nsut/vpe/vpe_vnf_topology_ixload.yaml b/samples/vnf_samples/nsut/vpe/vpe_vnf_topology_ixload.yaml
index 5505a832b..aa1dc0d4f 100644
--- a/samples/vnf_samples/nsut/vpe/vpe_vnf_topology_ixload.yaml
+++ b/samples/vnf_samples/nsut/vpe/vpe_vnf_topology_ixload.yaml
@@ -20,31 +20,31 @@ nsd:nsd-catalog:
description: scenario with VPE,L3fwd and VNF
constituent-vnfd:
- member-vnf-index: '1'
- vnfd-id-ref: tg__1
+ vnfd-id-ref: tg__0
VNF model: ../../vnf_descriptors/tg_ixload.yaml
- member-vnf-index: '2'
- vnfd-id-ref: vnf__1
+ vnfd-id-ref: vnf__0
VNF model: ../../vnf_descriptors/vpe_vnf.yaml
vld:
- - id: private
- name: tg__1 to vnf__1 link 1
+ - id: uplink
+ name: tg__0 to vnf__0 link 1
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe0
- vnfd-id-ref: tg__1 #TREX
+ vnfd-id-ref: tg__0 #TREX
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe0
- vnfd-id-ref: vnf__1 #VNF
+ vnfd-id-ref: vnf__0 #VNF
- - id: public
- name: vnf__1 to tg__1 link 2
+ - id: downlink
+ name: vnf__0 to tg__0 link 2
type: ELAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '2'
vnfd-connection-point-ref: xe1
- vnfd-id-ref: vnf__1 #L3fwd
+ vnfd-id-ref: vnf__0 #L3fwd
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: xe1
- vnfd-id-ref: tg__1 #VPE VNF
+ vnfd-id-ref: tg__0 #VPE VNF
diff --git a/samples/vnf_samples/traffic_profiles/example.yaml b/samples/vnf_samples/traffic_profiles/example.yaml
index fc2501526..443fb88cf 100644
--- a/samples/vnf_samples/traffic_profiles/example.yaml
+++ b/samples/vnf_samples/traffic_profiles/example.yaml
@@ -150,8 +150,8 @@ public:
570B: {{get(imix_570B, 12) }}
1400B: {{get(imix_1400B, 12) }}
1518b: {{get(imix_1500B, 12) }}
- srcmac: {{get(private.ipv4_1.dst_mac}} # xe0.local_mac
- dstmac: {{get)private.ipv4_1.src_mac}} # xe0.dst_mac
+ srcmac: {{get(uplink.ipv4_1.dst_mac}} # xe0.local_mac
+ dstmac: {{get)uplink.ipv4_1.src_mac}} # xe0.dst_mac
QinQ:
S-VLAN:
id: {{ get(flow.s_vlan_range, "0") }}
@@ -166,33 +166,33 @@ public:
outer_l3v4:
proto: {{ get(flow.outer_proto, "udp") }},
- srcip4: {{ get(private.ipv4_1.outer_l3v4.dstip4) }}
- dstip4: {{ get(private.ipv4_1.outer_l3v4.srcip4) }}
+ srcip4: {{ get(uplink.ipv4_1.outer_l3v4.dstip4) }}
+ dstip4: {{ get(uplink.ipv4_1.outer_l3v4.srcip4) }}
ttl: 32
dscp: {{ get(flow.tos, 0) }}
outer_l4:
- srcport: {{ get(private.ipv4_1.outer_l4.dstport) }}
- dstport: {{ get(private.ipv4_1.outer_l4.srcport) }}
+ srcport: {{ get(uplink.ipv4_1.outer_l4.dstport) }}
+ dstport: {{ get(uplink.ipv4_1.outer_l4.srcport) }}
vni: {{ get(flow.vxlan_vni, "2345") }} #optional
inner_l2: #optional
- srcmac: {{ get(private.ipv4_1.outer_l4.inner_l2.dstmac) }}
- dstmac: {{ get(private.ipv4_1.outer_l4.inner_l2.srcmac) }}
+ srcmac: {{ get(uplink.ipv4_1.outer_l4.inner_l2.dstmac) }}
+ dstmac: {{ get(uplink.ipv4_1.outer_l4.inner_l2.srcmac) }}
inner_l3v4: #optional
proto: {{ get(flow.inner_proto, "udp") }},
- srcip4: {{ get(private.ipv4_1.inner_l3v4.dstip4) }}
- dstip4: {{ get(private.ipv4_1.inner_l3v4.srcip4) }}
+ srcip4: {{ get(uplink.ipv4_1.inner_l3v4.dstip4) }}
+ dstip4: {{ get(uplink.ipv4_1.inner_l3v4.srcip4) }}
ttl: 32
dscp: {{ get(flow.inner_tos, 0) }}
inner_l3v6:
proto: {{ get(flow.inner_proto, "udp") }},
- srcip6: {{ get(private.ipv4_1.inner_l3v6.dstip6) }}
- dstip6: {{ get(private.ipv4_1.inner_l3v6.srcip6) }}
+ srcip6: {{ get(uplink.ipv4_1.inner_l3v6.dstip6) }}
+ dstip6: {{ get(uplink.ipv4_1.inner_l3v6.srcip6) }}
ttl: 32
tc: {{ get(flow.inner_tos, 0) }}
inner_l4:
- srcport: {{ get(private.ipv4_1.inner_l4.dstport) }}
- dstport: {{ get(private.ipv4_1.inner_l4.srcport) }}
+ srcport: {{ get(uplink.ipv4_1.inner_l4.dstport) }}
+ dstport: {{ get(uplink.ipv4_1.inner_l4.srcport) }}
diff --git a/samples/vnf_samples/traffic_profiles/http_tests/HTTP_1b-requests_65000_concurrency.yaml b/samples/vnf_samples/traffic_profiles/http_tests/HTTP_1b-requests_65000_concurrency.yaml
index a7394abf1..5da20ffcc 100644
--- a/samples/vnf_samples/traffic_profiles/http_tests/HTTP_1b-requests_65000_concurrency.yaml
+++ b/samples/vnf_samples/traffic_profiles/http_tests/HTTP_1b-requests_65000_concurrency.yaml
@@ -6,7 +6,7 @@ traffic_profile:
traffic_type: TrafficProfileGenericHTTP
#http client specific values
-private_1:
+uplink_0:
http_no_requests: "1000" # number of http iterations
http_concurency: "65000" # number of threads to be run
http_locator: "/1B.bin" # http locator to be read
@@ -17,7 +17,7 @@ private_1:
attacker_tests: "False" # True : If attacker Test, False : Otherwise
#http server side
-public_1:
+downlink_0:
http_locator_image_size: "1B" # image size requested by http client
http_bind_address: "152.40.40.20" # where address is bound
http_bind_port: "9004" # when port is bound
diff --git a/samples/vnf_samples/traffic_profiles/ipv4_throughput.yaml b/samples/vnf_samples/traffic_profiles/ipv4_throughput.yaml
index 6e0c693a5..7d51122f4 100644
--- a/samples/vnf_samples/traffic_profiles/ipv4_throughput.yaml
+++ b/samples/vnf_samples/traffic_profiles/ipv4_throughput.yaml
@@ -45,24 +45,24 @@ traffic_profile:
# that specifies a range (e.g. ipv4 address, port)
-private_1:
+uplink_0:
ipv4:
outer_l2:
framesize:
- 64B: "{{ get(imix, 'imix.private.64B', '0') }}"
- 128B: "{{ get(imix, 'imix.private.128B', '0') }}"
- 256B: "{{ get(imix, 'imix.private.256B', '0') }}"
- 373b: "{{ get(imix, 'imix.private.373B', '0') }}"
- 512B: "{{ get(imix, 'imix.private.512B', '0') }}"
- 570B: "{{get(imix, 'imix.private.570B', '0') }}"
- 1400B: "{{get(imix, 'imix.private.1400B', '0') }}"
- 1500B: "{{get(imix, 'imix.private.1500B', '0') }}"
- 1518B: "{{get(imix, 'imix.private.1518B', '0') }}"
+ 64B: "{{get(imix, 'imix.uplink.64B', '0') }}"
+ 128B: "{{get(imix, 'imix.uplink.128B', '0') }}"
+ 256B: "{{get(imix, 'imix.uplink.256B', '0') }}"
+ 373B: "{{get(imix, 'imix.uplink.373B', '0') }}"
+ 512B: "{{get(imix, 'imix.uplink.512B', '0') }}"
+ 570B: "{{get(imix, 'imix.uplink.570B', '0') }}"
+ 1400B: "{{get(imix, 'imix.uplink.1400B', '0') }}"
+ 1500B: "{{get(imix, 'imix.uplink.1500B', '0') }}"
+ 1518B: "{{get(imix, 'imix.uplink.1518B', '0') }}"
outer_l3v4:
proto: "udp"
- srcip4: "{{get(flow, 'flow.src_ip_0', '1.1.1.1-1.1.255.255') }}"
- dstip4: "{{get(flow, 'flow.dst_ip_0', '90.90.1.1-90.90.255.255') }}"
+ srcip4: "{{get(flow, 'flow.src_ip_0', '10.0.2.1-10.0.2.255') }}"
+ dstip4: "{{get(flow, 'flow.dst_ip_0', '10.0.3.1-10.0.3.255') }}"
count: "{{get(flow, 'flow.count', '1') }}"
ttl: 32
dscp: 0
@@ -70,24 +70,24 @@ private_1:
srcport: "{{get(flow, 'flow.src_port_0', '1234-4321') }}"
dstport: "{{get(flow, 'flow.dst_port_0', '2001-4001') }}"
count: "{{get(flow, 'flow.count', '1') }}"
-public_1:
+downlink_0:
ipv4:
outer_l2:
framesize:
- 64B: "{{ get(imix, 'imix.public.64B', '0') }}"
- 128B: "{{ get(imix, 'imix.public.128B', '0') }}"
- 256B: "{{ get(imix, 'imix.public.256B', '0') }}"
- 373b: "{{ get(imix, 'imix.public.373B', '0') }}"
- 512B: "{{ get(imix, 'imix.public.512B', '0') }}"
- 570B: "{{get(imix, 'imix.public.570B', '0') }}"
- 1400B: "{{get(imix, 'imix.public.1400B', '0') }}"
- 1500B: "{{get(imix, 'imix.public.1500B', '0') }}"
- 1518B: "{{get(imix, 'imix.public.1518B', '0') }}"
+ 64B: "{{ get(imix, 'imix.downlink.64B', '0') }}"
+ 128B: "{{ get(imix, 'imix.downlink.128B', '0') }}"
+ 256B: "{{ get(imix, 'imix.downlink.256B', '0') }}"
+ 373b: "{{ get(imix, 'imix.downlink.373B', '0') }}"
+ 512B: "{{ get(imix, 'imix.downlink.512B', '0') }}"
+ 570B: "{{get(imix, 'imix.downlink.570B', '0') }}"
+ 1400B: "{{get(imix, 'imix.downlink.1400B', '0') }}"
+ 1500B: "{{get(imix, 'imix.downlink.1500B', '0') }}"
+ 1518B: "{{get(imix, 'imix.downlink.1518B', '0') }}"
outer_l3v4:
proto: "udp"
- srcip4: "{{get(flow, 'flow.dst_ip_0', '90.90.1.1-90.90.255.255') }}"
- dstip4: "{{get(flow, 'flow.src_ip_0', '1.1.1.1-1.1.255.255') }}"
+ srcip4: "{{get(flow, 'flow.dst_ip_0', '10.0.3.1-10.0.3.255') }}"
+ dstip4: "{{get(flow, 'flow.src_ip_0', '10.0.2.1-10.0.2.255') }}"
count: "{{get(flow, 'flow.count', '1') }}"
ttl: 32
dscp: 0
diff --git a/samples/vnf_samples/traffic_profiles/ipv4_throughput_cgnapt.yaml b/samples/vnf_samples/traffic_profiles/ipv4_throughput_cgnapt.yaml
index df04a93e5..60a78a0c6 100644
--- a/samples/vnf_samples/traffic_profiles/ipv4_throughput_cgnapt.yaml
+++ b/samples/vnf_samples/traffic_profiles/ipv4_throughput_cgnapt.yaml
@@ -45,19 +45,19 @@ traffic_profile:
# that specifies a range (e.g. ipv4 address, port)
-private_1:
+uplink_0:
ipv4:
outer_l2:
framesize:
- 64B: "{{get(imix, 'imix.private.64B', '0') }}"
- 128B: "{{get(imix, 'imix.private.128B', '0') }}"
- 256B: "{{get(imix, 'imix.private.256B', '0') }}"
- 373B: "{{get(imix, 'imix.private.373B', '0') }}"
- 512B: "{{get(imix, 'imix.private.512B', '0') }}"
- 570B: "{{get(imix, 'imix.private.570B', '0') }}"
- 1400B: "{{get(imix, 'imix.private.1400B', '0') }}"
- 1500B: "{{get(imix, 'imix.private.1500B', '0') }}"
- 1518B: "{{get(imix, 'imix.private.1518B', '0') }}"
+ 64B: "{{get(imix, 'imix.uplink.64B', '0') }}"
+ 128B: "{{get(imix, 'imix.uplink.128B', '0') }}"
+ 256B: "{{get(imix, 'imix.uplink.256B', '0') }}"
+ 373B: "{{get(imix, 'imix.uplink.373B', '0') }}"
+ 512B: "{{get(imix, 'imix.uplink.512B', '0') }}"
+ 570B: "{{get(imix, 'imix.uplink.570B', '0') }}"
+ 1400B: "{{get(imix, 'imix.uplink.1400B', '0') }}"
+ 1500B: "{{get(imix, 'imix.uplink.1500B', '0') }}"
+ 1518B: "{{get(imix, 'imix.uplink.1518B', '0') }}"
outer_l3v4:
proto: "udp"
@@ -70,19 +70,19 @@ private_1:
srcport: "{{get(flow, 'flow.src_port_0', '1234-4321') }}"
dstport: "{{get(flow, 'flow.dst_port_0', '2001-4001') }}"
count: "{{get(flow, 'flow.count', '1') }}"
-public_1:
+downlink_0:
ipv4:
outer_l2:
framesize:
- 64B: "{{ get(imix, 'imix.public.64B', '0') }}"
- 128B: "{{ get(imix, 'imix.public.128B', '0') }}"
- 256B: "{{ get(imix, 'imix.public.256B', '0') }}"
- 373b: "{{ get(imix, 'imix.public.373B', '0') }}"
- 512B: "{{ get(imix, 'imix.public.512B', '0') }}"
- 570B: "{{get(imix, 'imix.public.570B', '0') }}"
- 1400B: "{{get(imix, 'imix.public.1400B', '0') }}"
- 1500B: "{{get(imix, 'imix.public.1500B', '0') }}"
- 1518B: "{{get(imix, 'imix.public.1518B', '0') }}"
+ 64B: "{{ get(imix, 'imix.downlink.64B', '0') }}"
+ 128B: "{{ get(imix, 'imix.downlink.128B', '0') }}"
+ 256B: "{{ get(imix, 'imix.downlink.256B', '0') }}"
+ 373b: "{{ get(imix, 'imix.downlink.373B', '0') }}"
+ 512B: "{{ get(imix, 'imix.downlink.512B', '0') }}"
+ 570B: "{{get(imix, 'imix.downlink.570B', '0') }}"
+ 1400B: "{{get(imix, 'imix.downlink.1400B', '0') }}"
+ 1500B: "{{get(imix, 'imix.downlink.1500B', '0') }}"
+ 1518B: "{{get(imix, 'imix.downlink.1518B', '0') }}"
outer_l3v4:
proto: "udp"
diff --git a/samples/vnf_samples/traffic_profiles/ipv4_throughput_vpe.yaml b/samples/vnf_samples/traffic_profiles/ipv4_throughput_vpe.yaml
index da9bc40da..f42db932c 100644
--- a/samples/vnf_samples/traffic_profiles/ipv4_throughput_vpe.yaml
+++ b/samples/vnf_samples/traffic_profiles/ipv4_throughput_vpe.yaml
@@ -45,19 +45,19 @@ traffic_profile:
# that specifies a range (e.g. ipv4 address, port)
-private_1:
+uplink_0:
ipv4:
outer_l2:
framesize:
- 64B: "{{ get(imix, 'imix.private.64B', '0') }}"
- 128B: "{{ get(imix, 'imix.private.128B', '0') }}"
- 256B: "{{ get(imix, 'imix.private.256B', '0') }}"
- 373b: "{{ get(imix, 'imix.private.373B', '0') }}"
- 512B: "{{ get(imix, 'imix.private.512B', '0') }}"
- 570B: "{{get(imix, 'imix.private.570B', '0') }}"
- 1400B: "{{get(imix, 'imix.private.1400B', '0') }}"
- 1500B: "{{get(imix, 'imix.private.1500B', '0') }}"
- 1518B: "{{get(imix, 'imix.private.1518B', '0') }}"
+ 64B: "{{ get(imix, 'imix.uplink.64B', '0') }}"
+ 128B: "{{ get(imix, 'imix.uplink.128B', '0') }}"
+ 256B: "{{ get(imix, 'imix.uplink.256B', '0') }}"
+ 373b: "{{ get(imix, 'imix.uplink.373B', '0') }}"
+ 512B: "{{ get(imix, 'imix.uplink.512B', '0') }}"
+ 570B: "{{get(imix, 'imix.uplink.570B', '0') }}"
+ 1400B: "{{get(imix, 'imix.uplink.1400B', '0') }}"
+ 1500B: "{{get(imix, 'imix.uplink.1500B', '0') }}"
+ 1518B: "{{get(imix, 'imix.uplink.1518B', '0') }}"
QinQ:
S-VLAN:
@@ -81,17 +81,17 @@ private_1:
srcport: "{{get(flow, 'flow.src_port_0', '0') }}"
dstport: "{{get(flow, 'flow.dst_port_0', '0') }}"
count: "{{get(flow, 'flow.count', '1') }}"
-public_1:
+downlink_0:
ipv4:
outer_l2:
framesize:
- 64B: "{{ get(imix, 'imix.private.imix_small', '0') }}"
- 128B: "{{ get(imix, 'imix.private.imix_128B', '0') }}"
- 256B: "{{ get(imix, 'imix.private.imix_256B', '0') }}"
- 373b: "{{ get(imix, 'imix.private.imix_373B', '0') }}"
- 570B: "{{get(imix, 'imix.private.imix_570B', '0') }}"
- 1400B: "{{get(imix, 'imix.private.imix_1400B', '0') }}"
- 1518B: "{{get(imix, 'imix.private.imix_1500B', '0') }}"
+ 64B: "{{ get(imix, 'imix.uplink.imix_small', '0') }}"
+ 128B: "{{ get(imix, 'imix.uplink.imix_128B', '0') }}"
+ 256B: "{{ get(imix, 'imix.uplink.imix_256B', '0') }}"
+ 373b: "{{ get(imix, 'imix.uplink.imix_373B', '0') }}"
+ 570B: "{{get(imix, 'imix.uplink.imix_570B', '0') }}"
+ 1400B: "{{get(imix, 'imix.uplink.imix_1400B', '0') }}"
+ 1518B: "{{get(imix, 'imix.uplink.imix_1500B', '0') }}"
outer_l3v4:
proto: "tcp"
@@ -105,19 +105,19 @@ public_1:
srcport: "{{get(flow, 'flow.dst_port_0', '0') }}"
dstport: "{{get(flow, 'flow.src_port_0', '0') }}"
count: "{{get(flow, 'flow.count', '1') }}"
-private_2:
+uplink_1:
ipv4:
outer_l2:
framesize:
- 64B: "{{ get(imix, 'imix.public.64B', '0') }}"
- 128B: "{{ get(imix, 'imix.public.128B', '0') }}"
- 256B: "{{ get(imix, 'imix.public.256B', '0') }}"
- 373b: "{{ get(imix, 'imix.public.373B', '0') }}"
- 512B: "{{ get(imix, 'imix.public.512B', '0') }}"
- 570B: "{{get(imix, 'imix.public.570B', '0') }}"
- 1400B: "{{get(imix, 'imix.public.1400B', '0') }}"
- 1500B: "{{get(imix, 'imix.public.1500B', '0') }}"
- 1518B: "{{get(imix, 'imix.public.1518B', '0') }}"
+ 64B: "{{ get(imix, 'imix.downlink.64B', '0') }}"
+ 128B: "{{ get(imix, 'imix.downlink.128B', '0') }}"
+ 256B: "{{ get(imix, 'imix.downlink.256B', '0') }}"
+ 373b: "{{ get(imix, 'imix.downlink.373B', '0') }}"
+ 512B: "{{ get(imix, 'imix.downlink.512B', '0') }}"
+ 570B: "{{get(imix, 'imix.downlink.570B', '0') }}"
+ 1400B: "{{get(imix, 'imix.downlink.1400B', '0') }}"
+ 1500B: "{{get(imix, 'imix.downlink.1500B', '0') }}"
+ 1518B: "{{get(imix, 'imix.downlink.1518B', '0') }}"
QinQ:
S-VLAN:
@@ -141,17 +141,17 @@ private_2:
srcport: "{{get(flow, 'flow.src_port1', '0') }}"
dstport: "{{get(flow, 'flow.dst_port1', '0') }}"
count: "{{get(flow, 'flow.count', '1') }}"
-public_2:
+downlink_1:
ipv4:
outer_l2:
framesize:
- 64B: "{{ get(imix, 'imix.private.imix_small', '0') }}"
- 128B: "{{ get(imix, 'imix.private.imix_128B', '0') }}"
- 256B: "{{ get(imix, 'imix.private.imix_256B', '0') }}"
- 373b: "{{ get(imix, 'imix.private.imix_373B', '0') }}"
- 570B: "{{get(imix, 'imix.private.imix_570B', '0') }}"
- 1400B: "{{get(imix, 'imix.private.imix_1400B', '0') }}"
- 1518B: "{{get(imix, 'imix.private.imix_1500B', '0') }}"
+ 64B: "{{ get(imix, 'imix.uplink.imix_small', '0') }}"
+ 128B: "{{ get(imix, 'imix.uplink.imix_128B', '0') }}"
+ 256B: "{{ get(imix, 'imix.uplink.imix_256B', '0') }}"
+ 373b: "{{ get(imix, 'imix.uplink.imix_373B', '0') }}"
+ 570B: "{{get(imix, 'imix.uplink.imix_570B', '0') }}"
+ 1400B: "{{get(imix, 'imix.uplink.imix_1400B', '0') }}"
+ 1518B: "{{get(imix, 'imix.uplink.imix_1500B', '0') }}"
outer_l3v4:
proto: "tcp"
diff --git a/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency.yaml b/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency.yaml
index a008eb353..af74df2c9 100644
--- a/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency.yaml
+++ b/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency.yaml
@@ -31,19 +31,19 @@ traffic_profile:
# that specifies a range (e.g. ipv4 address, port)
-private_1:
+uplink_0:
ipv4:
outer_l2:
framesize:
- 64B: "{{get(imix, 'imix.private.64B', '0') }}"
- 128B: "{{get(imix, 'imix.private.128B', '0') }}"
- 256B: "{{get(imix, 'imix.private.256B', '0') }}"
- 373b: "{{get(imix, 'imix.private.373B', '0') }}"
- 512B: "{{get(imix, 'imix.private.512B', '0') }}"
- 570B: "{{get(imix, 'imix.private.570B', '0') }}"
- 1400B: "{{get(imix, 'imix.private.1400B', '0') }}"
- 1500B: "{{get(imix, 'imix.private.1500B', '0') }}"
- 1518B: "{{get(imix, 'imix.private.1518B', '0') }}"
+ 64B: "{{get(imix, 'imix.uplink.64B', '0') }}"
+ 128B: "{{get(imix, 'imix.uplink.128B', '0') }}"
+ 256B: "{{get(imix, 'imix.uplink.256B', '0') }}"
+ 373b: "{{get(imix, 'imix.uplink.373B', '0') }}"
+ 512B: "{{get(imix, 'imix.uplink.512B', '0') }}"
+ 570B: "{{get(imix, 'imix.uplink.570B', '0') }}"
+ 1400B: "{{get(imix, 'imix.uplink.1400B', '0') }}"
+ 1500B: "{{get(imix, 'imix.uplink.1500B', '0') }}"
+ 1518B: "{{get(imix, 'imix.uplink.1518B', '0') }}"
outer_l3v4:
proto: "udp"
@@ -56,19 +56,19 @@ private_1:
srcport: "{{get(flow, 'flow.src_port_0', '1234') }}"
dstport: "{{get(flow, 'flow.dst_port_0', '2001') }}"
count: "{{get(flow, 'flow.count', '1') }}"
-public_1:
+downlink_0:
ipv4:
outer_l2:
framesize:
- 64B: "{{get(imix, 'imix.public.64B', '0') }}"
- 128B: "{{get(imix, 'imix.public.128B', '0') }}"
- 256B: "{{get(imix, 'imix.public.256B', '0') }}"
- 373b: "{{get(imix, 'imix.public.373B', '0') }}"
- 512B: "{{get(imix, 'imix.public.512B', '0') }}"
- 570B: "{{get(imix, 'imix.public.570B', '0') }}"
- 1400B: "{{get(imix, 'imix.public.1400B', '0') }}"
- 1500B: "{{get(imix, 'imix.public.1500B', '0') }}"
- 1518B: "{{get(imix, 'imix.public.1518B', '0') }}"
+ 64B: "{{get(imix, 'imix.downlink.64B', '0') }}"
+ 128B: "{{get(imix, 'imix.downlink.128B', '0') }}"
+ 256B: "{{get(imix, 'imix.downlink.256B', '0') }}"
+ 373b: "{{get(imix, 'imix.downlink.373B', '0') }}"
+ 512B: "{{get(imix, 'imix.downlink.512B', '0') }}"
+ 570B: "{{get(imix, 'imix.downlink.570B', '0') }}"
+ 1400B: "{{get(imix, 'imix.downlink.1400B', '0') }}"
+ 1500B: "{{get(imix, 'imix.downlink.1500B', '0') }}"
+ 1518B: "{{get(imix, 'imix.downlink.1518B', '0') }}"
outer_l3v4:
proto: "udp"
@@ -81,19 +81,19 @@ public_1:
srcport: "{{get(flow, 'flow.src_port_0', '1234') }}"
dstport: "{{get(flow, 'flow.dst_port_0', '2001') }}"
count: "{{get(flow, 'flow.count', '1') }}"
-private_2:
+uplink_1:
ipv4:
outer_l2:
framesize:
- 64B: "{{get(imix, 'imix.private.64B', '0') }}"
- 128B: "{{get(imix, 'imix.private.128B', '0') }}"
- 256B: "{{get(imix, 'imix.private.256B', '0') }}"
- 373b: "{{get(imix, 'imix.private.373B', '0') }}"
- 512B: "{{get(imix, 'imix.private.512B', '0') }}"
- 570B: "{{get(imix, 'imix.private.570B', '0') }}"
- 1400B: "{{get(imix, 'imix.private.1400B', '0') }}"
- 1500B: "{{get(imix, 'imix.private.1500B', '0') }}"
- 1518B: "{{get(imix, 'imix.private.1518B', '0') }}"
+ 64B: "{{get(imix, 'imix.uplink.64B', '0') }}"
+ 128B: "{{get(imix, 'imix.uplink.128B', '0') }}"
+ 256B: "{{get(imix, 'imix.uplink.256B', '0') }}"
+ 373b: "{{get(imix, 'imix.uplink.373B', '0') }}"
+ 512B: "{{get(imix, 'imix.uplink.512B', '0') }}"
+ 570B: "{{get(imix, 'imix.uplink.570B', '0') }}"
+ 1400B: "{{get(imix, 'imix.uplink.1400B', '0') }}"
+ 1500B: "{{get(imix, 'imix.uplink.1500B', '0') }}"
+ 1518B: "{{get(imix, 'imix.uplink.1518B', '0') }}"
outer_l3v4:
proto: "udp"
@@ -106,19 +106,19 @@ private_2:
srcport: "{{get(flow, 'flow.src_port1', '1234') }}"
dstport: "{{get(flow, 'flow.dst_port1', '2001') }}"
count: "{{get(flow, 'flow.count', '1') }}"
-public_2:
+downlink_1:
ipv4:
outer_l2:
framesize:
- 64B: "{{get(imix, 'imix.public.64B', '0') }}"
- 128B: "{{get(imix, 'imix.public.128B', '0') }}"
- 256B: "{{get(imix, 'imix.public.256B', '0') }}"
- 373b: "{{get(imix, 'imix.public.373B', '0') }}"
- 512B: "{{get(imix, 'imix.public.512B', '0') }}"
- 570B: "{{get(imix, 'imix.public.570B', '0') }}"
- 1400B: "{{get(imix, 'imix.public.1400B', '0') }}"
- 1500B: "{{get(imix, 'imix.public.1500B', '0') }}"
- 1518B: "{{get(imix, 'imix.public.1518B', '0') }}"
+ 64B: "{{get(imix, 'imix.downlink.64B', '0') }}"
+ 128B: "{{get(imix, 'imix.downlink.128B', '0') }}"
+ 256B: "{{get(imix, 'imix.downlink.256B', '0') }}"
+ 373b: "{{get(imix, 'imix.downlink.373B', '0') }}"
+ 512B: "{{get(imix, 'imix.downlink.512B', '0') }}"
+ 570B: "{{get(imix, 'imix.downlink.570B', '0') }}"
+ 1400B: "{{get(imix, 'imix.downlink.1400B', '0') }}"
+ 1500B: "{{get(imix, 'imix.downlink.1500B', '0') }}"
+ 1518B: "{{get(imix, 'imix.downlink.1518B', '0') }}"
outer_l3v4:
proto: "udp"
diff --git a/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_vpe.yaml b/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_vpe.yaml
index 7ca2f1043..5cce5941e 100644
--- a/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_vpe.yaml
+++ b/samples/vnf_samples/traffic_profiles/ixia_ipv4_latency_vpe.yaml
@@ -44,17 +44,17 @@ traffic_profile:
frame_rate : 100 # pc of linerate
# that specifies a range (e.g. ipv4 address, port)
-private_1:
+uplink_0:
ipv4:
outer_l2:
framesize:
- 64B: "{{ get(imix, 'imix.private.imix_small', '0') }}"
- 128B: "{{ get(imix, 'imix.private.imix_128B', '0') }}"
- 256B: "{{ get(imix, 'imix.private.imix_256B', '0') }}"
- 373b: "{{ get(imix, 'imix.private.imix_373B', '0') }}"
- 570B: "{{get(imix, 'imix.private.imix_570B', '0') }}"
- 1400B: "{{get(imix, 'imix.private.imix_1400B', '0') }}"
- 1518B: "{{get(imix, 'imix.private.imix_1500B', '0') }}"
+ 64B: "{{ get(imix, 'imix.uplink.imix_small', '0') }}"
+ 128B: "{{ get(imix, 'imix.uplink.imix_128B', '0') }}"
+ 256B: "{{ get(imix, 'imix.uplink.imix_256B', '0') }}"
+ 373b: "{{ get(imix, 'imix.uplink.imix_373B', '0') }}"
+ 570B: "{{get(imix, 'imix.uplink.imix_570B', '0') }}"
+ 1400B: "{{get(imix, 'imix.uplink.imix_1400B', '0') }}"
+ 1518B: "{{get(imix, 'imix.uplink.imix_1500B', '0') }}"
QinQ:
S-VLAN:
@@ -78,17 +78,17 @@ private_1:
srcport: "{{get(flow, 'flow.src_port_0', '0') }}"
dstport: "{{get(flow, 'flow.dst_port_0', '0') }}"
count: "{{get(flow, 'flow.count', '1') }}"
-public_1:
+downlink_0:
ipv4:
outer_l2:
framesize:
- 64B: "{{ get(imix, 'imix.private.imix_small', '0') }}"
- 128B: "{{ get(imix, 'imix.private.imix_128B', '0') }}"
- 256B: "{{ get(imix, 'imix.private.imix_256B', '0') }}"
- 373b: "{{ get(imix, 'imix.private.imix_373B', '0') }}"
- 570B: "{{get(imix, 'imix.private.imix_570B', '0') }}"
- 1400B: "{{get(imix, 'imix.private.imix_1400B', '0') }}"
- 1518B: "{{get(imix, 'imix.private.imix_1500B', '0') }}"
+ 64B: "{{ get(imix, 'imix.uplink.imix_small', '0') }}"
+ 128B: "{{ get(imix, 'imix.uplink.imix_128B', '0') }}"
+ 256B: "{{ get(imix, 'imix.uplink.imix_256B', '0') }}"
+ 373b: "{{ get(imix, 'imix.uplink.imix_373B', '0') }}"
+ 570B: "{{get(imix, 'imix.uplink.imix_570B', '0') }}"
+ 1400B: "{{get(imix, 'imix.uplink.imix_1400B', '0') }}"
+ 1518B: "{{get(imix, 'imix.uplink.imix_1500B', '0') }}"
outer_l3v4:
proto: "tcp"
@@ -102,17 +102,17 @@ public_1:
srcport: "{{get(flow, 'flow.dst_port_0', '0') }}"
dstport: "{{get(flow, 'flow.src_port_0', '0') }}"
count: "{{get(flow, 'flow.count', '1') }}"
-private_2:
+uplink_1:
ipv4:
outer_l2:
framesize:
- 64B: "{{ get(imix, 'imix.private.imix_small', '0') }}"
- 128B: "{{ get(imix, 'imix.private.imix_128B', '0') }}"
- 256B: "{{ get(imix, 'imix.private.imix_256B', '0') }}"
- 373b: "{{ get(imix, 'imix.private.imix_373B', '0') }}"
- 570B: "{{get(imix, 'imix.private.imix_570B', '0') }}"
- 1400B: "{{get(imix, 'imix.private.imix_1400B', '0') }}"
- 1518B: "{{get(imix, 'imix.private.imix_1500B', '0') }}"
+ 64B: "{{ get(imix, 'imix.uplink.imix_small', '0') }}"
+ 128B: "{{ get(imix, 'imix.uplink.imix_128B', '0') }}"
+ 256B: "{{ get(imix, 'imix.uplink.imix_256B', '0') }}"
+ 373b: "{{ get(imix, 'imix.uplink.imix_373B', '0') }}"
+ 570B: "{{get(imix, 'imix.uplink.imix_570B', '0') }}"
+ 1400B: "{{get(imix, 'imix.uplink.imix_1400B', '0') }}"
+ 1518B: "{{get(imix, 'imix.uplink.imix_1500B', '0') }}"
QinQ:
S-VLAN:
@@ -135,17 +135,17 @@ private_2:
srcport: "{{get(flow, 'flow.src_port1', '0') }}"
dstport: "{{get(flow, 'flow.dst_port1', '0') }}"
count: "{{get(flow, 'flow.count', '1') }}"
-public_2:
+downlink_1:
ipv4:
outer_l2:
framesize:
- 64B: "{{ get(imix, 'imix.private.imix_small', '0') }}"
- 128B: "{{ get(imix, 'imix.private.imix_128B', '0') }}"
- 256B: "{{ get(imix, 'imix.private.imix_256B', '0') }}"
- 373b: "{{ get(imix, 'imix.private.imix_373B', '0') }}"
- 570B: "{{get(imix, 'imix.private.imix_570B', '0') }}"
- 1400B: "{{get(imix, 'imix.private.imix_1400B', '0') }}"
- 1518B: "{{get(imix, 'imix.private.imix_1500B', '0') }}"
+ 64B: "{{ get(imix, 'imix.uplink.imix_small', '0') }}"
+ 128B: "{{ get(imix, 'imix.uplink.imix_128B', '0') }}"
+ 256B: "{{ get(imix, 'imix.uplink.imix_256B', '0') }}"
+ 373b: "{{ get(imix, 'imix.uplink.imix_373B', '0') }}"
+ 570B: "{{get(imix, 'imix.uplink.imix_570B', '0') }}"
+ 1400B: "{{get(imix, 'imix.uplink.imix_1400B', '0') }}"
+ 1518B: "{{get(imix, 'imix.uplink.imix_1500B', '0') }}"
outer_l3v4:
proto: "tcp"