Fix configuration files according to the last working configuration in Montreal testbed

Change-Id: Icd4d56de8bd60b2b4333459ce8669363ba54a33b
Signed-off-by: user <user@TRAFCLASS-PACKET1.fuel.local>
(cherry picked from commit cd5baa32609687c3ae8acd4b19dbb10cd0bd47ff)

6 files changed, 77 insertions, 52 deletions

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc006.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc006.yaml
index 94d52c350..8b21c5bf1 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc006.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc006.yaml
@@ -7,14 +7,14 @@ scenarios:
 
   options:
     packet_size: 1280
-    vlan_sender: 2025
-    vlan_receiver: 2021
-    default_net_name: net04
-    default_subnet_name: net04__subnet
-    vlan_net_1_name: apexlake_inbound_net
-    vlan_subnet_1_name: inbound_sub
-    vlan_net_2_name: apexlake_outbound_net
-    vlan_subnet_2_name: outbound_sub
+    vlan_sender: 2033
+    vlan_receiver: 2040
+    default_net_name: management_network
+    default_subnet_name: management_subnet
+    vlan_net_1_name: apexlake_inbound_network
+    vlan_subnet_1_name: apexlake_inbound_subnet
+    vlan_net_2_name: apexlake_outbound_network
+    vlan_subnet_2_name: apexlake_outbound_subnet
     vnic_type: direct
     vtc_flavor: m1.large
 
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc007.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc007.yaml
index 0cd0a04d4..107c28d1d 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc007.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc007.yaml
@@ -10,15 +10,15 @@ scenarios:
 
   options:
     packet_size: 1280
-    vlan_sender: 2025
-    vlan_receiver: 2021
-    default_net_name: net04
-    default_subnet_name: net04__subnet
-    vlan_net_1_name: apexlake_inbound_net
-    vlan_subnet_1_name: inbound_sub
-    vlan_net_2_name: apexlake_outbound_net
-    vlan_subnet_2_name: outbound_sub
-    vnic_type: direct # [normal (OvS), direct (SR-IOV)]
+    vlan_sender: 2033
+    vlan_receiver: 2040
+    default_net_name: management_network
+    default_subnet_name: management_subnet
+    vlan_net_1_name: apexlake_inbound_network
+    vlan_subnet_1_name: apexlake_inbound_subnet
+    vlan_net_2_name: apexlake_outbound_network
+    vlan_subnet_2_name: apexlake_outbound_subnet
+    vnic_type: direct
     vtc_flavor: m1.large
     num_of_neighbours: 2
     amount_of_ram: 1G
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc020.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc020.yaml
index 13beeffdb..7e5756001 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc020.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc020.yaml
@@ -6,15 +6,15 @@ scenarios:
   type: vtc_instantiation_validation
 
   options:
-    vlan_sender: 2025
-    vlan_receiver: 2021
-    default_net_name: net04
-    default_subnet_name: net04__subnet
-    vlan_net_1_name: apexlake_inbound_net
-    vlan_subnet_1_name: inbound_sub
-    vlan_net_2_name: apexlake_outbound_net
-    vlan_subnet_2_name: outbound_sub
-    vnic_type: direct # [normal (OvS), direct (SR-IOV)]
+    vlan_sender: 2033
+    vlan_receiver: 2040
+    default_net_name: management_network
+    default_subnet_name: management_subnet
+    vlan_net_1_name: apexlake_inbound_network
+    vlan_subnet_1_name: apexlake_inbound_subnet
+    vlan_net_2_name: apexlake_outbound_network
+    vlan_subnet_2_name: apexlake_outbound_subnet
+    vnic_type: direct
     vtc_flavor: m1.large
 
   runner:
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc021.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc021.yaml
index be410dfe2..769d75618 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc021.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc021.yaml
@@ -6,15 +6,15 @@ scenarios:
   type: vtc_instantiation_validation_noisy
 
   options:
-    vlan_sender: 2025
-    vlan_receiver: 2021
-    default_net_name: net04
-    default_subnet_name: net04__subnet
-    vlan_net_1_name: apexlake_inbound_net
-    vlan_subnet_1_name: inbound_sub
-    vlan_net_2_name: apexlake_outbound_net
-    vlan_subnet_2_name: outbound_sub
-    vnic_type: direct # [normal (OvS), direct (SR-IOV)]
+    vlan_sender: 2033
+    vlan_receiver: 2040
+    default_net_name: management_network
+    default_subnet_name: management_subnet
+    vlan_net_1_name: apexlake_inbound_network
+    vlan_subnet_1_name: apexlake_inbound_subnet
+    vlan_net_2_name: apexlake_outbound_network
+    vlan_subnet_2_name: apexlake_outbound_subnet
+    vnic_type: direct
     vtc_flavor: m1.large
     num_of_neighbours: 2
     amount_of_ram: 1G
diff --git a/yardstick/vTC/apexlake/README.rst b/yardstick/vTC/apexlake/README.rst
index 38c838494..956186a8e 100644
--- a/yardstick/vTC/apexlake/README.rst
+++ b/yardstick/vTC/apexlake/README.rst
@@ -1,6 +1,7 @@
 .. _DPDK: http://dpdk.org/doc/nics
 .. _DPDK-pktgen: https://github.com/Pktgen/Pktgen-DPDK/
 .. _SRIOV: https://wiki.openstack.org/wiki/SR-IOV-Passthrough-For-Networking
+.. _PORTSEC: https://wiki.openstack.org/wiki/Neutron/ML2PortSecurityExtensionDriver
 
 ===========================
 Apexlake installation guide
@@ -53,13 +54,25 @@ After entering into the apexlake directory, it is sufficient to run the followin
 
     python setup.py install
 
+Since some elements are copied into the /tmp directory (see configuration file) it could be necessary
+to repeat this step after a reboot of the host.
+
 3. Source OpenStack openrc file.
 
 ::
 
     source openrc
 
-4. Create 2 Networks based on VLANs in Neutron.
+4. Configure Openstack Neutron
+
+In order to support traffic generation and management by the virtual Traffic Classifier, 
+the configuration of the port security driver extension is required for Neutron.
+For further details please follow the following link: PORTSEC_
+This step can be skipped in case the target OpenStack is Juno or Kilo release, 
+but it is required to support Liberty.
+It is therefore required to indicate the release version in the configuration file apexlake.conf.
+
+5. Create 2 Networks based on VLANs in Neutron.
 
 In order for the network communication between the packet generator and the Compute node to
 work fine, it is required to create through Neutron two networks and map those on the VLAN IDs
@@ -67,29 +80,40 @@ that have been previously used for the configuration on the physical switch.
 The underlying switch needs to be configured accordingly.
 ::
 
-    VLAN_1=2025
-    VLAN_2=2021
+    VLAN_1=2032
+    VLAN_2=2033
+    PHYSNET=physnet2
     neutron net-create apexlake_inbound_network \
             --provider:network_type vlan \
             --provider:segmentation_id $VLAN_1 \
-            --provider:physical_network physnet1
+            --provider:physical_network $PHYSNET
 
     neutron subnet-create apexlake_inbound_network \
             192.168.0.0/24 --name apexlake_inbound_subnet
 
     neutron net-create apexlake_outbound_network \
             --provider:network_type vlan \
-            --provider:physical_network physnet1
-
-    neutron net-create apexlake_inbound_network \
-            --provider:network_type vlan \
             --provider:segmentation_id $VLAN_2 \
-            --provider:physical_network physnet1
+            --provider:physical_network $PHYSNET
 
     neutron subnet-create apexlake_outbound_network 192.168.1.0/24 \
             --name apexlake_outbound_subnet
 
-5. Configure the Test Cases.
+6. Download Ubuntu Cloud Image and load it on Glance
+
+The virtual Traffic Classifier is supported on top of Ubuntu 14.04 cloud image.
+The image can be downloaded on the local machine and loaded on Glance using the following commands:
+::
+
+    wget cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img
+    glance image-create \
+            --name ubuntu1404 \
+            --is-public true \
+            --disk-format qcow \
+            --container-format bare \
+            --file trusty-server-cloudimg-amd64-disk1.img
+
+7. Configure the Test Cases.
 
 The VLAN tags are also required into the test case Yardstick yaml file as parameters the following test cases:
     - TC 006
@@ -171,6 +195,7 @@ In the following a list of commands to be ran to download and install smroute is
     cd ~
     git clone https://github.com/troglobit/smcroute.git
     cd smcroute
+    git reset --hard c3f5c56
     sed -i 's/aclocal-1.11/aclocal/g' ./autogen.sh
     sed -i 's/automake-1.11/automake/g' ./autogen.sh
     ./autogen.sh
@@ -179,6 +204,7 @@ In the following a list of commands to be ran to download and install smroute is
     sudo make install
     cd ..
 
+It is important to do the reset to the specified commit ID.
 It is also required to create a configuration file using the following command:
 
     SMCROUTE_NIC=(name of the nic)
diff --git a/yardstick/vTC/apexlake/apexlake.conf b/yardstick/vTC/apexlake/apexlake.conf
index 558bd63f3..826e3daca 100644
--- a/yardstick/vTC/apexlake/apexlake.conf
+++ b/yardstick/vTC/apexlake/apexlake.conf
@@ -1,5 +1,5 @@
 [General]
-debug = true
+debug = false
 
 
 [OpenStack]
@@ -7,20 +7,20 @@ debug = true
 #release = kilo
 release = liberty
 
-
 [PacketGen]
 packet_generator = dpdk_pktgen
-pktgen_directory = /root/programs/Pktgen-DPDK/dpdk/examples/pktgen/
-dpdk_directory = /root/programs/Pktgen-DPDK/dpdk/
+pktgen_directory = /home/user/IntelLabs/benchmarking-framework/experimental_framework/libraries/pktgen-2.9.5/
+dpdk_directory = /home/user/IntelLabs/benchmarking-framework/experimental_framework/libraries/dpdk-2.1.0/
 program_name = app/app/x86_64-native-linuxapp-gcc/pktgen
 coremask = 1f
 memory_channels = 3
-bus_slot_nic_1 = 01:00.0
-bus_slot_nic_2 = 01:00.1
+bus_slot_nic_1 = 21:00.0
+bus_slot_nic_2 = 21:00.1
 name_if_1 = p2p1
 name_if_2 = p2p2
 
 
+
 [Experiment-VNF]
 
 
@@ -34,4 +34,3 @@ influxdb_db_name = database
 
 
 [Testcase-parameters]
-