diff options
author | Victor Morales <victor.morales@intel.com> | 2018-04-23 15:38:39 -0700 |
---|---|---|
committer | Victor Morales <victor.morales@intel.com> | 2018-04-23 15:38:39 -0700 |
commit | a3bc880a08fe52de607ccd5c72800b8d1104ecfc (patch) | |
tree | 0c123c05f90e4369b33731b876097a7e9e414fda | |
parent | 53c52795b9008893dbf5739dfdafbaf100fa81ef (diff) |
Add Integration script
It was included the script to provides a development environment for
integration project. This environment can help to quickly run
integration tests.
Change-Id: I04bff61fbe7589b5ecda782df6a4cb0fddf1b3e2
Signed-off-by: Victor Morales <victor.morales@intel.com>
Issue-ID: INT-480
-rw-r--r-- | README.md | 43 | ||||
-rw-r--r-- | Vagrantfile | 17 | ||||
-rwxr-xr-x | lib/config/env-vars | 2 | ||||
-rwxr-xr-x | lib/integration | 28 | ||||
-rwxr-xr-x | tests/test_integration | 23 | ||||
-rw-r--r-- | tools/Run.ps1 | 6 | ||||
-rwxr-xr-x | tools/run.sh | 4 |
7 files changed, 94 insertions, 29 deletions
@@ -40,27 +40,28 @@ questions faced by new developers current options include: -| app_name | description | -|:----------:|-------------------------------------| -| aai | Active and Available Inventory | -| appc | Application Controller | -| ccsdk | Common Controller SDK | -| dcae | Data Collection Analytics & Events | -| dmaap | Data Movement as a Platform | -| mr | Message Router | -| mso | Master Service Orchestrator | -| msb | Microservices Bus Project | -| multicloud | Multi Cloud | -| oom | ONAP Operations Manager | -| policy | Policy | -| portal | Portal | -| robot | Robot | -| sdc | Service Design & Creation | -| sdnc | Software Defined Network Controller | -| vfc | Virtual Function Controller | -| vid | Virtual Infrastructure Development | -| vnfsdk | VNF SDK | -| vvp | VNF Validation Program | +| app_name | description | +|:-----------:|-------------------------------------| +| aai | Active and Available Inventory | +| appc | Application Controller | +| ccsdk | Common Controller SDK | +| dcae | Data Collection Analytics & Events | +| dmaap | Data Movement as a Platform | +| integration | Integration | +| mr | Message Router | +| mso | Master Service Orchestrator | +| msb | Microservices Bus Project | +| multicloud | Multi Cloud | +| oom | ONAP Operations Manager | +| policy | Policy | +| portal | Portal | +| robot | Robot | +| sdc | Service Design & Creation | +| sdnc | Software Defined Network Controller | +| vfc | Virtual Function Controller | +| vid | Virtual Infrastructure Development | +| vnfsdk | VNF SDK | +| vvp | VNF Validation Program | | app_name | description | |:----------:|------------------------------------------| diff --git a/Vagrantfile b/Vagrantfile index 7f379ed..d9a9542 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -113,7 +113,17 @@ nodes = [ :ram => 1 * 1024, :groups => ["individual"], :flavor => 'm1.small', - :args => [" "] + }, + { + :name => "integration", + :ips => ['10.252.0.23', "192.168.50.23"], + :macs => [], + :cpus => 2, + :cpu => "50", + :ram => 4 * 1024, + :groups => ["individual"], + :flavor => 'm1.small', + :args => ["integration"] }, { :name => "message-router", @@ -237,7 +247,6 @@ nodes = [ :ram => 4 * 1024, :groups => ["testing"], :flavor => 'm1.small', - :args => [""], }, { :name => "vfc", @@ -527,7 +536,9 @@ Vagrant.configure("2") do |config| nodeconfig.vm.provision 'shell' do |s| s.path = run_path - s.args = node[:args] + if node.has_key? :args + s.args = node[:args] + end s.env = configuration end diff --git a/lib/config/env-vars b/lib/config/env-vars index 65d6629..c448321 100755 --- a/lib/config/env-vars +++ b/lib/config/env-vars @@ -10,6 +10,7 @@ src_folders=( ["ccsdk"]="$git_src_folder/ccsdk" ["dcae"]="$git_src_folder/dcae" ["dmaap"]="$git_src_folder/dmaap" +["integration"]="$git_src_folder/integration" ["mr"]="$git_src_folder/dcae/message-router" ["msb"]="$git_src_folder/msb" ["mso"]="$git_src_folder/mso" @@ -51,6 +52,7 @@ dcae/utils/buildtools" dmaap/messagerouter dmaap/messagerouter/dmaapclient \ dmaap/messagerouter/messageservice dmaap/messagerouter/mirroragent \ dmaap/messagerouter/msgrtr" +["integration"]="integration integration/devtool integration/seccom" ["msb"]="msb/apigateway msb/discovery msb/java-sdk msb/swagger-sdk" ["mso"]="mso mso/chef-repo mso/docker-config mso/libs mso/mso-config" ["multicloud"]="multicloud multicloud/framework multicloud/openstack \ diff --git a/lib/integration b/lib/integration new file mode 100755 index 0000000..3f106ab --- /dev/null +++ b/lib/integration @@ -0,0 +1,28 @@ +#!/bin/bash + +source /var/onap/functions + +# install_integration - Function that installs dependecies for Integration projects +function install_integration { + echo "Install CSIT dependencies.." + install_packages python-virtualenv unzip sshuttle netcat libffi-dev libssl-dev + install_python_package tox robotframework docker-compose + install_python_package --upgrade requests robotframework-requests + install_docker + + echo "Running All CSIT tests..." + pushd ${src_folders[integration]}/test/csit + ./run-all-tests.sh + popd +} + +# init_integration() - Init Integration projects +function init_integration { + if [[ "$clone_repo" == "True" ]]; then + clone_repos "integration" + fi + + if [[ "$skip_install" == "False" ]]; then + install_integration + fi +} diff --git a/tests/test_integration b/tests/test_integration new file mode 100755 index 0000000..7032788 --- /dev/null +++ b/tests/test_integration @@ -0,0 +1,23 @@ +#!/bin/bash + +source /var/onap_tests/_test_base +source /var/onap/integration + +covered_functions=( +"clone_integration_repos" +) + +# test_clone_integration_repos() - Verify that Integration repositories are cloned properly +function test_clone_integration_repos { + clone_repos "integration" + + asserts_file_exist ${src_folders[integration]}/README.md + asserts_file_exist ${src_folders[integration]}/devtool/LICENSE + #asserts_file_exist ${src_folders[integration]}/seccom/ +} + +if [ "$1" != '*' ]; then + unset covered_functions + covered_functions=$1 +fi +main "${covered_functions[@]}" diff --git a/tools/Run.ps1 b/tools/Run.ps1 index 9e99607..8caff0e 100644 --- a/tools/Run.ps1 +++ b/tools/Run.ps1 @@ -31,7 +31,7 @@ https://wiki.onap.org/display/DW/ONAP+on+Vagrant #> Param( - [ValidateSet("all-in-one","dns", "mr", "sdc", "aai", "mso", "robot", "vid", "sdnc", "portal", "dcae", "policy", "appc", "vfc", "multicloud", "ccsdk", "vnfsdk", "vvp", "openstack", "msb", "oom", "dmaap", "testing")] + [ValidateSet("all-in-one","dns", "mr", "sdc", "aai", "mso", "robot", "vid", "sdnc", "portal", "dcae", "policy", "appc", "vfc", "multicloud", "ccsdk", "vnfsdk", "vvp", "openstack", "msb", "oom", "dmaap", "integration", "testing")] [Parameter(Mandatory=$True,Position=0)] [ValidateNotNullOrEmpty()] @@ -86,7 +86,7 @@ $env:SKIP_INSTALL=$skip_install switch ($Command) { "all-in-one" { $env:DEPLOY_MODE="all-in-one" } - { @("dns", "mr", "sdc", "aai", "mso", "robot", "vid", "sdnc", "portal", "dcae", "policy", "appc", "vfc", "multicloud", "ccsdk", "vnfsdk", "vvp", "openstack", "msb", "oom", "dmaap") -contains $_ } { $env:DEPLOY_MODE="individual" } + { @("dns", "mr", "sdc", "aai", "mso", "robot", "vid", "sdnc", "portal", "dcae", "policy", "appc", "vfc", "multicloud", "ccsdk", "vnfsdk", "vvp", "openstack", "msb", "oom", "dmaap", "integration") -contains $_ } { $env:DEPLOY_MODE="individual" } "testing" { $env:DEPLOY_MODE="testing" @@ -111,7 +111,7 @@ switch ($Command) } default { - Write-Output $"Usage: $0 {all-in-one|dns|mr|sdc|aai|mso|robot|vid|sdnc|portal|dcae|policy|appc|vfc|multicloud|ccsdk|vnfsdk|vvp|dmaap|testing}" + Write-Output $"Usage: $0 {all-in-one|dns|mr|sdc|aai|mso|robot|vid|sdnc|portal|dcae|policy|appc|vfc|multicloud|ccsdk|vnfsdk|vvp|dmaap|integration|testing}" exit 1 } } diff --git a/tools/run.sh b/tools/run.sh index fe955e1..9718370 100755 --- a/tools/run.sh +++ b/tools/run.sh @@ -16,7 +16,7 @@ Optional arguments: Test case to use in testing mode. Commands: all-in-one Deploy in all-in-one mode. - dns|mr|sdc|aai|mso|robot|vid|sdnc|portal|dcae|policy|appc|vfc|vnfsdk|multicloud|ccsdk|vvp|openstack|msb|oom|dmaap Deploy chosen service. + dns|mr|sdc|aai|mso|robot|vid|sdnc|portal|dcae|policy|appc|vfc|vnfsdk|multicloud|ccsdk|vvp|openstack|msb|oom|dmaap|integration Deploy chosen service. testing Deploy in testing mode. EOF } @@ -65,7 +65,7 @@ case $COMMAND in "all-in-one" ) export DEPLOY_MODE='all-in-one' ;; - "dns" | "mr" | "sdc" | "aai" | "mso" | "robot" | "vid" | "sdnc" | "portal" | "dcae" | "policy" | "appc" | "vfc" | "vnfsdk"| "multicloud" | "ccsdk" | "vvp" | "openstack" | "msb" | "oom" | "dmaap" ) + "dns" | "mr" | "sdc" | "aai" | "mso" | "robot" | "vid" | "sdnc" | "portal" | "dcae" | "policy" | "appc" | "vfc" | "vnfsdk"| "multicloud" | "ccsdk" | "vvp" | "openstack" | "msb" | "oom" | "dmaap" | "integration" ) export DEPLOY_MODE='individual' ;; "testing" ) |