Merge branch 'integration' into mediaComponentConfig

.githooks/post-commit

 #!/bin/bash
-mkdir .build-config
-git rev-list --count integration > .build-config/git-commit-count
-git describe --all --long > .build-config/git-commit-version
\ No newline at end of file
+
+CI_COMMIT_REF_NAME=`git rev-parse --abbrev-ref HEAD`
+CI_COMMIT_SHA=`git rev-parse HEAD`
+
+echo $CI_COMMIT_REF_NAME"-"$CI_COMMIT_SHA > clmctest/git-commit-ref

.gitignore

@@ -3,4 +3,5 @@
 *__pycache__*
 *__init__.pyc
 *egg-info*
-ubuntu-xenial-16.04-cloudimg-console.log
\ No newline at end of file
+*git-commit-ref*
+ubuntu-xenial-16.04-cloudimg-console.log

.gitlab-ci.yml

 stages:  
-  - test:scripts
-  - test:monitoring
-  - test:inputs
-  
-test:scripts:
-  stage: test:scripts
-  before_script:
-    - vagrant --fixture=scripts -- destroy --force 
+  - build
+  - test
+  - clean
+
+build:tests:
+  stage: build
   script: 
-    - vagrant --fixture=scripts -- up
-    - vagrant --fixture=scripts -- ssh test-runner -- -tt "cd /vagrant && pytest clmctest/scripts/"
-  after_script:
-    - vagrant --fixture=scripts -- destroy --force
-  when: manual
-  
-test:monitoring:
-  stage: test:streaming_sim
-  before_script:
-    - vagrant --fixture=monitoring -- destroy --force    
+    - python setup.py sdist --dist-dir=build
+  artifacts:
+    paths:
+    - build/clmctest-SNAPSHOT.tar.gz
+    expire_in: 1 day
+
+test:all:
+  stage: test
+  dependencies: 
+    - build:tests
   script: 
+    - vagrant --fixture=scripts -- up
+    - vagrant --fixture=scripts -- ssh test-runner -- -tt "pip3 install /vagrant/build/clmctest-SNAPSHOT.tar.gz"
+    - vagrant --fixture=scripts -- ssh test-runner -- -tt "pytest -s --pyargs clmctest.scripts"
     - vagrant --fixture=monitoring -- up
-    - vagrant --fixture=monitoring -- ssh test-runner -- -tt "cd /vagrant && pytest clmctest/monitoring/"
-  after_script:
-    - vagrant --fixture=monitoring -- destroy --force   
-  when: manual  
-  
-test:inputs:
-  stage: test:inputs
-  before_script:
-    - vagrant --fixture=inputs -- destroy --force      
-  script: 
+    - vagrant --fixture=monitoring -- ssh test-runner -- -tt "pytest -s --pyargs clmctest.monitoring"  
     - vagrant --fixture=inputs -- up
-    - vagrant --fixture=inputs -- ssh test-runner -- -tt "cd /vagrant && pytest clmctest/inputs/"
-  after_script:
-    - vagrant --fixture=inputs -- destroy --force       
-  when: manual    
-
-  
-
+    - vagrant --fixture=inputs -- ssh test-runner -- -tt "pytest -s --pyargs clmctest.inputs"        
+  when: on_success      
   
-
+clean:
+  stage: clean
+  script: 
+    - scripts/build/deleteallvms.sh   
+  when: always       
\ No newline at end of file

MANIFEST.in

 include MANIFEST.in
-recursive-include clmctest *.yml *.sh
\ No newline at end of file
+recursive-include clmctest *.yml *.sh *.json *.conf
\ No newline at end of file

clmctest/inputs/conftest.py

 #!/usr/bin/python3
 
 import pytest
+import time
 import yaml
 import pkg_resources
 from influxdb import InfluxDBClient
@@ -24,11 +25,17 @@ def telegraf_agent_config(request):
 @pytest.fixture(params=[{'database': 'CLMCMetrics'}], scope='module')
 def influxdb(telegraf_agent_config, request):
     """
-    Creates an Influx DB client for the CLMC metrics database
+    Creates an Influx DB client for the CLMC metrics database with an empty database
 
     :param telegraf_agent_config: the fixture returning the yaml configuration
     :param request: access the parameters of the fixture
     :return: the created Influx DB client
     """
+   
+    db =  InfluxDBClient(host=telegraf_agent_config['hosts'][0]['ip_address'], port=8086, database=request.param['database'], timeout=10)
+    db.drop_database(request.param['database'])
 
-    return InfluxDBClient(host=telegraf_agent_config['hosts'][0]['ip_address'], port=8086, database=request.param['database'], timeout=10)
+    # wait 20 seconds for the 1st measurement to arrive from agents before returning
+    time.sleep(30)
+
+    return db

clmctest/inputs/rspec.yml

@@ -35,7 +35,7 @@ hosts:
     service_name: "nginx"
     forward_ports:
       - guest: 80
-        host: 8082
+        host: 8882
     ip_address: "203.0.113.102"
     location: "DC1"
     sfc_id: "MS_Template_1"
@@ -52,7 +52,7 @@ hosts:
     service_name: "mongo"
     forward_ports:
       - guest: 80
-        host: 8083
+        host: 8883
     ip_address: "203.0.113.103"
     location: "DC1"
     sfc_id: "MS_Template_1"
@@ -69,7 +69,7 @@ hosts:
     service_name: "ffmpeg"
     forward_ports:
       - guest: 80
-        host: 8084
+        host: 8884
     ip_address: "203.0.113.104"
     location: "DC1"
     sfc_id: "MS_Template_1"
@@ -86,7 +86,7 @@ hosts:
     service_name: "host"
     forward_ports:
       - guest: 80
-        host: 8085
+        host: 8885
     ip_address: "203.0.113.105"
     location: "DC1"
     sfc_id: "MS_Template_1"

clmctest/monitoring/conftest.py

@@ -23,7 +23,7 @@ def streaming_sim_config():
 
 
 @pytest.fixture(params=[{'database': 'CLMCMetrics'}], scope='module')
-def get_db_client(streaming_sim_config, request):
+def influxdb(streaming_sim_config, request):
     """
     Creates an Influx DB client for the CLMC metrics database
 
@@ -32,5 +32,7 @@ def get_db_client(streaming_sim_config, request):
     :return: the created Influx DB client
     """
 
-    return InfluxDBClient(host=streaming_sim_config['hosts'][0]['ip_address'], port=8086, database=request.param['database'], timeout=10)
-
+    db = InfluxDBClient(host=streaming_sim_config['hosts'][0]['ip_address'], port=8086, database=request.param['database'], timeout=10)
+    db.drop_database(request.param['database'])
+    
+    return db

clmctest/monitoring/test_simresults.py

@@ -21,13 +21,13 @@ class TestSimulation(object):
         ('SELECT count(*) FROM "CLMCMetrics"."autogen"."vm_res_alloc"',
          {"time": "1970-01-01T00:00:00Z", "count_cpu": 12, "count_memory": 12, "count_storage": 12})
     ])
-    def test_simulation(self, query, expected_result, get_db_client, run_simulation_fixture):
+    def test_simulation(self, query, expected_result, influxdb, run_simulation_fixture):
         """
         This is the entry point of the test. This method will be found and executed when the module is ran using pytest
 
         :param query: the query to execute (value obtained from the pytest parameter decorator)
         :param expected_result: the result expected from executing the query (value obtained from the pytest parameter decorator)
-        :param get_db_client the import db client fixture - imported from contest.py
+        :param influxdb the import db client fixture - imported from contest.py
         :param run_simulation_fixture: the imported fixture to use to generate the testing data - the return value of the fixture is not needed in this case
         """
 
@@ -36,7 +36,7 @@ class TestSimulation(object):
         print("\n")  # prints a blank line for formatting purposes
 
         # the raise_errors=False argument is given so that we could actually test that the DB didn't return any errors instead of raising an exception
-        query_result = get_db_client.query(query, raise_errors=False)
+        query_result = influxdb.query(query, raise_errors=False)
 
         # test the error attribute of the result is None, that is no error is returned from executing the DB query
         assert query_result.error is None, "An error was encountered while executing query {0}.".format(query)

clmctest/scripts/rspec.yml

@@ -3,5 +3,5 @@ hosts:
     cpus: 1
     memory: 2048
     disk: "10GB"
-    ip_address: "200.0.113.150"
+    ip_address: "203.0.113.150"
     
\ No newline at end of file

scripts/build/deleteallvms.sh

+#!/bin/bash
+
+vboxmanage list vms | awk ' {print $1} ' | awk -F',' '{gsub(/"/, "", $1); print $1}' > runningvms
+
+while read vm_id; do
+  echo $vm_id
+  vboxmanage controlvm $vm_id poweroff
+  vboxmanage unregistervm $vm_id --delete
+done <runningvms
+
+rm runningvms
+