X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docs%2Ftesting%2Fuser%2Fuserguide%2F03-installation.rst;h=87bd9a9d643f0c79c219e620290cc8c58378c9be;hb=b62841c716325a984bb412bf66880d9b5b2b7958;hp=2ce4cedaa4f15e2d326db366c6c4c1354e861217;hpb=4fbd57151a67c0d99082f884523953b3e6bdd39e;p=samplevnf.git

diff --git a/docs/testing/user/userguide/03-installation.rst b/docs/testing/user/userguide/03-installation.rst
index 2ce4ceda..87bd9a9d 100644
--- a/docs/testing/user/userguide/03-installation.rst
+++ b/docs/testing/user/userguide/03-installation.rst
@@ -83,15 +83,10 @@ this will involve some manual file copying.
 
 Step 2: Clone the samplevnf project on that machine
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-<<<<<<< HEAD
-  ::
-     git clone https://git.opnfv.org/samplevnf
-=======
 .. code-block:: console
 
      git clone https://git.opnfv.org/samplevnf
 
->>>>>>> Jerma documentation rewrite
 Go to the relevant directory in this repository: samplevnf/VNFs/DPPD-PROX/helper-scripts/rapid/
 
 Step 3: Deploy the testing VMs
@@ -102,19 +97,6 @@ will have all information needed to run the actual test. You can do this step ma
 platforms (OpenStack, VMWare, K8s, bare metal, ...), but the automation tools described in the rest of this
 paragraph will using OpenStack Heat yaml files.
 First, a PROX qcow2 image needs to be downloaded.
-<<<<<<< HEAD
-  ::
-     wget http://artifacts.opnfv.org/samplevnf/jerma/prox_jerma.qcow2
-This image can also be created mannualy by following instructions in https://wiki.opnfv.org/display/SAM/Rapid+scripting,
-in the section "Creating an image" 
-Now upload this image to Openstack:
-  ::
-     openstack image` create  --disk-format qcow2 --container-format bare --file prox_jerma.qcow2 rapidVM
-Now run createrapid.sh to create the stack. This process takes the config_file as input. Details can be found in
-https://wiki.opnfv.org/display/SAM/Rapid+scripting, in the section "Deploying the VMs"
-  ::
-     ./createrapid.sh
-=======
 .. code-block:: console
 
      wget http://artifacts.opnfv.org/samplevnf/jerma/prox_jerma.qcow2
@@ -132,7 +114,6 @@ https://wiki.opnfv.org/display/SAM/Rapid+scripting, in the section "Deploying th
 
      ./createrapid.sh
 
->>>>>>> Jerma documentation rewrite
 At the end of this step, VMs should be running and the rapid.env and rapid_key.pem files should be available.
 
 Step 4: Deploy your own Xtesting toolchain
@@ -140,12 +121,8 @@ Step 4: Deploy your own Xtesting toolchain
 Install Xtesting as described in https://xtesting.readthedocs.io/en/latest/
 First goto the xtesting directory in samplevnf/VNFs/DPPD-PROX/helper-scripts/rapid/xtesting (this was cloned
 in step 2)
-<<<<<<< HEAD
-  ::
-=======
 .. code-block:: console
 
->>>>>>> Jerma documentation rewrite
      virtualenv xtesting
      . xtesting/bin/activate
      pip install ansible
@@ -156,9 +133,6 @@ in step 2)
 
 Step 5: Build the test container that will drive the TST009 testing
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-<<<<<<< HEAD
-  ::
-=======
 Go to the directory samplevnf/VNFs/DPPD-PROX/helper-scripts/rapid/xtesting
 While building this container, some files will be copied into the container image. Two of these files
 are generated by Step 3: rapid.env and rapid_key.pem and reside in the samplevnf/VNFs/DPPD-PROX/helper-scripts/rapid/.
@@ -167,17 +141,12 @@ The 3rd file that will be copied is testcases.yaml. You might want to modify thi
 like to execute.
 .. code-block:: console
 
->>>>>>> Jerma documentation rewrite
      docker build -t 127.0.0.1:5000/rapidxt .
 
 Step 6: Publish your container on your local repository
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-<<<<<<< HEAD
-  ::
-=======
 .. code-block:: console
 
->>>>>>> Jerma documentation rewrite
      docker push  127.0.0.1:5000/rapidxt
 
 You are now ready to execute the testing