Merge "Allow Asynchronous Apex Builds"
authorTim Rozet <trozet@redhat.com>
Thu, 11 May 2017 12:59:20 +0000 (12:59 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 11 May 2017 12:59:20 +0000 (12:59 +0000)
39 files changed:
jjb/3rd_party_ci/download-netvirt-artifact.sh
jjb/3rd_party_ci/odl-netvirt.yml
jjb/dovetail/dovetail-ci-jobs.yml
jjb/dovetail/dovetail-run.sh
jjb/fuel/fuel-daily-jobs.yml
jjb/functest/functest-loop.sh
jjb/functest/set-functest-env.sh
jjb/securedlab/check-jinja2.sh
jjb/xci/bifrost-provision.sh
jjb/xci/bifrost-verify.sh
prototypes/bifrost/playbooks/opnfv-virtual.yaml
prototypes/xci/file/install-ansible.sh [new file with mode: 0644]
prototypes/xci/xci-deploy.sh
utils/create_pod_file.py
utils/test/reporting/docker/reporting.sh
utils/test/reporting/functest/reporting-status.py
utils/test/reporting/functest/template/index-status-tmpl.html
utils/test/reporting/functest/testCase.py
utils/test/reporting/js/trend-qtip.js [new file with mode: 0644]
utils/test/reporting/qtip/__init__.py [new file with mode: 0644]
utils/test/reporting/qtip/index.html [new file with mode: 0644]
utils/test/reporting/qtip/reporting-status.py [new file with mode: 0644]
utils/test/reporting/qtip/template/index-status-tmpl.html [new file with mode: 0644]
utils/test/reporting/reporting.yaml
utils/test/reporting/utils/reporting_utils.py
utils/test/testapi/opnfv_testapi/common/check.py
utils/test/testapi/opnfv_testapi/resources/handlers.py
utils/test/testapi/opnfv_testapi/resources/models.py
utils/test/testapi/opnfv_testapi/resources/pod_handlers.py
utils/test/testapi/opnfv_testapi/resources/pod_models.py
utils/test/testapi/opnfv_testapi/resources/project_handlers.py
utils/test/testapi/opnfv_testapi/resources/project_models.py
utils/test/testapi/opnfv_testapi/resources/result_models.py
utils/test/testapi/opnfv_testapi/resources/scenario_models.py
utils/test/testapi/opnfv_testapi/resources/testcase_models.py
utils/test/testapi/opnfv_testapi/tornado_swagger/handlers.py
utils/test/testapi/opnfv_testapi/tornado_swagger/settings.py
utils/test/testapi/opnfv_testapi/tornado_swagger/swagger.py
utils/test/testapi/opnfv_testapi/tornado_swagger/views.py

index 70e3070..7ecf8d7 100755 (executable)
@@ -6,11 +6,17 @@ set -o pipefail
 ODL_ZIP=distribution-karaf-0.6.0-SNAPSHOT.zip
 
 echo "Attempting to fetch the artifact location from ODL Jenkins"
-CHANGE_DETAILS_URL="https://git.opendaylight.org/gerrit/changes/netvirt~master~$GERRIT_CHANGE_ID/detail"
+if [ "$ODL_BRANCH" != 'master' ]; then
+  DIST=$(echo ${ODL_BRANCH} | sed -rn 's#([a-zA-Z]+)/([a-zA-Z]+)#\2#p')
+  ODL_BRANCH=$(echo ${ODL_BRANCH} | sed -rn 's#([a-zA-Z]+)/([a-zA-Z]+)#\1%2F\2#p')
+else
+  DIST='nitrogen'
+fi
+CHANGE_DETAILS_URL="https://git.opendaylight.org/gerrit/changes/netvirt~${ODL_BRANCH}~${GERRIT_CHANGE_ID}/detail"
 # due to limitation with the Jenkins Gerrit Trigger, we need to use Gerrit REST API to get the change details
-ODL_BUILD_JOB_NUM=$(curl -s $CHANGE_DETAILS_URL | grep -Eo 'netvirt-distribution-check-nitrogen/[0-9]+' | tail -1 | grep -Eo [0-9]+)
-DISTRO_CHECK_CONSOLE_LOG="https://logs.opendaylight.org/releng/jenkins092/netvirt-distribution-check-nitrogen/${ODL_BUILD_JOB_NUM}/console.log.gz"
-NETVIRT_ARTIFACT_URL=$(curl -s --compressed $DISTRO_CHECK_CONSOLE_LOG | grep 'BUNDLE_URL' | cut -d = -f 2)
+ODL_BUILD_JOB_NUM=$(curl --fail -s ${CHANGE_DETAILS_URL} | grep -Eo "netvirt-distribution-check-${DIST}/[0-9]+" | tail -1 | grep -Eo [0-9]+)
+DISTRO_CHECK_CONSOLE_LOG="https://logs.opendaylight.org/releng/jenkins092/netvirt-distribution-check-${DIST}/${ODL_BUILD_JOB_NUM}/console.log.gz"
+NETVIRT_ARTIFACT_URL=$(curl --fail -s --compressed ${DISTRO_CHECK_CONSOLE_LOG} | grep 'BUNDLE_URL' | cut -d = -f 2)
 
 echo -e "URL to artifact is\n\t$NETVIRT_ARTIFACT_URL"
 
@@ -28,4 +34,4 @@ unzip $ODL_ZIP
 tar czf /tmp/${NETVIRT_ARTIFACT} $(echo $ODL_ZIP | sed -n 's/\.zip//p')
 
 echo "Download complete"
-ls -al /tmp/${NETVIRT_ARTIFACT}
\ No newline at end of file
+ls -al /tmp/${NETVIRT_ARTIFACT}
index 470e433..a937acb 100644 (file)
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
+        - carbon:
+            branch: 'stable/carbon'
+            gs-pathname: ''
+            disabled: false
 #####################################
 # patch verification phases
 #####################################
                 - name: 'odl-netvirt-verify-virtual-install-netvirt-{stream}'
                   current-parameters: false
                   predefined-parameters: |
+                    ODL_BRANCH={branch}
                     BRANCH=$BRANCH
                     GERRIT_REFSPEC=$GERRIT_REFSPEC
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
             name: functest
             condition: SUCCESSFUL
             projects:
-                - name: 'functest-netvirt-virtual-suite-{stream}'
+                - name: 'functest-netvirt-virtual-suite-master'
                   predefined-parameters: |
                     DEPLOY_SCENARIO=os-odl_l3-nofeature-ha
-                    FUNCTEST_SUITE_NAME=tempest_smoke_serial
+                    FUNCTEST_SUITE_NAME=odl_netvirt
                     RC_FILE_PATH=$HOME/cloner-info/overcloudrc
                   node-parameters: true
                   kill-phase-on: FAILURE
index 4998278..682948d 100644 (file)
             SUT: fuel
             auto-trigger-name: 'daily-trigger-disabled'
             <<: *master
+        - zte-pod1:
+            slave-label: zte-pod1
+            SUT: fuel
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *master
+        - zte-pod2:
+            slave-label: zte-pod2
+            SUT: fuel
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *master
+        - zte-pod3:
+            slave-label: zte-pod3
+            SUT: fuel
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *master
+        - zte-pod1:
+            slave-label: zte-pod1
+            SUT: fuel
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *danube
+        - zte-pod3:
+            slave-label: zte-pod3
+            SUT: fuel
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *danube
 #--------------------------------
     testsuite:
         - 'debug'
index 5f462e9..3ad67b6 100755 (executable)
@@ -54,6 +54,7 @@ cd ${releng_repo}/modules
 sudo virtualenv venv
 source venv/bin/activate
 sudo pip install -e ./ >/dev/null
+sudo pip install netaddr
 
 if [[ ${INSTALLER_TYPE} == compass ]]; then
     options="-u root -p root"
@@ -65,6 +66,11 @@ else
 fi
 
 pod_file_dir="/home/opnfv/dovetail/userconfig"
+if [ -d ${pod_file_dir} ]; then
+    sudo rm -rf ${pod_file_dir}/*
+else
+    sudo mkdir -p ${pod_file_dir}
+fi
 cmd="sudo python ${releng_repo}/utils/create_pod_file.py -t ${INSTALLER_TYPE} -i ${INSTALLER_IP} ${options} -f ${pod_file_dir}/pod.yaml"
 echo ${cmd}
 ${cmd}
index 32abad6..2fa8687 100644 (file)
@@ -73,8 +73,8 @@
             auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
         - 'os-odl_l2-sfc-ha':
             auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
-        - 'os-odl_l2-bgpvpn-ha':
-            auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
+        - 'os-odl_l2-bgpvpn-ha':
+        #    auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
         - 'os-nosdn-kvm-ha':
             auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
         - 'os-nosdn-ovs-ha':
     jobs:
         - 'fuel-{scenario}-{pod}-daily-{stream}'
         - 'fuel-deploy-{pod}-daily-{stream}'
+        - 'fuel-os-odl_l2-bgpvpn-ha-{pod}-daily-{stream}'
 
 ########################
 # job templates
         - email:
             recipients: peter.barabas@ericsson.com fzhadaev@mirantis.com
 
+- job-template:
+    name: 'fuel-os-odl_l2-bgpvpn-ha-{pod}-daily-{stream}'
+
+    disabled: '{obj:disabled}'
+
+    concurrent: false
+
+    properties:
+        - logrotate-default
+        - throttle:
+            enabled: true
+            max-total: 4
+            max-per-node: 1
+            option: 'project'
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+                - 'fuel-os-.*?-{pod}-daily-.*'
+                - 'fuel-os-.*?-{pod}-weekly-.*'
+            block-level: 'NODE'
+
+    wrappers:
+        - build-name:
+            name: '$BUILD_NUMBER - Scenario: os-odl_l2-bgpvpn-ha'
+
+    triggers:
+        - 'fuel-os-odl_l2-bgpvpn-ha-{pod}-daily-{stream}-trigger'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+            branch: '{branch}'
+        - '{installer}-defaults'
+        - '{slave-label}-defaults':
+            installer: '{installer}'
+        - string:
+            name: DEPLOY_SCENARIO
+            default: "os-odl_l2-bgpvpn-ha"
+        - fuel-ci-parameter:
+            gs-pathname: '{gs-pathname}'
+
+    builders:
+        - description-setter:
+            description: "Built on $NODE_NAME"
+        - trigger-builds:
+            - project: 'fuel-deploy-{pod}-daily-{stream}'
+              current-parameters: false
+              predefined-parameters:
+                DEPLOY_SCENARIO=os-odl_l2-bgpvpn-ha
+              same-node: true
+              block: true
+        - trigger-builds:
+            - project: 'functest-fuel-{pod}-daily-{stream}'
+              current-parameters: false
+              predefined-parameters:
+                DEPLOY_SCENARIO=os-odl_l2-bgpvpn-ha
+              same-node: true
+              block: true
+              block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
+        - trigger-builds:
+            - project: 'yardstick-fuel-{pod}-daily-{stream}'
+              current-parameters: false
+              predefined-parameters:
+                DEPLOY_SCENARIO=os-odl_l2-bgpvpn-ha
+              block: true
+              same-node: true
+              block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
+        # 1.dovetail only master by now, not sync with A/B/C branches
+        # 2.here the stream means the SUT stream, dovetail stream is defined in its own job
+        # 3.only debug testsuite here(includes basic testcase,
+        #   i.e. refstack ipv6 vpn test cases from functest, HA test case
+        #   from yardstick)
+        # 4.not used for release criteria or compliance,
+        #   only to debug the dovetail tool bugs with fuel bgpvpn scenario
+        - trigger-builds:
+            - project: 'dovetail-fuel-{pod}-proposed_tests-{stream}'
+              current-parameters: false
+              predefined-parameters:
+                DEPLOY_SCENARIO=os-odl_l2-bgpvpn-ha
+              block: true
+              same-node: true
+              block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
+
+    publishers:
+        - email:
+            recipients: peter.barabas@ericsson.com fzhadaev@mirantis.com matthew.lijun@huawei.com
+
+
 - job-template:
     name: 'fuel-deploy-{pod}-daily-{stream}'
 
index 893c428..869c395 100755 (executable)
@@ -1,15 +1,9 @@
 #!/bin/bash
 set +e
 
-branch=${GIT_BRANCH##*/}
-[[ "$PUSH_RESULTS_TO_DB" == "true" ]] && flags+="-r"
-if [[ "$BRANCH" =~ 'brahmaputra' ]]; then
-    cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh -s ${flags}"
-elif [[ "$BRANCH" =~ 'colorado' ]]; then
-    cmd="python ${FUNCTEST_REPO_DIR}/ci/run_tests.py -t all ${flags}"
-else
-    cmd="python ${FUNCTEST_REPO_DIR}/functest/ci/run_tests.py -t all ${flags}"
-fi
+
+cmd="python ${FUNCTEST_REPO_DIR}/functest/ci/run_tests.py -t all ${flags}"
+
 container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
 docker exec $container_id $cmd
 
index 569f371..1acf0a2 100755 (executable)
@@ -112,12 +112,8 @@ if [ $(docker ps | grep "${FUNCTEST_IMAGE}:${DOCKER_TAG}" | wc -l) == 0 ]; then
     echo "The container ${FUNCTEST_IMAGE} with ID=${container_id} has not been properly started. Exiting..."
     exit 1
 fi
-if [[ "$BRANCH" =~ 'brahmaputra' ]]; then
-    cmd="${FUNCTEST_REPO_DIR}/docker/prepare_env.sh"
-elif [[ "$BRANCH" =~ 'colorado' ]]; then
-    cmd="python ${FUNCTEST_REPO_DIR}/ci/prepare_env.py start"
-else
-    cmd="python ${FUNCTEST_REPO_DIR}/functest/ci/prepare_env.py start"
-fi
+
+cmd="python ${FUNCTEST_REPO_DIR}/functest/ci/prepare_env.py start"
+
 echo "Executing command inside the docker: ${cmd}"
 docker exec ${container_id} ${cmd}
index 84907e5..57650ec 100755 (executable)
@@ -5,5 +5,5 @@ for lab_configs in $(find labs/ -name 'pod.yaml'); do
         while IFS= read -r jinja_templates; do
           echo "./utils/generate_config.py -y $lab_configs -j $jinja_templates"
           ./utils/generate_config.py -y $lab_configs -j $jinja_templates
-        done < <(find installers/ -name 'pod_config.yaml.j2')
+        done < <(find installers/ -name '*.j2')
 done
index 4724c2e..b37da90 100755 (executable)
@@ -82,13 +82,13 @@ sudo -E ./scripts/destroy-env.sh
 
 # provision VMs for the flavor
 cd /opt/bifrost
-sudo -E ./scripts/bifrost-provision.sh
+./scripts/bifrost-provision.sh
 
 # list the provisioned VMs
 cd /opt/bifrost
 source env-vars
 ironic node-list
-virsh list
+sudo -H -E virsh list
 
 echo "OpenStack nodes are provisioned!"
 # here we have to do something in order to capture what was the working sha1
index 29af7ca..18019a7 100755 (executable)
@@ -117,10 +117,10 @@ sudo -H -E ./scripts/destroy-env.sh
 
 # provision 3 VMs; xcimaster, controller, and compute
 cd /opt/bifrost
-sudo -H -E ./scripts/bifrost-provision.sh
+./scripts/bifrost-provision.sh
 
 # list the provisioned VMs
 cd /opt/bifrost
 source env-vars
 ironic node-list
-virsh list
+sudo -H -E virsh list
index 699c966..94de628 100644 (file)
       dib_packages: "{{ lookup('env', 'DIB_OS_PACKAGES') }}"
       when: create_image_via_dib | bool == true and transform_boot_image | bool == false
     - role: bifrost-keystone-client-config
-      # NOTE(hwoarang): This should be ansible_env.SUDO_USER like in the
-      # upstream playbook. However, we run ansible as root (ie with sudo)
-      # so clouds.yaml will be placed in the user's home directory (see
-      # the bifrost-keystone-client-config role) and then ansible will look
-      # for one in /root and fail. As such we hardcode the user to be 'root'.
-      user: "root"
+      user: "{{ ansible_env.SUDO_USER }}"
       clouds:
         bifrost:
           config_username: "{{ ironic.keystone.default_username }}"
diff --git a/prototypes/xci/file/install-ansible.sh b/prototypes/xci/file/install-ansible.sh
new file mode 100644 (file)
index 0000000..daa7f51
--- /dev/null
@@ -0,0 +1,136 @@
+#!/bin/bash
+# NOTE(hwoarang): Most parts of this this file were taken from the
+# bifrost repository (scripts/install-deps.sh). This script contains all
+# the necessary distro specific code to install ansible and it's dependencies.
+
+set -eu
+
+declare -A PKG_MAP
+
+CHECK_CMD_PKGS=(
+    libffi
+    libopenssl
+    net-tools
+    python-devel
+)
+
+# Check zypper before apt-get in case zypper-aptitude
+# is installed
+if [ -x '/usr/bin/zypper' ]; then
+    OS_FAMILY="Suse"
+    INSTALLER_CMD="sudo -H -E zypper install -y"
+    CHECK_CMD="zypper search --match-exact --installed"
+    PKG_MAP=(
+        [gcc]=gcc
+        [git]=git
+        [libffi]=libffi-devel
+        [libopenssl]=libopenssl-devel
+        [net-tools]=net-tools
+        [python]=python
+        [python-devel]=python-devel
+        [venv]=python-virtualenv
+        [wget]=wget
+    )
+    EXTRA_PKG_DEPS=( python-xml )
+    # NOTE (cinerama): we can't install python without removing this package
+    # if it exists
+    if $(${CHECK_CMD} patterns-openSUSE-minimal_base-conflicts &> /dev/null); then
+        sudo -H zypper remove -y patterns-openSUSE-minimal_base-conflicts
+    fi
+elif [ -x '/usr/bin/apt-get' ]; then
+    OS_FAMILY="Debian"
+    INSTALLER_CMD="sudo -H -E apt-get -y install"
+    CHECK_CMD="dpkg -l"
+    PKG_MAP=( [gcc]=gcc
+              [git]=git
+              [libffi]=libffi-dev
+              [libopenssl]=libssl-dev
+              [net-tools]=net-tools
+              [python]=python-minimal
+              [python-devel]=libpython-dev
+              [venv]=python-virtualenv
+              [wget]=wget
+            )
+    EXTRA_PKG_DEPS=()
+elif [ -x '/usr/bin/dnf' ] || [ -x '/usr/bin/yum' ]; then
+    OS_FAMILY="RedHat"
+    PKG_MANAGER=$(which dnf || which yum)
+    INSTALLER_CMD="sudo -H -E ${PKG_MANAGER} -y install"
+    CHECK_CMD="rpm -q"
+    PKG_MAP=(
+        [gcc]=gcc
+        [git]=git
+        [libffi]=libffi-devel
+        [libopenssl]=openssl-devel
+        [net-tools]=net-tools
+        [python]=python
+        [python-devel]=python-devel
+        [venv]=python-virtualenv
+        [wget]=wget
+    )
+    EXTRA_PKG_DEPS=()
+else
+    echo "ERROR: Supported package manager not found.  Supported: apt,yum,zypper"
+fi
+
+if ! $(python --version &>/dev/null); then
+    ${INSTALLER_CMD} ${PKG_MAP[python]}
+fi
+if ! $(gcc -v &>/dev/null); then
+    ${INSTALLER_CMD} ${PKG_MAP[gcc]}
+fi
+if ! $(git --version &>/dev/null); then
+    ${INSTALLER_CMD} ${PKG_MAP[git]}
+fi
+if ! $(wget --version &>/dev/null); then
+    ${INSTALLER_CMD} ${PKG_MAP[wget]}
+fi
+
+for pkg in ${CHECK_CMD_PKGS[@]}; do
+    if ! $(${CHECK_CMD} ${PKG_MAP[$pkg]} &>/dev/null); then
+        ${INSTALLER_CMD} ${PKG_MAP[$pkg]}
+    fi
+done
+
+if [ -n "${EXTRA_PKG_DEPS-}" ]; then
+    for pkg in ${EXTRA_PKG_DEPS}; do
+        if ! $(${CHECK_CMD} ${pkg} &>/dev/null); then
+            ${INSTALLER_CMD} ${pkg}
+        fi
+    done
+fi
+
+# If we're using a venv, we need to work around sudo not
+# keeping the path even with -E.
+PYTHON=$(which python)
+
+# To install python packages, we need pip.
+#
+# We can't use the apt packaged version of pip since
+# older versions of pip are incompatible with
+# requests, one of our indirect dependencies (bug 1459947).
+#
+# Note(cinerama): We use pip to install an updated pip plus our
+# other python requirements. pip breakages can seriously impact us,
+# so we've chosen to install/upgrade pip here rather than in
+# requirements (which are synced automatically from the global ones)
+# so we can quickly and easily adjust version parameters.
+# See bug 1536627.
+#
+# Note(cinerama): If pip is linked to pip3, the rest of the install
+# won't work. Remove the alternatives. This is due to ansible's
+# python 2.x requirement.
+if [[ $(readlink -f /etc/alternatives/pip) =~ "pip3" ]]; then
+    sudo -H update-alternatives --remove pip $(readlink -f /etc/alternatives/pip)
+fi
+
+if ! which pip; then
+    wget -O /tmp/get-pip.py https://bootstrap.pypa.io/get-pip.py
+    sudo -H -E ${PYTHON} /tmp/get-pip.py
+fi
+
+PIP=$(which pip)
+
+sudo -H -E ${PIP} install "pip>6.0"
+
+pip install ansible==$XCI_ANSIBLE_PIP_VERSION
index 2fd9be0..718ed73 100755 (executable)
@@ -50,7 +50,7 @@ echo "-------------------------------------------------------------------------"
 #-------------------------------------------------------------------------------
 # Install ansible on localhost
 #-------------------------------------------------------------------------------
-pip install ansible==$XCI_ANSIBLE_PIP_VERSION
+source file/install-ansible.sh
 
 # TODO: The xci playbooks can be put into a playbook which will be done later.
 
index 22943fc..197e493 100644 (file)
@@ -58,22 +58,32 @@ def create_file(handler):
     Other installers use key file of each node.
     """
     if not os.path.exists(os.path.dirname(args.filepath)):
-        os.path.makedirs(os.path.dirname(args.filepath))
+        os.makedirs(os.path.dirname(args.filepath))
     nodes = handler.nodes
     node_list = []
     index = 1
     for node in nodes:
-        if node.roles[0].lower() == "controller":
-            node_info = {'name': "node%s" % index, 'role': node.roles[0],
-                         'ip': node.ip, 'user': 'root'}
+        try:
+            if node.roles[0].lower() == "controller":
+                node_info = {'name': "node%s" % index, 'role': node.roles[0],
+                             'ip': node.ip, 'user': 'root'}
+                node_list.append(node_info)
+                index += 1
+        except Exception:
+            node_info = {'name': node.name, 'role': 'unknown', 'ip': node.ip,
+                         'user': 'root'}
             node_list.append(node_info)
-            index += 1
     for node in nodes:
-        if node.roles[0].lower() == "compute":
-            node_info = {'name': "node%s" % index, 'role': node.roles[0],
-                         'ip': node.ip, 'user': 'root'}
+        try:
+            if node.roles[0].lower() == "compute":
+                node_info = {'name': "node%s" % index, 'role': node.roles[0],
+                             'ip': node.ip, 'user': 'root'}
+                node_list.append(node_info)
+                index += 1
+        except Exception:
+            node_info = {'name': node.name, 'role': 'unknown', 'ip': node.ip,
+                         'user': 'root'}
             node_list.append(node_info)
-            index += 1
     if args.INSTALLER_TYPE == 'compass':
         for item in node_list:
             item['password'] = 'root'
index 1de13ae..49f4517 100755 (executable)
@@ -3,7 +3,7 @@
 export PYTHONPATH="${PYTHONPATH}:."
 export CONFIG_REPORTING_YAML=./reporting.yaml
 
-declare -a versions=(colorado master)
+declare -a versions=(danube master)
 declare -a projects=(functest storperf yardstick)
 
 project=$1
@@ -32,6 +32,22 @@ cp -Rf js display
 # yardstick |
 # storperf  |
 
+function report_project()
+{
+  project=$1
+  dir=$2
+  type=$3
+  echo "********************************"
+  echo " $project reporting "
+  echo "********************************"
+  python ./$dir/reporting-$type.py
+  if [ $? ]; then
+    echo "$project reporting $type...OK"
+  else
+    echo "$project reporting $type...KO"
+  fi
+}
+
 if [ -z "$1" ]; then
   echo "********************************"
   echo " Functest reporting "
@@ -60,6 +76,8 @@ if [ -z "$1" ]; then
   python ./storperf/reporting-status.py
   echo "Storperf reporting status...OK"
 
+  report_project "QTIP" "qtip" "status"
+
 else
   if [ -z "$2" ]; then
     reporting_type="status"
index af1d1d8..e700e04 100755 (executable)
@@ -9,10 +9,8 @@
 import datetime
 import jinja2
 import os
-import requests
 import sys
 import time
-import yaml
 
 import testCase as tc
 import scenarioResult as sr
@@ -43,9 +41,7 @@ log_level = rp_utils.get_config('general.log.log_level')
 exclude_noha = rp_utils.get_config('functest.exclude_noha')
 exclude_virtual = rp_utils.get_config('functest.exclude_virtual')
 
-response = requests.get(cf)
-
-functest_yaml_config = yaml.safe_load(response.text)
+functest_yaml_config = rp_utils.getFunctestConfig()
 
 logger.info("*******************************************")
 logger.info("*                                         *")
@@ -69,128 +65,116 @@ config_tiers = functest_yaml_config.get("tiers")
 for tier in config_tiers:
     if tier['order'] >= 0 and tier['order'] < 2:
         for case in tier['testcases']:
-            if case['name'] not in blacklist:
-                testValid.append(tc.TestCase(case['name'],
+            if case['case_name'] not in blacklist:
+                testValid.append(tc.TestCase(case['case_name'],
                                              "functest",
                                              case['dependencies']))
     elif tier['order'] == 2:
         for case in tier['testcases']:
-            if case['name'] not in blacklist:
-                testValid.append(tc.TestCase(case['name'],
-                                             case['name'],
+            if case['case_name'] not in blacklist:
+                testValid.append(tc.TestCase(case['case_name'],
+                                             case['case_name'],
                                              case['dependencies']))
     elif tier['order'] > 2:
         for case in tier['testcases']:
-            if case['name'] not in blacklist:
-                otherTestCases.append(tc.TestCase(case['name'],
+            if case['case_name'] not in blacklist:
+                otherTestCases.append(tc.TestCase(case['case_name'],
                                                   "functest",
                                                   case['dependencies']))
 
 logger.debug("Functest reporting start")
+
 # For all the versions
 for version in versions:
     # For all the installers
+    scenario_directory = "./display/" + version + "/functest/"
+    scenario_file_name = scenario_directory + "scenario_history.txt"
+
+    # check that the directory exists, if not create it
+    # (first run on new version)
+    if not os.path.exists(scenario_directory):
+        os.makedirs(scenario_directory)
+
+    # initiate scenario file if it does not exist
+    if not os.path.isfile(scenario_file_name):
+        with open(scenario_file_name, "a") as my_file:
+            logger.debug("Create scenario file: %s" % scenario_file_name)
+            my_file.write("date,scenario,installer,detail,score\n")
+
     for installer in installers:
+
         # get scenarios
         scenario_results = rp_utils.getScenarios(healthcheck,
                                                  installer,
                                                  version)
-        scenario_stats = rp_utils.getScenarioStats(scenario_results)
-        items = {}
-        scenario_result_criteria = {}
-        scenario_directory = "./display/" + version + "/functest/"
-        scenario_file_name = scenario_directory + "scenario_history.txt"
-
-        # check that the directory exists, if not create it
-        # (first run on new version)
-        if not os.path.exists(scenario_directory):
-            os.makedirs(scenario_directory)
-
-        # initiate scenario file if it does not exist
-        if not os.path.isfile(scenario_file_name):
-            with open(scenario_file_name, "a") as my_file:
-                logger.debug("Create scenario file: %s" % scenario_file_name)
-                my_file.write("date,scenario,installer,detail,score\n")
-
-        # For all the scenarios get results
-        for s, s_result in scenario_results.items():
-            logger.info("---------------------------------")
-            logger.info("installer %s, version %s, scenario %s:" %
-                        (installer, version, s))
-            logger.debug("Scenario results: %s" % s_result)
-
-            # Green or Red light for a given scenario
-            nb_test_runnable_for_this_scenario = 0
-            scenario_score = 0
-            # url of the last jenkins log corresponding to a given
-            # scenario
-            s_url = ""
-            if len(s_result) > 0:
-                build_tag = s_result[len(s_result)-1]['build_tag']
-                logger.debug("Build tag: %s" % build_tag)
-                s_url = rp_utils.getJenkinsUrl(build_tag)
-                if s_url is None:
-                    s_url = "http://testresultS.opnfv.org/reporting"
-                logger.info("last jenkins url: %s" % s_url)
-            testCases2BeDisplayed = []
-            # Check if test case is runnable / installer, scenario
-            # for the test case used for Scenario validation
-            try:
-                # 1) Manage the test cases for the scenario validation
-                # concretely Tiers 0-3
-                for test_case in testValid:
-                    test_case.checkRunnable(installer, s,
-                                            test_case.getConstraints())
-                    logger.debug("testcase %s (%s) is %s" %
-                                 (test_case.getDisplayName(),
-                                  test_case.getName(),
-                                  test_case.isRunnable))
-                    time.sleep(1)
-                    if test_case.isRunnable:
-                        dbName = test_case.getDbName()
-                        name = test_case.getName()
-                        displayName = test_case.getDisplayName()
-                        project = test_case.getProject()
-                        nb_test_runnable_for_this_scenario += 1
-                        logger.info(" Searching results for case %s " %
-                                    (displayName))
-                        result = rp_utils.getResult(dbName, installer,
-                                                    s, version)
-                        # if no result set the value to 0
-                        if result < 0:
-                            result = 0
-                        logger.info(" >>>> Test score = " + str(result))
-                        test_case.setCriteria(result)
-                        test_case.setIsRunnable(True)
-                        testCases2BeDisplayed.append(tc.TestCase(name,
-                                                                 project,
-                                                                 "",
-                                                                 result,
-                                                                 True,
-                                                                 1))
-                        scenario_score = scenario_score + result
-
-                # 2) Manage the test cases for the scenario qualification
-                # concretely Tiers > 3
-                for test_case in otherTestCases:
-                    test_case.checkRunnable(installer, s,
-                                            test_case.getConstraints())
-                    logger.debug("testcase %s (%s) is %s" %
-                                 (test_case.getDisplayName(),
-                                  test_case.getName(),
-                                  test_case.isRunnable))
-                    time.sleep(1)
-                    if test_case.isRunnable:
-                        dbName = test_case.getDbName()
-                        name = test_case.getName()
-                        displayName = test_case.getDisplayName()
-                        project = test_case.getProject()
-                        logger.info(" Searching results for case %s " %
-                                    (displayName))
-                        result = rp_utils.getResult(dbName, installer,
-                                                    s, version)
-                        # at least 1 result for the test
-                        if result > -1:
+
+        # get nb of supported architecture (x86, aarch64)
+        architectures = rp_utils.getArchitectures(scenario_results)
+        logger.info("Supported architectures: {}".format(architectures))
+
+        for architecture in architectures:
+            logger.info("architecture: {}".format(architecture))
+            # Consider only the results for the selected architecture
+            # i.e drop x86 for aarch64 and vice versa
+            filter_results = rp_utils.filterArchitecture(scenario_results,
+                                                         architecture)
+            scenario_stats = rp_utils.getScenarioStats(filter_results)
+            items = {}
+            scenario_result_criteria = {}
+
+            # in case of more than 1 architecture supported
+            # precise the architecture
+            installer_display = installer
+            if (len(architectures) > 1):
+                installer_display = installer + "@" + architecture
+
+            # For all the scenarios get results
+            for s, s_result in filter_results.items():
+                logger.info("---------------------------------")
+                logger.info("installer %s, version %s, scenario %s:" %
+                            (installer, version, s))
+                logger.debug("Scenario results: %s" % s_result)
+
+                # Green or Red light for a given scenario
+                nb_test_runnable_for_this_scenario = 0
+                scenario_score = 0
+                # url of the last jenkins log corresponding to a given
+                # scenario
+                s_url = ""
+                if len(s_result) > 0:
+                    build_tag = s_result[len(s_result)-1]['build_tag']
+                    logger.debug("Build tag: %s" % build_tag)
+                    s_url = rp_utils.getJenkinsUrl(build_tag)
+                    if s_url is None:
+                        s_url = "http://testresultS.opnfv.org/reporting"
+                    logger.info("last jenkins url: %s" % s_url)
+                testCases2BeDisplayed = []
+                # Check if test case is runnable / installer, scenario
+                # for the test case used for Scenario validation
+                try:
+                    # 1) Manage the test cases for the scenario validation
+                    # concretely Tiers 0-3
+                    for test_case in testValid:
+                        test_case.checkRunnable(installer, s,
+                                                test_case.getConstraints())
+                        logger.debug("testcase %s (%s) is %s" %
+                                     (test_case.getDisplayName(),
+                                      test_case.getName(),
+                                      test_case.isRunnable))
+                        time.sleep(1)
+                        if test_case.isRunnable:
+                            name = test_case.getName()
+                            displayName = test_case.getDisplayName()
+                            project = test_case.getProject()
+                            nb_test_runnable_for_this_scenario += 1
+                            logger.info(" Searching results for case %s " %
+                                        (displayName))
+                            result = rp_utils.getResult(name, installer,
+                                                        s, version)
+                            # if no result set the value to 0
+                            if result < 0:
+                                result = 0
+                            logger.info(" >>>> Test score = " + str(result))
                             test_case.setCriteria(result)
                             test_case.setIsRunnable(True)
                             testCases2BeDisplayed.append(tc.TestCase(name,
@@ -198,91 +182,126 @@ for version in versions:
                                                                      "",
                                                                      result,
                                                                      True,
-                                                                     4))
-                        else:
-                            logger.debug("No results found")
-
-                    items[s] = testCases2BeDisplayed
-            except:
-                logger.error("Error: installer %s, version %s, scenario %s" %
-                             (installer, version, s))
-                logger.error("No data available: %s " % (sys.exc_info()[0]))
-
-            # **********************************************
-            # Evaluate the results for scenario validation
-            # **********************************************
-            # the validation criteria = nb runnable tests x 3
-            # because each test case = 0,1,2 or 3
-            scenario_criteria = nb_test_runnable_for_this_scenario * 3
-            # if 0 runnable tests set criteria at a high value
-            if scenario_criteria < 1:
-                scenario_criteria = 50  # conf.MAX_SCENARIO_CRITERIA
-
-            s_score = str(scenario_score) + "/" + str(scenario_criteria)
-            s_score_percent = rp_utils.getScenarioPercent(scenario_score,
-                                                          scenario_criteria)
-
-            s_status = "KO"
-            if scenario_score < scenario_criteria:
-                logger.info(">>>> scenario not OK, score = %s/%s" %
-                            (scenario_score, scenario_criteria))
+                                                                     1))
+                            scenario_score = scenario_score + result
+
+                    # 2) Manage the test cases for the scenario qualification
+                    # concretely Tiers > 3
+                    for test_case in otherTestCases:
+                        test_case.checkRunnable(installer, s,
+                                                test_case.getConstraints())
+                        logger.debug("testcase %s (%s) is %s" %
+                                     (test_case.getDisplayName(),
+                                      test_case.getName(),
+                                      test_case.isRunnable))
+                        time.sleep(1)
+                        if test_case.isRunnable:
+                            name = test_case.getName()
+                            displayName = test_case.getDisplayName()
+                            project = test_case.getProject()
+                            logger.info(" Searching results for case %s " %
+                                        (displayName))
+                            result = rp_utils.getResult(name, installer,
+                                                        s, version)
+                            # at least 1 result for the test
+                            if result > -1:
+                                test_case.setCriteria(result)
+                                test_case.setIsRunnable(True)
+                                testCases2BeDisplayed.append(tc.TestCase(
+                                    name,
+                                    project,
+                                    "",
+                                    result,
+                                    True,
+                                    4))
+                            else:
+                                logger.debug("No results found")
+
+                        items[s] = testCases2BeDisplayed
+                except:
+                    logger.error("Error: installer %s, version %s, scenario %s"
+                                 % (installer, version, s))
+                    logger.error("No data available: %s" % (sys.exc_info()[0]))
+
+                # **********************************************
+                # Evaluate the results for scenario validation
+                # **********************************************
+                # the validation criteria = nb runnable tests x 3
+                # because each test case = 0,1,2 or 3
+                scenario_criteria = nb_test_runnable_for_this_scenario * 3
+                # if 0 runnable tests set criteria at a high value
+                if scenario_criteria < 1:
+                    scenario_criteria = 50  # conf.MAX_SCENARIO_CRITERIA
+
+                s_score = str(scenario_score) + "/" + str(scenario_criteria)
+                s_score_percent = rp_utils.getScenarioPercent(
+                    scenario_score,
+                    scenario_criteria)
+
                 s_status = "KO"
-            else:
-                logger.info(">>>>> scenario OK, save the information")
-                s_status = "OK"
-                path_validation_file = ("./display/" + version +
-                                        "/functest/" +
-                                        "validated_scenario_history.txt")
-                with open(path_validation_file, "a") as f:
-                    time_format = "%Y-%m-%d %H:%M"
-                    info = (datetime.datetime.now().strftime(time_format) +
-                            ";" + installer + ";" + s + "\n")
+                if scenario_score < scenario_criteria:
+                    logger.info(">>>> scenario not OK, score = %s/%s" %
+                                (scenario_score, scenario_criteria))
+                    s_status = "KO"
+                else:
+                    logger.info(">>>>> scenario OK, save the information")
+                    s_status = "OK"
+                    path_validation_file = ("./display/" + version +
+                                            "/functest/" +
+                                            "validated_scenario_history.txt")
+                    with open(path_validation_file, "a") as f:
+                        time_format = "%Y-%m-%d %H:%M"
+                        info = (datetime.datetime.now().strftime(time_format) +
+                                ";" + installer_display + ";" + s + "\n")
+                        f.write(info)
+
+                # Save daily results in a file
+                with open(scenario_file_name, "a") as f:
+                    info = (reportingDate + "," + s + "," + installer_display +
+                            "," + s_score + "," +
+                            str(round(s_score_percent)) + "\n")
                     f.write(info)
 
-            # Save daily results in a file
-            with open(scenario_file_name, "a") as f:
-                info = (reportingDate + "," + s + "," + installer +
-                        "," + s_score + "," +
-                        str(round(s_score_percent)) + "\n")
-                f.write(info)
-
-            scenario_result_criteria[s] = sr.ScenarioResult(s_status,
-                                                            s_score,
-                                                            s_score_percent,
-                                                            s_url)
-            logger.info("--------------------------")
-
-        templateLoader = jinja2.FileSystemLoader(".")
-        templateEnv = jinja2.Environment(
-            loader=templateLoader, autoescape=True)
-
-        TEMPLATE_FILE = "./functest/template/index-status-tmpl.html"
-        template = templateEnv.get_template(TEMPLATE_FILE)
-
-        outputText = template.render(scenario_stats=scenario_stats,
-                                     scenario_results=scenario_result_criteria,
-                                     items=items,
-                                     installer=installer,
-                                     period=period,
-                                     version=version,
-                                     date=reportingDate)
-
-        with open("./display/" + version +
-                  "/functest/status-" + installer + ".html", "wb") as fh:
-            fh.write(outputText)
-
-        logger.info("Manage export CSV & PDF")
-        rp_utils.export_csv(scenario_file_name, installer, version)
-        logger.error("CSV generated...")
-
-        # Generate outputs for export
-        # pdf
-        # TODO Change once web site updated...use the current one
-        # to test pdf production
-        url_pdf = rp_utils.get_config('general.url')
-        pdf_path = ("./display/" + version +
-                    "/functest/status-" + installer + ".html")
-        pdf_doc_name = ("./display/" + version +
-                        "/functest/status-" + installer + ".pdf")
-        rp_utils.export_pdf(pdf_path, pdf_doc_name)
-        logger.info("PDF generated...")
+                scenario_result_criteria[s] = sr.ScenarioResult(
+                    s_status,
+                    s_score,
+                    s_score_percent,
+                    s_url)
+                logger.info("--------------------------")
+
+            templateLoader = jinja2.FileSystemLoader(".")
+            templateEnv = jinja2.Environment(
+                loader=templateLoader, autoescape=True)
+
+            TEMPLATE_FILE = "./functest/template/index-status-tmpl.html"
+            template = templateEnv.get_template(TEMPLATE_FILE)
+
+            outputText = template.render(
+                            scenario_stats=scenario_stats,
+                            scenario_results=scenario_result_criteria,
+                            items=items,
+                            installer=installer_display,
+                            period=period,
+                            version=version,
+                            date=reportingDate)
+
+            with open("./display/" + version +
+                      "/functest/status-" +
+                      installer_display + ".html", "wb") as fh:
+                fh.write(outputText)
+
+            logger.info("Manage export CSV & PDF")
+            rp_utils.export_csv(scenario_file_name, installer_display, version)
+            logger.error("CSV generated...")
+
+            # Generate outputs for export
+            # pdf
+            # TODO Change once web site updated...use the current one
+            # to test pdf production
+            url_pdf = rp_utils.get_config('general.url')
+            pdf_path = ("./display/" + version +
+                        "/functest/status-" + installer_display + ".html")
+            pdf_doc_name = ("./display/" + version +
+                            "/functest/status-" + installer_display + ".pdf")
+            rp_utils.export_pdf(pdf_path, pdf_doc_name)
+            logger.info("PDF generated...")
index 52046c3..cc4edaa 100644 (file)
         {% for scenario in scenario_stats.iteritems() -%}
            var gaugeScenario{{loop.index}} = gauge('#gaugeScenario{{loop.index}}');
         {%- endfor %}
-       
+
        // assign success rate to the gauge
        function updateReadings() {
            {% for scenario,iteration in scenario_stats.iteritems() -%}
                gaugeScenario{{loop.index}}.update({{scenario_results[scenario].getScorePercent()}});
             {%- endfor %}
        }
-       updateReadings();                                                                               
+       updateReadings();
         }
-        
+
         // trend line management
-        d3.csv("./scenario_history.csv", function(data) {
+        d3.csv("./scenario_history.txt", function(data) {
        // ***************************************
        // Create the trend line
       {% for scenario,iteration in scenario_stats.iteritems() -%}
-       // for scenario {{scenario}} 
+       // for scenario {{scenario}}
        // Filter results
-        var trend{{loop.index}} = data.filter(function(row) { 
+        var trend{{loop.index}} = data.filter(function(row) {
             return row["scenario"]=="{{scenario}}" && row["installer"]=="{{installer}}";
        })
-       // Parse the date 
+       // Parse the date
         trend{{loop.index}}.forEach(function(d) {
            d.date = parseDate(d.date);
            d.score = +d.score
@@ -44,7 +44,7 @@
         var mytrend = trend("#trend_svg{{loop.index}}",trend{{loop.index}})
         // ****************************************
         {%- endfor %}
-    });            
+    });
     if ( !window.isLoaded ) {
         window.addEventListener("load", function() {
                        onDocumentReady();
@@ -61,7 +61,7 @@ $(document).ready(function (){
     });
 })
 </script>
-    
+
   </head>
     <body>
     <div class="container">
@@ -72,8 +72,8 @@ $(document).ready(function (){
             <li class="active"><a href="../../index.html">Home</a></li>
             <li><a href="status-apex.html">Apex</a></li>
             <li><a href="status-compass.html">Compass</a></li>
-            <li><a href="status-daisy.html">Daisy</a></li>
-            <li><a href="status-fuel.html">Fuel</a></li>
+            <li><a href="status-fuel@x86.html">fuel@x86</a></li>
+            <li><a href="status-fuel@aarch64.html">fuel@aarch64</a></li>
             <li><a href="status-joid.html">Joid</a></li>
           </ul>
         </nav>
@@ -134,13 +134,13 @@ $(document).ready(function (){
                         <tr class="tr-weather-weather">
                             {% for test in items[scenario] -%}
                             {% if test.getCriteria() > 2 -%}
-                                <td><img src="../../../img/weather-clear.png"></td>
+                                <td><img src="../../img/weather-clear.png"></td>
                             {%- elif test.getCriteria() > 1 -%}
-                                <td><img src="../../../img/weather-few-clouds.png"></td>
+                                <td><img src="../../img/weather-few-clouds.png"></td>
                             {%- elif test.getCriteria() > 0 -%}
-                                <td><img src="../../../img/weather-overcast.png"></td>
+                                <td><img src="../../img/weather-overcast.png"></td>
                             {%- elif test.getCriteria() > -1 -%}
-                                <td><img src="../../../img/weather-storm.png"></td>
+                                <td><img src="../../img/weather-storm.png"></td>
                             {%- endif %}
                             {%- endfor %}
                         </tr>
index c89e619..9834f07 100644 (file)
@@ -33,27 +33,29 @@ class TestCase(object):
                                'bgpvpn': 'bgpvpn',
                                'rally_full': 'Rally (full)',
                                'vims': 'vIMS',
-                               'doctor': 'Doctor',
+                               'doctor-notification': 'Doctor',
                                'promise': 'Promise',
                                'moon': 'Moon',
                                'copper': 'Copper',
                                'security_scan': 'Security',
                                'multisite': 'Multisite',
-                               'domino': 'Domino',
-                               'odl-sfc': 'SFC',
+                               'domino-multinode': 'Domino',
+                               'functest-odl-sfc': 'SFC',
                                'onos_sfc': 'SFC',
-                               'parser': 'Parser',
+                               'parser-basics': 'Parser',
                                'connection_check': 'Health (connection)',
                                'api_check': 'Health (api)',
                                'snaps_smoke': 'SNAPS',
                                'snaps_health_check': 'Health (dhcp)',
-                               'netready': 'Netready',
+                               'gluon_vping': 'Netready',
                                'fds': 'FDS',
                                'cloudify_ims': 'vIMS (Cloudify)',
                                'orchestra_ims': 'OpenIMS (OpenBaton)',
                                'opera_ims': 'vIMS (Open-O)',
                                'vyos_vrouter': 'vyos',
-                               'barometer': 'Barometer'}
+                               'barometercollectd': 'Barometer',
+                               'odl_netvirt': 'Netvirt',
+                               'security_scan': 'Security'}
         try:
             self.displayName = display_name_matrix[self.name]
         except:
@@ -119,50 +121,5 @@ class TestCase(object):
                     ";IsRunnable" + str(self.isRunnable))
         return testcase
 
-    def getDbName(self):
-        # Correspondance name of the test case / name in the DB
-        # ideally we should modify the DB to avoid such interface....
-        # '<name in the config>':'<name in the DB>'
-        # I know it is uggly...
-        test_match_matrix = {'healthcheck': 'healthcheck',
-                             'vping_ssh': 'vping_ssh',
-                             'vping_userdata': 'vping_userdata',
-                             'odl': 'odl',
-                             'onos': 'onos',
-                             'ocl': 'ocl',
-                             'tempest_smoke_serial': 'tempest_smoke_serial',
-                             'tempest_full_parallel': 'tempest_full_parallel',
-                             'tempest_defcore': 'tempest_defcore',
-                             'refstack_defcore': 'refstack_defcore',
-                             'rally_sanity': 'rally_sanity',
-                             'bgpvpn': 'bgpvpn',
-                             'rally_full': 'rally_full',
-                             'vims': 'vims',
-                             'doctor': 'doctor-notification',
-                             'promise': 'promise',
-                             'moon': 'moon_authentication',
-                             'copper': 'copper-notification',
-                             'security_scan': 'security',
-                             'multisite': 'multisite',
-                             'domino': 'domino-multinode',
-                             'odl-sfc': 'functest-odl-sfc',
-                             'onos_sfc': 'onos_sfc',
-                             'parser': 'parser-basics',
-                             'connection_check': 'connection_check',
-                             'api_check': 'api_check',
-                             'snaps_smoke': 'snaps_smoke',
-                             'snaps_health_check': 'snaps_health_check',
-                             'netready': 'gluon_vping',
-                             'fds': 'fds',
-                             'cloudify_ims': 'cloudify_ims',
-                             'orchestra_ims': 'orchestra_ims',
-                             'opera_ims': 'opera_ims',
-                             'vyos_vrouter': 'vyos_vrouter',
-                             'barometer': 'barometercollectd'}
-        try:
-            return test_match_matrix[self.name]
-        except:
-            return "unknown"
-
     def getDisplayName(self):
         return self.displayName
diff --git a/utils/test/reporting/js/trend-qtip.js b/utils/test/reporting/js/trend-qtip.js
new file mode 100644 (file)
index 0000000..d4c8735
--- /dev/null
@@ -0,0 +1,76 @@
+// ******************************************
+// Trend line for reporting
+// based on scenario_history.txt
+// where data looks like
+// date,scenario,installer,detail,score
+// 2016-09-22 13:12,os-nosdn-fdio-noha,apex,4/12,33.0
+// 2016-09-22 13:13,os-odl_l2-fdio-noha,apex,12/15,80.0
+// 2016-09-22 13:13,os-odl_l2-sfc-noha,apex,18/24,75.0
+// .....
+// ******************************************
+// Set the dimensions of the canvas / graph
+var trend_margin = {top: 20, right: 30, bottom: 50, left: 40},
+  trend_width = 300 - trend_margin.left - trend_margin.right,
+  trend_height = 130 - trend_margin.top - trend_margin.bottom;
+
+// Parse the date / time
+var parseDate = d3.time.format("%Y-%m-%d %H:%M").parse;
+
+// Set the ranges
+var trend_x = d3.time.scale().range([0, trend_width]);
+var trend_y = d3.scale.linear().range([trend_height, 0]);
+
+// Define the axes
+var trend_xAxis = d3.svg.axis().scale(trend_x)
+  .orient("bottom").ticks(2).tickFormat(d3.time.format("%m-%d"));
+
+var trend_yAxis = d3.svg.axis().scale(trend_y)
+  .orient("left").ticks(4, "s");
+
+// Define the line
+var valueline = d3.svg.line()
+  .x(function(d) { return trend_x(d.date); })
+  .y(function(d) { return trend_y(d.score); });
+
+var trend = function(container, trend_data) {
+
+    var trend_svg = d3.select(container)
+    .append("svg")
+      .attr("width", trend_width + trend_margin.left + trend_margin.right)
+      .attr("height", trend_height + trend_margin.top + trend_margin.bottom)
+      .attr("style", "font-size: small")
+    .append("g")
+            .attr("transform",
+              "translate(" + trend_margin.left + "," + trend_margin.top + ")");
+
+    // Scale the range of the data
+    trend_x.domain(d3.extent(trend_data, function(d) { return d.date; }));
+    trend_y.domain([0, d3.max(trend_data, function(d) { return d.score; })]);
+
+    // Add the X Axis
+    trend_svg.append("g")
+        .attr("class", "x axis")
+        .attr("transform", "translate(0," + trend_height + ")")
+        .call(trend_xAxis);
+
+    // Add the Y Axis
+    trend_svg.append("g")
+        .attr("class", "y axis")
+        .call(trend_yAxis);
+
+    // Add the valueline path.
+    trend_svg.append("path")
+        .attr("class", "line")
+        .attr("d", valueline(trend_data))
+    .attr("stroke", "steelblue")
+    .attr("fill", "none");
+
+    trend_svg.selectAll(".dot")
+      .data(trend_data)
+      .enter().append("circle")
+      .attr("r", 2.5)
+        .attr("cx", function(d) { return trend_x(d.date); })
+        .attr("cy", function(d) { return trend_y(d.score); });
+
+     return trend;
+}
diff --git a/utils/test/reporting/qtip/__init__.py b/utils/test/reporting/qtip/__init__.py
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/utils/test/reporting/qtip/index.html b/utils/test/reporting/qtip/index.html
new file mode 100644 (file)
index 0000000..0f9df85
--- /dev/null
@@ -0,0 +1,51 @@
+ <html>
+  <head>
+    <meta charset="utf-8">
+    <!-- Bootstrap core CSS -->
+    <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css" rel="stylesheet">
+    <link href="default.css" rel="stylesheet">
+    <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js"></script>
+    <script type="text/javascript" src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
+    <script type="text/javascript">
+    $(document).ready(function (){
+        $(".btn-more").click(function() {
+            $(this).hide();
+            $(this).parent().find(".panel-default").show();
+        });
+    })
+    </script>
+  </head>
+    <body>
+    <div class="container">
+      <div class="masthead">
+        <h3 class="text-muted">QTIP reporting page</h3>
+        <nav>
+          <ul class="nav nav-justified">
+            <li class="active"><a href="http://testresults.opnfv.org/reporting/index.html">Home</a></li>
+            <li><a href="index-status-apex.html">Apex</a></li>
+            <li><a href="index-status-compass.html">Compass</a></li>
+            <li><a href="index-status-fuel.html">Fuel</a></li>
+            <li><a href="index-status-joid.html">Joid</a></li>
+          </ul>
+        </nav>
+      </div>
+<div class="row">
+    <div class="col-md-1"></div>
+    <div class="col-md-10">
+        <div class="page-main">
+            <h2>QTIP</h2>
+            QTIP is used in OPNFV for verifying the OPNFV infrastructure and some of the OPNFV features.
+            <br>The QTIP framework is deployed in several OPNFV community labs.
+            <br>It is installer, infrastructure and application independent.
+
+            <h2>Useful Links</h2>
+            <li><a href="https://wiki.opnfv.org/download/attachments/5734608/qtip%20in%20depth.pdf?version=1&modificationDate=1463410431000&api=v2">QTIP in Depth</a></li>
+            <li><a href="https://git.opnfv.org/cgit/qtip">QTIP Repo</a></li>
+            <li><a href="https://wiki.opnfv.org/display/qtip">QTIP Project</a></li>
+            <li><a href="https://build.opnfv.org/ci/view/qtip/">QTIP Jenkins page</a></li>
+            <li><a href="https://jira.opnfv.org/browse/QTIP-119?jql=project%20%3D%20QTIP">JIRA</a></li>
+
+        </div>
+    </div>
+    <div class="col-md-1"></div>
+</div>
diff --git a/utils/test/reporting/qtip/reporting-status.py b/utils/test/reporting/qtip/reporting-status.py
new file mode 100644 (file)
index 0000000..5967cf6
--- /dev/null
@@ -0,0 +1,110 @@
+#!/usr/bin/python
+#
+# This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+import datetime
+import os
+
+import jinja2
+import utils.reporting_utils as rp_utils
+import utils.scenarioResult as sr
+
+installers = rp_utils.get_config('general.installers')
+versions = rp_utils.get_config('general.versions')
+PERIOD = rp_utils.get_config('general.period')
+
+# Logger
+logger = rp_utils.getLogger("Qtip-Status")
+reportingDate = datetime.datetime.now().strftime("%Y-%m-%d %H:%M")
+
+logger.info("*******************************************")
+logger.info("*   Generating reporting scenario status  *")
+logger.info("*   Data retention = %s days              *" % PERIOD)
+logger.info("*                                         *")
+logger.info("*******************************************")
+
+
+def prepare_profile_file(version):
+    profile_dir = './display/{}/qtip'.format(version)
+    if not os.path.exists(profile_dir):
+        os.makedirs(profile_dir)
+
+    profile_file = '{}/scenario_history.txt'.format(profile_dir, version)
+    if not os.path.exists(profile_file):
+        with open(profile_file, 'w') as f:
+            info = 'date,scenario,installer,details,score\n'
+            f.write(info)
+            f.close()
+    return profile_file
+
+
+def profile_results(results, installer, profile_fd):
+    result_criterias = {}
+    for s_p, s_p_result in results.iteritems():
+        ten_criteria = len(s_p_result)
+        ten_score = sum(s_p_result)
+
+        LASTEST_TESTS = rp_utils.get_config(
+            'general.nb_iteration_tests_success_criteria')
+        four_result = s_p_result[:LASTEST_TESTS]
+        four_criteria = len(four_result)
+        four_score = sum(four_result)
+
+        s_four_score = str(four_score / four_criteria)
+        s_ten_score = str(ten_score / ten_criteria)
+
+        info = '{},{},{},{},{}\n'.format(reportingDate,
+                                         s_p,
+                                         installer,
+                                         s_ten_score,
+                                         s_four_score)
+        profile_fd.write(info)
+        result_criterias[s_p] = sr.ScenarioResult('OK',
+                                                  s_four_score,
+                                                  s_ten_score,
+                                                  '100')
+
+        logger.info("--------------------------")
+    return result_criterias
+
+
+def render_html(prof_results, installer, version):
+    template_loader = jinja2.FileSystemLoader(".")
+    template_env = jinja2.Environment(loader=template_loader,
+                                      autoescape=True)
+
+    template_file = "./qtip/template/index-status-tmpl.html"
+    template = template_env.get_template(template_file)
+
+    render_outcome = template.render(prof_results=prof_results,
+                                     installer=installer,
+                                     period=PERIOD,
+                                     version=version,
+                                     date=reportingDate)
+
+    with open('./display/{}/qtip/status-{}.html'.format(version, installer),
+              'wb') as fh:
+        fh.write(render_outcome)
+
+
+def render_reporter():
+    for version in versions:
+        profile_file = prepare_profile_file(version)
+        profile_fd = open(profile_file, 'a')
+        for installer in installers:
+            results = rp_utils.getQtipResults(version, installer)
+            prof_results = profile_results(results, installer, profile_fd)
+            render_html(prof_results=prof_results,
+                        installer=installer,
+                        version=version)
+        profile_fd.close()
+        logger.info("Manage export CSV")
+        rp_utils.generate_csv(profile_file)
+        logger.info("CSV generated...")
+
+if __name__ == '__main__':
+    render_reporter()
diff --git a/utils/test/reporting/qtip/template/index-status-tmpl.html b/utils/test/reporting/qtip/template/index-status-tmpl.html
new file mode 100644 (file)
index 0000000..26da36c
--- /dev/null
@@ -0,0 +1,86 @@
+ <html>
+  <head>
+    <meta charset="utf-8">
+    <!-- Bootstrap core CSS -->
+    <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css" rel="stylesheet">
+    <link href="../../css/default.css" rel="stylesheet">
+    <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js"></script>
+    <script type="text/javascript" src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
+    <script type="text/javascript" src="http://d3js.org/d3.v2.min.js"></script>
+    <script type="text/javascript" src="../../js/trend-qtip.js"></script>
+    <script>
+        // trend line management
+        d3.csv("./scenario_history.csv", function(data) {
+            // ***************************************
+            // Create the trend line
+            {% for scenario in prof_results.keys() -%}
+            // for scenario {{scenario}}
+            // Filter results
+                var trend{{loop.index}} = data.filter(function(row) {
+                    return row["scenario"]=="{{scenario}}" && row["installer"]=="{{installer}}";
+                })
+            // Parse the date
+            trend{{loop.index}}.forEach(function(d) {
+                d.date = parseDate(d.date);
+                d.score = +d.score
+            });
+            // Draw the trend line
+            var mytrend = trend("#trend_svg{{loop.index}}",trend{{loop.index}})
+            // ****************************************
+            {%- endfor %}
+        });
+    </script>
+    <script type="text/javascript">
+    $(document).ready(function (){
+        $(".btn-more").click(function() {
+            $(this).hide();
+            $(this).parent().find(".panel-default").show();
+        });
+    })
+    </script>
+  </head>
+    <body>
+    <div class="container">
+      <div class="masthead">
+          <h3 class="text-muted">QTIP status page ({{version}}, {{date}})</h3>
+        <nav>
+          <ul class="nav nav-justified">
+            <li class="active"><a href="http://testresults.opnfv.org/reporting/index.html">Home</a></li>
+            <li><a href="index-status-apex.html">Apex</a></li>
+            <li><a href="index-status-compass.html">Compass</a></li>
+            <li><a href="index-status-fuel.html">Fuel</a></li>
+            <li><a href="index-status-joid.html">Joid</a></li>
+          </ul>
+        </nav>
+      </div>
+<div class="row">
+    <div class="col-md-1"></div>
+    <div class="col-md-10">
+        <div class="page-header">
+            <h2>{{installer}}</h2>
+        </div>
+
+        <div class="scenario-overview">
+            <div class="panel-heading"><h4><b>List of last scenarios ({{version}}) run over the last {{period}} days </b></h4></div>
+                <table class="table">
+                    <tr>
+                        <th width="25%">Pod/Scenario</th>
+                        <th width="25%">Trend</th>
+                        <th width="25%">Last 4 Iterations</th>
+                        <th width="25%">Last 10 Days</th>
+                    </tr>
+                        {% for scenario,result in prof_results.iteritems() -%}
+                            <tr class="tr-ok">
+                                <td>{{scenario}}</td>
+                                <td><div id="trend_svg{{loop.index}}"></div></td>
+                                <td>{{prof_results[scenario].getFourDaysScore()}}</td>
+                                <td>{{prof_results[scenario].getTenDaysScore()}}</td>
+                            </tr>
+                        {%- endfor %}
+                </table>
+        </div>
+
+
+    </div>
+    <div class="col-md-1"></div>
+</div>
index 8c5ce13..1692f48 100644 (file)
@@ -3,7 +3,6 @@ general:
     installers:
         - apex
         - compass
-        - daisy
         - fuel
         - joid
 
@@ -37,7 +36,6 @@ functest:
     blacklist:
         - ovno
         - security_scan
-        - rally_sanity
         - healthcheck
         - odl_netvirt
         - aaa
@@ -45,13 +43,12 @@ functest:
         - orchestra_ims
         - juju_epc
         - orchestra
-        - promise
     max_scenario_criteria: 50
     test_conf: https://git.opnfv.org/cgit/functest/plain/functest/ci/testcases.yaml
     log_level: ERROR
     jenkins_url: https://build.opnfv.org/ci/view/functest/job/
-    exclude_noha: "False"
-    exclude_virtual: "False"
+    exclude_noha: False
+    exclude_virtual: False
 
 yardstick:
     test_conf: https://git.opnfv.org/cgit/yardstick/plain/tests/ci/report_config.yaml
@@ -63,6 +60,8 @@ storperf:
     log_level: ERROR
 
 qtip:
+    log_level: ERROR
+    period: 1
 
 bottleneck:
 
index aab7a3f..599a938 100644 (file)
@@ -10,6 +10,7 @@ from urllib2 import Request, urlopen, URLError
 import logging
 import json
 import os
+import requests
 import pdfkit
 import yaml
 
@@ -198,6 +199,35 @@ def getScenarioStatus(installer, version):
     return result_dict
 
 
+def getQtipResults(version, installer):
+    period = get_config('qtip.period')
+    url_base = get_config('testapi.url')
+
+    url = ("http://" + url_base + "?project=qtip" +
+           "&installer=" + installer +
+           "&version=" + version + "&period=" + str(period))
+    request = Request(url)
+
+    try:
+        response = urlopen(request)
+        k = response.read()
+        response.close()
+        results = json.loads(k)['results']
+    except URLError as e:
+        print('Got an error code:', e)
+
+    result_dict = {}
+    if results:
+        for r in results:
+            key = '{}/{}'.format(r['pod_name'], r['scenario'])
+            if key not in result_dict.keys():
+                result_dict[key] = []
+            result_dict[key].append(r['details']['score'])
+
+    # return scenario_results
+    return result_dict
+
+
 def getNbtestOk(results):
     nb_test_ok = 0
     for r in results:
@@ -298,6 +328,44 @@ def getScenarioPercent(scenario_score, scenario_criteria):
     return score
 
 
+# *********
+# Functest
+# *********
+def getFunctestConfig(version=""):
+    config_file = get_config('functest.test_conf') + version
+    response = requests.get(config_file)
+    return yaml.safe_load(response.text)
+
+
+def getArchitectures(scenario_results):
+    supported_arch = ['x86']
+    if (len(scenario_results) > 0):
+        for scenario_result in scenario_results.values():
+            for value in scenario_result:
+                if ("armband" in value['build_tag']):
+                    supported_arch.append('aarch64')
+                    return supported_arch
+    return supported_arch
+
+
+def filterArchitecture(results, architecture):
+    filtered_results = {}
+    for name, results in results.items():
+        filtered_values = []
+        for value in results:
+            if (architecture is "x86"):
+                # drop aarch64 results
+                if ("armband" not in value['build_tag']):
+                    filtered_values.append(value)
+            elif(architecture is "aarch64"):
+                # drop x86 results
+                if ("armband" in value['build_tag']):
+                    filtered_values.append(value)
+        if (len(filtered_values) > 0):
+            filtered_results[name] = filtered_values
+    return filtered_results
+
+
 # *********
 # Yardstick
 # *********
@@ -367,6 +435,14 @@ def export_csv(scenario_file_name, installer, version):
         scenario_installer_file.close
 
 
+def generate_csv(scenario_file):
+    import shutil
+    # csv
+    # generate sub files based on scenario_history.txt
+    csv_file = scenario_file.replace('txt', 'csv')
+    shutil.copy2(scenario_file, csv_file)
+
+
 def export_pdf(pdf_path, pdf_doc_name):
     try:
         pdfkit.from_file(pdf_path, pdf_doc_name)
index be4b1df..4d9902c 100644 (file)
@@ -8,9 +8,11 @@
 ##############################################################################
 import functools
 
-from tornado import web, gen
+from tornado import gen
+from tornado import web
 
-from opnfv_testapi.common import raises, message
+from opnfv_testapi.common import message
+from opnfv_testapi.common import raises
 
 
 def authenticate(method):
index 955fbbe..dbf94eb 100644 (file)
@@ -26,10 +26,10 @@ import json
 from tornado import gen
 from tornado import web
 
-import models
 from opnfv_testapi.common import check
 from opnfv_testapi.common import message
 from opnfv_testapi.common import raises
+from opnfv_testapi.resources import models
 from opnfv_testapi.tornado_swagger import swagger
 
 DEFAULT_REPRESENTATION = "application/json"
index 0ea482f..e8fc532 100644 (file)
@@ -14,9 +14,8 @@
 # feng.xiaowei@zte.com.cn  mv TestResut to result_models.py        5-23-2016
 # feng.xiaowei@zte.com.cn  add ModelBase                           12-20-2016
 ##############################################################################
-import copy
 import ast
-
+import copy
 
 from opnfv_testapi.tornado_swagger import swagger
 
index e21841d..5029887 100644 (file)
@@ -7,8 +7,8 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 import handlers
+from opnfv_testapi.resources import pod_models
 from opnfv_testapi.tornado_swagger import swagger
-import pod_models
 
 
 class GenericPodHandler(handlers.GenericApiHandler):
index 26a9e67..2c3ea97 100644 (file)
@@ -6,7 +6,7 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
-import models
+from opnfv_testapi.resources import models
 from opnfv_testapi.tornado_swagger import swagger
 
 
index d79cd3b..be29507 100644 (file)
@@ -7,9 +7,9 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-import handlers
+from opnfv_testapi.resources import handlers
+from opnfv_testapi.resources import project_models
 from opnfv_testapi.tornado_swagger import swagger
-import project_models
 
 
 class GenericProjectHandler(handlers.GenericApiHandler):
index f7323c1..3243882 100644 (file)
@@ -6,7 +6,7 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
-import models
+from opnfv_testapi.resources import models
 from opnfv_testapi.tornado_swagger import swagger
 
 
index 50445fc..62a6dac 100644 (file)
@@ -6,7 +6,7 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
-import models
+from opnfv_testapi.resources import models
 from opnfv_testapi.tornado_swagger import swagger
 
 
index b84accf..467cff2 100644 (file)
@@ -1,4 +1,4 @@
-import models
+from opnfv_testapi.resources import models
 from opnfv_testapi.tornado_swagger import swagger
 
 
index 8cc3c6c..2379dfc 100644 (file)
@@ -6,19 +6,20 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
-import models
+from opnfv_testapi.resources import models
 from opnfv_testapi.tornado_swagger import swagger
 
 
 @swagger.model()
 class TestcaseCreateRequest(models.ModelBase):
     def __init__(self, name, url=None, description=None,
-                 tier=None, ci_loop=None, criteria=None,
-                 blocking=None, dependencies=None, run=None,
+                 catalog_description=None, tier=None, ci_loop=None,
+                 criteria=None, blocking=None, dependencies=None, run=None,
                  domains=None, tags=None, version=None):
         self.name = name
         self.url = url
         self.description = description
+        self.catalog_description = catalog_description
         self.tier = tier
         self.ci_loop = ci_loop
         self.criteria = criteria
@@ -34,11 +35,12 @@ class TestcaseCreateRequest(models.ModelBase):
 @swagger.model()
 class TestcaseUpdateRequest(models.ModelBase):
     def __init__(self, name=None, description=None, project_name=None,
-                 tier=None, ci_loop=None, criteria=None,
-                 blocking=None, dependencies=None, run=None,
+                 catalog_description=None, tier=None, ci_loop=None,
+                 criteria=None, blocking=None, dependencies=None, run=None,
                  domains=None, tags=None, version=None, trust=None):
         self.name = name
         self.description = description
+        self.catalog_description = catalog_description
         self.project_name = project_name
         self.tier = tier
         self.ci_loop = ci_loop
@@ -56,14 +58,15 @@ class TestcaseUpdateRequest(models.ModelBase):
 class Testcase(models.ModelBase):
     def __init__(self, _id=None, name=None, project_name=None,
                  description=None, url=None, creation_date=None,
-                 tier=None, ci_loop=None, criteria=None,
-                 blocking=None, dependencies=None, run=None,
+                 catalog_description=None, tier=None, ci_loop=None,
+                 criteria=None, blocking=None, dependencies=None, run=None,
                  domains=None, tags=None, version=None,
                  trust=None):
         self._id = None
         self.name = None
         self.project_name = None
         self.description = None
+        self.catalog_description = None
         self.url = None
         self.creation_date = None
         self.tier = None
index 2154b46..fff6d21 100644 (file)
@@ -6,38 +6,37 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
-from tornado.web import URLSpec, StaticFileHandler
+import tornado.web
 
-from settings import default_settings, \
-    SWAGGER_API_DOCS, SWAGGER_API_LIST, SWAGGER_API_SPEC
-from views import SwaggerUIHandler, SwaggerResourcesHandler, SwaggerApiHandler
+from opnfv_testapi.tornado_swagger import settings
+from opnfv_testapi.tornado_swagger import views
 
 
 def swagger_handlers():
-    prefix = default_settings.get('swagger_prefix', '/swagger')
+    prefix = settings.docs_settings.get('swagger_prefix', '/swagger')
     if prefix[-1] != '/':
         prefix += '/'
 
     def _path(suffix):
         return prefix + suffix
     return [
-        URLSpec(
+        tornado.web.URLSpec(
             _path(r'spec.html$'),
-            SwaggerUIHandler,
-            default_settings,
-            name=SWAGGER_API_DOCS),
-        URLSpec(
-            _path(r'spec.json$'),
-            SwaggerResourcesHandler,
-            default_settings,
-            name=SWAGGER_API_LIST),
-        URLSpec(
-            _path(r'spec$'),
-            SwaggerApiHandler,
-            default_settings,
-            name=SWAGGER_API_SPEC),
+            views.SwaggerUIHandler,
+            settings.docs_settings,
+            name=settings.API_DOCS_NAME),
+        tornado.web.URLSpec(
+            _path(r'resources.json$'),
+            views.SwaggerResourcesHandler,
+            settings.docs_settings,
+            name=settings.RESOURCE_LISTING_NAME),
+        tornado.web.URLSpec(
+            _path(r'APIs$'),
+            views.SwaggerApiHandler,
+            settings.docs_settings,
+            name=settings.API_DECLARATION_NAME),
         (
             _path(r'(.*\.(css|png|gif|js))'),
-            StaticFileHandler,
-            {'path': default_settings.get('static_path')}),
+            tornado.web.StaticFileHandler,
+            {'path': settings.docs_settings.get('static_path')}),
     ]
index 88d0d0f..03e9bbd 100644 (file)
@@ -8,25 +8,21 @@
 ##############################################################################
 import os.path
 
-SWAGGER_VERSION = '1.2'
-SWAGGER_API_DOCS = 'swagger-api-docs'
-SWAGGER_API_LIST = 'swagger-api-list'
-SWAGGER_API_SPEC = 'swagger-api-spec'
+API_DOCS_NAME = 'swagger-api-docs'
+RESOURCE_LISTING_NAME = 'swagger-resource-listing'
+API_DECLARATION_NAME = 'swagger-api-declaration'
 STATIC_PATH = os.path.join(os.path.dirname(os.path.normpath(__file__)),
                            'static')
 
-default_settings = {
+docs_settings = {
     'base_url': '',
     'static_path': STATIC_PATH,
     'swagger_prefix': '/swagger',
     'api_version': 'v1.0',
+    'swagger_version': '1.2',
     'api_key': '',
     'enabled_methods': ['get', 'post', 'put', 'patch', 'delete'],
     'exclude_namespaces': [],
 }
 
 models = []
-
-
-def basePath():
-    return default_settings.get('base_url')
index 3d21ede..83f389a 100644 (file)
@@ -6,15 +6,15 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
-import inspect
-from functools import wraps
 from HTMLParser import HTMLParser
+from functools import wraps
+import inspect
 
 import epydoc.markup
 import tornado.web
 
-from settings import default_settings, models
-from handlers import swagger_handlers
+from opnfv_testapi.tornado_swagger import handlers
+from opnfv_testapi.tornado_swagger import settings
 
 
 class EpytextParser(HTMLParser):
@@ -204,7 +204,7 @@ class model(DocParser):
         if '__init__' in dir(cls):
             self._parse_args(cls.__init__)
         self.parse_docstring(inspect.getdoc(cls))
-        models.append(self)
+        settings.models.append(self)
 
     def _parse_args(self, func):
         argspec = inspect.getargspec(func)
@@ -276,15 +276,16 @@ class operation(DocParser):
 
 
 def docs(**opts):
-    default_settings.update(opts)
+    settings.docs_settings.update(opts)
 
 
 class Application(tornado.web.Application):
-    def __init__(self, handlers=None,
+    def __init__(self, app_handlers=None,
                  default_host="",
                  transforms=None,
                  **settings):
-        super(Application, self).__init__(swagger_handlers() + handlers,
-                                          default_host,
-                                          transforms,
-                                          **settings)
+        super(Application, self).__init__(
+            handlers.swagger_handlers() + app_handlers,
+            default_host,
+            transforms,
+            **settings)
index 2508319..ee9cf04 100644 (file)
@@ -8,46 +8,53 @@
 ##############################################################################
 import inspect
 import json
+import os.path
 
 import tornado.template
 import tornado.web
 
-from settings import SWAGGER_VERSION, SWAGGER_API_LIST, SWAGGER_API_SPEC
-from settings import models, basePath
+from opnfv_testapi.tornado_swagger import settings
 
 
 def json_dumps(obj, pretty=False):
-    return json.dumps(obj, sort_keys=True, indent=4, separators=(',', ': ')) \
-        if pretty else json.dumps(obj)
+    return json.dumps(obj,
+                      sort_keys=True,
+                      indent=4,
+                      separators=(',', ': ')) if pretty else json.dumps(obj)
 
 
 class SwaggerUIHandler(tornado.web.RequestHandler):
-    def initialize(self, static_path, **kwds):
-        self.static_path = static_path
+    def initialize(self, **kwargs):
+        self.static_path = kwargs.get('static_path')
+        self.base_url = kwargs.get('base_url')
 
     def get_template_path(self):
         return self.static_path
 
     def get(self):
-        discovery_url = basePath() + self.reverse_url(SWAGGER_API_LIST)
+        discovery_url = os.path.join(
+            self.base_url,
+            self.reverse_url(settings.RESOURCE_LISTING_NAME))
         self.render('index.html', discovery_url=discovery_url)
 
 
 class SwaggerResourcesHandler(tornado.web.RequestHandler):
-    def initialize(self, api_version, exclude_namespaces, **kwds):
-        self.api_version = api_version
-        self.exclude_namespaces = exclude_namespaces
+    def initialize(self, **kwargs):
+        self.api_version = kwargs.get('api_version')
+        self.swagger_version = kwargs.get('swagger_version')
+        self.base_url = kwargs.get('base_url')
+        self.exclude_namespaces = kwargs.get('exclude_namespaces')
 
     def get(self):
         self.set_header('content-type', 'application/json')
         resources = {
             'apiVersion': self.api_version,
-            'swaggerVersion': SWAGGER_VERSION,
-            'basePath': basePath(),
+            'swaggerVersion': self.swagger_version,
+            'basePath': self.base_url,
             'produces': ["application/json"],
             'description': 'Test Api Spec',
             'apis': [{
-                'path': self.reverse_url(SWAGGER_API_SPEC),
+                'path': self.reverse_url(settings.API_DECLARATION_NAME),
                 'description': 'Test Api Spec'
             }]
         }
@@ -56,9 +63,10 @@ class SwaggerResourcesHandler(tornado.web.RequestHandler):
 
 
 class SwaggerApiHandler(tornado.web.RequestHandler):
-    def initialize(self, api_version, base_url, **kwds):
-        self.api_version = api_version
-        self.base_url = base_url
+    def initialize(self, **kwargs):
+        self.api_version = kwargs.get('api_version')
+        self.swagger_version = kwargs.get('swagger_version')
+        self.base_url = kwargs.get('base_url')
 
     def get(self):
         self.set_header('content-type', 'application/json')
@@ -68,11 +76,11 @@ class SwaggerApiHandler(tornado.web.RequestHandler):
 
         specs = {
             'apiVersion': self.api_version,
-            'swaggerVersion': SWAGGER_VERSION,
-            'basePath': basePath(),
+            'swaggerVersion': self.swagger_version,
+            'basePath': self.base_url,
             'apis': [self.__get_api_spec__(path, spec, operations)
                      for path, spec, operations in apis],
-            'models': self.__get_models_spec(models)
+            'models': self.__get_models_spec(settings.models)
         }
         self.finish(json_dumps(specs, self.get_arguments('pretty')))