Merge "Update log config for Restapi"

diff --git a/docs/testing/user/userguide/test_details.rst b/docs/testing/user/userguide/test_details.rst
index fe7e6a9..935298f 100644 (file)
--- a/docs/testing/user/userguide/test_details.rst
+++ b/docs/testing/user/userguide/test_details.rst
@@ -419,6 +419,33 @@ The vyos-vrouter architecture is described in `[14]`_
 juju_epc
 ^^^^^^^^
 
+
+Kubernetes (K8s)
+----------------
+
+Kubernetes testing relies on sets of tests, which are part of the  Kubernetes
+source tree, such as the Kubernetes End-to-End (e2e) tests `[15]`_.
+
+The kubernetes testcases are distributed across various Tiers:
+
+ * Healthcheck Tier
+
+   * k8s_smoke Test Case: Creates a Guestbook application that contains redis
+     server, 2 instances of redis slave, frontend application, frontend service
+     and redis master service and redis slave service. Using frontend service,
+     the test will write an entry into the guestbook application which will
+     store the entry into the backend redis database. Application flow MUST
+     work as expected and the data written MUST be available to read.
+
+ * Smoke Tier
+
+   * k8s_conformance Test Case: Runs a series of k8s e2e tests expected to
+     pass on any Kubernetes cluster. It is a subset of tests necessary to
+     demonstrate conformance grows with each release. Conformance is thus
+     considered versioned, with backwards compatibility guarantees and are
+     designed to be run with no cloud provider configured.
+
+
 .. _`[2]`: http://docs.openstack.org/developer/tempest/overview.html
 .. _`[3]`: https://rally.readthedocs.org/en/latest/index.html
 .. _`[5]`: https://github.com/Orange-OpenSource/opnfv-cloudify-clearwater/blob/master/openstack-blueprint.yaml
@@ -429,3 +456,4 @@ juju_epc
 .. _`[12]`: http://docs.opnfv.org/en/latest/submodules/functest/docs/testing/user/userguide/index.html
 .. _`[13]`: https://wiki.opnfv.org/display/PROJ/SNAPS-OO
 .. _`[14]`: https://github.com/oolorg/opnfv-functest-vrouter
+.. _`[15]`: https://github.com/kubernetes/community/blob/master/contributors/devel/e2e-tests.md

diff --git a/docs/testing/user/userguide/test_results.rst b/docs/testing/user/userguide/test_results.rst
index 2d36bdc..c215e05 100644 (file)
--- a/docs/testing/user/userguide/test_results.rst
+++ b/docs/testing/user/userguide/test_results.rst
@@ -47,6 +47,42 @@ provided at the end of the job and can be described as follow::
  |           vyos_vrouter       |     functest     |         vnf         |      00:00       |      SKIP      |
  +------------------------------+------------------+---------------------+------------------+----------------+
 
+Functest Kubernetes test result::
+
+ +--------------------------------------+------------------------------------------------------------+
+ |               ENV VAR                |                           VALUE                            |
+ +--------------------------------------+------------------------------------------------------------+
+ |            INSTALLER_TYPE            |                          compass                           |
+ |           DEPLOY_SCENARIO            |                   k8-nosdn-nofeature-ha                    |
+ |              BUILD_TAG               |     jenkins-functest-compass-baremetal-daily-master-75     |
+ |               CI_LOOP                |                           daily                            |
+ +--------------------------------------+------------------------------------------------------------+
+
+Kubernetes healthcheck suite::
+
+ +-------------------+------------------+---------------------+------------------+----------------+
+ |     TEST CASE     |     PROJECT      |         TIER        |     DURATION     |     RESULT     |
+ +-------------------+------------------+---------------------+------------------+----------------+
+ |     k8s_smoke     |     functest     |     healthcheck     |      01:54       |      PASS      |
+ +-------------------+------------------+---------------------+------------------+----------------+
+
+Kubernetes smoke suite::
+
+ +-------------------------+------------------+---------------+------------------+----------------+
+ |        TEST CASE        |     PROJECT      |      TIER     |     DURATION     |     RESULT     |
+ +-------------------------+------------------+---------------+------------------+----------------+
+ |     k8s_conformance     |     functest     |     smoke     |      57:47       |      PASS      |
+ +-------------------------+------------------+---------------+------------------+----------------+
+
+Kubernetes features suite::
+
+ +----------------------+------------------+------------------+------------------+----------------+
+ |      TEST CASE       |     PROJECT      |       TIER       |     DURATION     |     RESULT     |
+ +----------------------+------------------+------------------+------------------+----------------+
+ |     stor4nfv_k8s     |     stor4nfv     |     stor4nfv     |      00:00       |      SKIP      |
+ |      clover_k8s      |      clover      |      clover      |      00:00       |      SKIP      |
+ +----------------------+------------------+------------------+------------------+----------------+
+
 Results are automatically pushed to the test results database, some additional
 result files are pushed to OPNFV artifact web sites.
 

diff --git a/functest/opnfv_tests/vnf/ims/cloudify_ims_perf.yaml b/functest/opnfv_tests/vnf/ims/cloudify_ims_perf.yaml
index 7573e07..0e020cb 100644 (file)
--- a/functest/opnfv_tests/vnf/ims/cloudify_ims_perf.yaml
+++ b/functest/opnfv_tests/vnf/ims/cloudify_ims_perf.yaml
@@ -1,9 +1,9 @@
 ---
 tenant_images:
     ubuntu_14.04:
-        http://cloud-images.ubuntu.com/trusty/current/ubuntu-14.04-server-cloudimg-amd64-disk1.img
+        /home/opnfv/functest/images/ubuntu-14.04-server-cloudimg-amd64-disk1.img
     cloudify_manager_4.0:
-        http://repository.cloudifysource.org/cloudify/4.0.1/sp-release/cloudify-manager-premium-4.0.1.qcow2
+        /home/opnfv/functest/images/cloudify-manager-premium-4.0.1.qcow2
     # PATH of the virtual chassis image.
     IXIA_CHASSIS:  # Ixia_Virtual_Chassis_8.30_EA_KVM.qcow2
     # PATH of the virtual card image.