Merge "Can't use SSHLibrary.File Should Exist right now :("

diff --git a/test/csit/libraries/ClusterKeywords.txt b/test/csit/libraries/ClusterKeywords.txt
index 6e87be51cd9a4150cdac44fb8a542a5d0381d372..bacf0112468ceefdf21cd93f02f51b21f22ac28e 100644 (file)
--- a/test/csit/libraries/ClusterKeywords.txt
+++ b/test/csit/libraries/ClusterKeywords.txt
@@ -40,7 +40,7 @@ Get Cars And Verify
     [Arguments]    ${controller_ip}    ${num_cars}
     ${resp}     Getcars  ${controller_ip}   ${PORT}  ${0}
     Should Be Equal As Strings    ${resp.status_code}    200
-    :FOR    ${i}    IN RANGE    1    ${num_cars}
+    :FOR    ${i}    IN RANGE    1    ${num_cars}+1
     \    Should Contain     ${resp.content}   manufacturer${i}
 
 Add People And Verify
@@ -64,7 +64,7 @@ Get People And Verify
     [Arguments]    ${controller_ip}    ${num_people}
     ${resp}     GetPersons  ${controller_ip}    ${PORT}  ${0}
     Should Be Equal As Strings    ${resp.status_code}    200
-    :FOR    ${i}    IN RANGE    1    ${num_people}
+    :FOR    ${i}    IN RANGE    1    ${num_people}+1
     \    Should Contain     ${resp.content}   user${i}
 
 Add Car Person And Verify
@@ -85,7 +85,7 @@ Get Car-Person Mappings And Verify
     [Arguments]    ${controller_ip}    ${num_entries}
     ${resp}     GetCarPersonMappings    ${controller_ip}    ${PORT}  ${0}
     Should Be Equal As Strings    ${resp.status_code}    200
-    :FOR    ${i}    IN RANGE    1    ${num_entries}
+    :FOR    ${i}    IN RANGE    1    ${num_entries}+1
     \    Should Contain     ${resp.content}   user${i}
 
 Buy Cars And Verify

diff --git a/test/tools/OF_Test/robot_suites/500__OF_Cluster_Sanity_OF/010__Flows_OF13_Cluster.txt b/test/tools/OF_Test/robot_suites/500__OF_Cluster_Sanity_OF/010__Flows_OF13_Cluster.txt
index 0a32545eaa9f038ee3f0012984bcc4f1dbd27341..679d5819e4bae2b3921dc40e8823f01ba9e0db78 100644 (file)
--- a/test/tools/OF_Test/robot_suites/500__OF_Cluster_Sanity_OF/010__Flows_OF13_Cluster.txt
+++ b/test/tools/OF_Test/robot_suites/500__OF_Cluster_Sanity_OF/010__Flows_OF13_Cluster.txt
@@ -7,7 +7,7 @@ Library        ../../../../csit/libraries/XmlComparator.py
 Variables      ../../../../csit/variables/Variables.py
 Library        ../../../../csit/libraries/RequestsLibrary.py
 Library        ../../../../csit/libraries/Common.py
-Library        SanityLibrary
+Library        SanityLibrary.py
 Suite Setup       Create Controllers Sessions
 Suite Teardown    Delete All Sessions
 

diff --git a/test/tools/VM_Tool/scripts/fedora.sh b/test/tools/VM_Tool/scripts/fedora.sh
index ec40d5b38cdd7cd11c8f7a78b073dabf6c49f82d..17621ca07fae4e25f164dc6121bf3f4c73439d22 100644 (file)
--- a/test/tools/VM_Tool/scripts/fedora.sh
+++ b/test/tools/VM_Tool/scripts/fedora.sh
@@ -4,10 +4,56 @@
 # External shell provisioner script for Fedora
 # --------------------------------------------
 
-# Add EPEL repo for access to Puppet, git-review, etc.
-sudo yum install -y epel-release
-
-# Install other packages (must be done after EPEL repo add)
+# Install initial packages
 sudo yum install -y \
   puppet \
   git
+
+#-----------------
+# Install netopeer
+#-----------------
+
+# Install required system dependencies
+sudo yum install -y \
+  readline \
+  readline-devel \
+  libssh2 \
+  libssh2-devel \
+  libxml2 \
+  libxml2-devel \
+  libxml2-python \
+  libxslt \
+  libxslt-devel \
+  libcurl \
+  libcurl-devel \
+  dbus \
+  dbus-devel \
+  libevent \
+  libevent-devel \
+  libssh-devel \
+  libtool
+
+# Install pyang (extensible YANG validator and converter in python)
+git clone https://github.com/mbj4668/pyang.git && \
+  cd pyang && \
+  sudo python setup.py install
+
+# Install libnetconf (NETCONF library in C)
+git clone https://code.google.com/p/libnetconf && \
+  cd libnetconf && \
+  ./configure  --with-nacm-recovery-uid=1000 && \
+  make && \
+  sudo make install
+
+# Create softlink for libnetconf library in lib64
+sudo ln -s /usr/local/lib/libnetconf.so.0 /lib64
+
+# Install netopeer (set of NETCONF tools built on the libnetconf library)
+git clone https://code.google.com/p/netopeer && \
+  cd netopeer/server && \
+  ./configure && \
+  make && \
+  sudo make install
+
+# Add path to python site-package directory
+echo "/usr/local/lib/python2.7/site-packages" | sudo tee /usr/lib/python2.7/site-packages/netopeer.pth