Merge "Assign static IP to VM for standalone context"

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 71ce6b5..eeeeabc 100644 (file)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -26,7 +26,7 @@ ENV YARDSTICK_REPO_DIR="${REPOS_DIR}/yardstick/" \
 
 RUN apt-get update && apt-get install -y git python python-setuptools python-pip iputils-ping && apt-get -y autoremove && apt-get clean
 RUN easy_install -U setuptools==30.0.0
-RUN pip install appdirs==1.4.0 pyopenssl==17.5.0 python-openstackclient==3.12.0 python-heatclient==1.11.0 ansible==2.5.5
+RUN pip install appdirs==1.4.0 pyopenssl==17.5.0 openstacksdk==0.9.17 python-openstackclient==3.12.1 python-heatclient==1.11.1 ansible==2.4.2
 
 RUN mkdir -p ${REPOS_DIR}
 

diff --git a/docker/Dockerfile.aarch64.patch b/docker/Dockerfile.aarch64.patch
index 2e2808e..a6909ee 100644 (file)
--- a/docker/Dockerfile.aarch64.patch
+++ b/docker/Dockerfile.aarch64.patch
@@ -31,7 +31,7 @@ index 71ce6b58..fce7c116 100644
 +RUN apt-get update && apt-get install -y git python python-setuptools python-pip iputils-ping && apt-get -y autoremove && \
 +    apt-get install -y libssl-dev && apt-get -y install libffi-dev && apt-get clean
  RUN easy_install -U setuptools==30.0.0
- RUN pip install appdirs==1.4.0 pyopenssl==17.5.0 python-openstackclient==3.12.0 python-heatclient==1.11.0 ansible==2.5.5
+ RUN pip install appdirs==1.4.0 pyopenssl==17.5.0 openstacksdk==0.9.17 python-openstackclient==3.12.1 python-heatclient==1.11.1 ansible==2.4.2
 
 @@ -40,7 +41,8 @@ RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/yardstick ${Y
  RUN git clone --depth 1 https://gerrit.opnfv.org/gerrit/releng ${RELENG_REPO_DIR}

diff --git a/docs/testing/user/userguide/13-nsb-installation.rst b/docs/testing/user/userguide/13-nsb-installation.rst
index 3e0ed0b..fb68fbf 100644 (file)
--- a/docs/testing/user/userguide/13-nsb-installation.rst
+++ b/docs/testing/user/userguide/13-nsb-installation.rst
@@ -118,7 +118,7 @@ Ansible:
 
 .. code-block:: ini
 
-  cat ./ansible/yardstick-install-inventory.ini
+  cat ./ansible/install-inventory.ini
   [jumphost]
   localhost  ansible_connection=local
 
@@ -138,7 +138,7 @@ Ansible:
 .. note::
 
    SSH access without password needs to be configured for all your nodes defined in
-   ``yardstick-install-inventory.ini`` file.
+   ``install-inventory.ini`` file.
    If you want to use password authentication you need to install sshpass
 
    .. code-block:: console
@@ -352,18 +352,53 @@ SR-IOV
 SR-IOV Pre-requisites
 ^^^^^^^^^^^^^^^^^^^^^
 
-On Host:
- a) Create a bridge for VM to connect to external network
+On Host, where VM is created:
+ a) Create and configure a bridge named ``br-int`` for VM to connect to external network.
+    Currently this can be done using VXLAN tunnel.
+
+    Execute the following on host, where VM is created:
 
   .. code-block:: console
 
+      ip link add type vxlan remote <Jumphost IP> local <DUT IP> id <ID: 10> dstport 4789
       brctl addbr br-int
-      brctl addif br-int <interface_name>    #This interface is connected to internet
+      brctl addif br-int vxlan0
+      ip link set dev vxlan0 up
+      ip addr add <IP#1, like: 172.20.2.1/24> dev br-int
+      ip link set dev br-int up
+
+  .. note:: May be needed to add extra rules to iptable to forward traffic.
+
+  .. code-block:: console
+
+    iptables -A FORWARD -i br-int -s <network ip address>/<netmask> -j ACCEPT
+    iptables -A FORWARD -o br-int -d <network ip address>/<netmask> -j ACCEPT
+
+  Execute the following on a jump host:
+
+  .. code-block:: console
+
+      ip link add type vxlan remote <DUT IP> local <Jumphost IP> id <ID: 10> dstport 4789
+      ip addr add <IP#2, like: 172.20.2.2/24> dev vxlan0
+      ip link set dev vxlan0 up
+
+  .. note:: Host and jump host are different baremetal servers.
+
+ b) Modify test case management CIDR.
+    IP addresses IP#1, IP#2 and CIDR must be in the same network.
+
+  .. code-block:: YAML
+
+    servers:
+      vnf:
+        network_ports:
+          mgmt:
+            cidr: '1.1.1.7/24'
 
- b) Build guest image for VNF to run.
+ c) Build guest image for VNF to run.
     Most of the sample test cases in Yardstick are using a guest image called
-    ``yardstick-image`` which deviates from an Ubuntu Cloud Server image
-    Yardstick has a tool for building this custom image with samplevnf.
+    ``yardstick-nsb-image`` which deviates from an Ubuntu Cloud Server image
+    Yardstick has a tool for building this custom image with SampleVNF.
     It is necessary to have ``sudo`` rights to use this tool.
 
     Also you may need to install several additional packages to use this tool, by
@@ -548,18 +583,53 @@ OVS-DPDK
 OVS-DPDK Pre-requisites
 ^^^^^^^^^^^^^^^^^^^^^^^
 
-On Host:
- a) Create a bridge for VM to connect to external network
+On Host, where VM is created:
+ a) Create and configure a bridge named ``br-int`` for VM to connect to external network.
+    Currently this can be done using VXLAN tunnel.
+
+    Execute the following on host, where VM is created:
 
   .. code-block:: console
 
+      ip link add type vxlan remote <Jumphost IP> local <DUT IP> id <ID: 10> dstport 4789
       brctl addbr br-int
-      brctl addif br-int <interface_name>    #This interface is connected to internet
+      brctl addif br-int vxlan0
+      ip link set dev vxlan0 up
+      ip addr add <IP#1, like: 172.20.2.1/24> dev br-int
+      ip link set dev br-int up
+
+  .. note:: May be needed to add extra rules to iptable to forward traffic.
+
+  .. code-block:: console
+
+    iptables -A FORWARD -i br-int -s <network ip address>/<netmask> -j ACCEPT
+    iptables -A FORWARD -o br-int -d <network ip address>/<netmask> -j ACCEPT
+
+  Execute the following on a jump host:
+
+  .. code-block:: console
+
+      ip link add type vxlan remote <DUT IP> local <Jumphost IP> id <ID: 10> dstport 4789
+      ip addr add <IP#2, like: 172.20.2.2/24> dev vxlan0
+      ip link set dev vxlan0 up
+
+  .. note:: Host and jump host are different baremetal servers.
+
+ b) Modify test case management CIDR.
+    IP addresses IP#1, IP#2 and CIDR must be in the same network.
+
+  .. code-block:: YAML
+
+    servers:
+      vnf:
+        network_ports:
+          mgmt:
+            cidr: '1.1.1.7/24'
 
- b) Build guest image for VNF to run.
+ c) Build guest image for VNF to run.
     Most of the sample test cases in Yardstick are using a guest image called
-    ``yardstick-image`` which deviates from an Ubuntu Cloud Server image
-    Yardstick has a tool for building this custom image with samplevnf.
+    ``yardstick-nsb-image`` which deviates from an Ubuntu Cloud Server image
+    Yardstick has a tool for building this custom image with SampleVNF.
     It is necessary to have ``sudo`` rights to use this tool.
 
     Also you may need to install several additional packages to use this tool, by
@@ -880,7 +950,7 @@ Install dependencies needed for the DevStack
 
 Setup SR-IOV ports on the host:
 
-.. note:: The ``enp24s0f0``, ``enp24s0f0`` are physical function (PF) interfaces
+.. note:: The ``enp24s0f0``, ``enp24s0f1`` are physical function (PF) interfaces
   on a host and ``enp24s0f3`` is a public interface used in OpenStack, so the
   interface names should be changed according to the HW environment used for
   testing.