diff options
| author |   Shashank Kumar Shankar <shashank.kumar.shankar@intel.com> | 2017-10-23 11:08:31 -0700 |
|---|---|---|
| committer |   Victor Morales <victor.morales@intel.com> | 2017-10-31 16:16:23 -0700 |
| commit | f84c9a17b05cb9532875afd23275ab8c9e17a91e (patch) | |
| tree | 860f3b6e255ea70ed4165794802324013ba01723 | |
| parent | 2ce8ec9f752e6f6790bef9dd82a7118718146246 (diff) | |
Add missing vnfsdk in the Vagrant file
This patch adds missing VNFSDK settings in the Vagrant file
and fixes a minor cloning issue in multicloud.
Issue-Id: INT-290
Change-Id: I9406f252708cf708ea1e92d91d1965b889f3ded0
Signed-off-by: Shashank Kumar Shankar <shashank.kumar.shankar@intel.com>
Signed-off-by: Victor Morales <victor.morales@intel.com>
| -rw-r--r-- | bootstrap/vagrant-onap/Vagrantfile | 12 | ||||
| -rwxr-xr-x | bootstrap/vagrant-onap/lib/multicloud | 16 | ||||
| -rw-r--r-- | bootstrap/vagrant-onap/tests/test_multicloud | 7 |
3 files changed, 24 insertions, 11 deletions
diff --git a/bootstrap/vagrant-onap/Vagrantfile b/bootstrap/vagrant-onap/Vagrantfile index d70cf8f8a..2490b1c75 100644 --- a/bootstrap/vagrant-onap/Vagrantfile +++ b/bootstrap/vagrant-onap/Vagrantfile @@ -212,6 +212,16 @@ nodes = [ :args => ['vid'], }, { + :name => "vnfsdk", + :ips => ['10.252.0.16', "192.168.50.16"], + :macs => [], + :cpus => 2, + :cpu => "50", + :ram => 4 * 1024, + :groups => ["individual"], + :args => ['vnfsdk'], + }, + { :name => "vvp", :ips => ['10.252.0.17', "192.168.50.17"], :macs => [], @@ -220,7 +230,7 @@ nodes = [ :ram => 4 * 1024, :groups => ["individual"], :args => ['vvp'], - }, + } ] run_path = 'vagrant_utils/postinstall.sh' diff --git a/bootstrap/vagrant-onap/lib/multicloud b/bootstrap/vagrant-onap/lib/multicloud index 1c781fed2..b4a185aaf 100755 --- a/bootstrap/vagrant-onap/lib/multicloud +++ b/bootstrap/vagrant-onap/lib/multicloud @@ -5,23 +5,21 @@ set -o xtrace source /var/onap/functions multicloud_src_folder=$git_src_folder/multicloud -multicloud_repos=("azure" "framework" "openstack" "openstack/vmware" "openstack/windriver") +multicloud_repos=("multicloud" "multicloud/framework" "multicloud/openstack" \ +"multicloud/openstack/vmware" "multicloud/openstack/windriver" \ +"multicloud/azure") # clone_multicloud_repos() - Function that clones the Multi Cloud repositories function clone_multicloud_repos { - clone_repo multicloud $multicloud_src_folder - - for dirc in ${multicloud_repos[@]}; do - clone_repo multicloud/$dirc $multicloud_src_folder/$dirc + for repo in ${multicloud_repos[@]}; do + clone_repo $repo $multicloud_src_folder${repo#*multicloud} done } # compile_multicloud_repos() - function compile_multicloud_repos { - compile_src multicloud $multicloud_src_folder - - for dirc in ${multicloud_repos[@]}; do - compile_src $multicloud_src_folder/$dirc + for repo in ${multicloud_repos[@]}; do + compile_src $multicloud_src_folder${repo#*multicloud} done } diff --git a/bootstrap/vagrant-onap/tests/test_multicloud b/bootstrap/vagrant-onap/tests/test_multicloud index 374272c1c..b0b674894 100644 --- a/bootstrap/vagrant-onap/tests/test_multicloud +++ b/bootstrap/vagrant-onap/tests/test_multicloud @@ -11,9 +11,12 @@ covered_functions=( function test_clone_multicloud_repos { clone_multicloud_repos - asserts_file_exist $multicloud_src_folder/framework/multivimbroker/pom.xml + #asserts_file_exist $multicloud_src_folder/ + asserts_file_exist $multicloud_src_folder/framework/pom.xml asserts_file_exist $multicloud_src_folder/openstack/pom.xml asserts_file_exist $multicloud_src_folder/openstack/vmware/pom.xml + asserts_file_exist $multicloud_src_folder/openstack/windriver/pom.xml + #asserts_file_exist $multicloud_src_folder/azure/ } # test_compile_multicloud_repos() - @@ -22,6 +25,8 @@ function test_compile_multicloud_repos { compile_multicloud_repos asserts_file_exist $multicloud_src_folder/openstack/newton/target/multicloud-openstack-newton-1.0.0-SNAPSHOT.zip + asserts_file_exist $multicloud_src_folder/openstack/ocata/target/multicloud-openstack-ocata-1.0.0-SNAPSHOT.zip + asserts_file_exist $multicloud_src_folder/openstack/windriver/target/multicloud-openstack-windriver-1.0.0-SNAPSHOT.zip } # test_get_multicloud_images() - |