diff options
Diffstat (limited to 'bootstrap')
| -rw-r--r-- | bootstrap/vagrant-onap/Vagrantfile | 673 | ||||
| -rwxr-xr-x | bootstrap/vagrant-onap/lib/portal | 26 | ||||
| -rw-r--r-- | bootstrap/vagrant-onap/lib/sdc | 10 | ||||
| -rwxr-xr-x | bootstrap/vagrant-onap/lib/sdnc | 2 | ||||
| -rwxr-xr-x | bootstrap/vagrant-onap/lib/vfc | 4 | ||||
| -rw-r--r-- | bootstrap/vagrant-onap/tests/test_policy | 8 | ||||
| -rw-r--r-- | bootstrap/vagrant-onap/tests/test_portal | 14 | ||||
| -rw-r--r-- | bootstrap/vagrant-onap/tests/test_sdc | 19 | ||||
| -rw-r--r-- | bootstrap/vagrant-onap/tests/test_sdnc | 51 |
9 files changed, 399 insertions, 408 deletions
diff --git a/bootstrap/vagrant-onap/Vagrantfile b/bootstrap/vagrant-onap/Vagrantfile index 8417cc953..800ed992e 100644 --- a/bootstrap/vagrant-onap/Vagrantfile +++ b/bootstrap/vagrant-onap/Vagrantfile @@ -1,8 +1,9 @@ # -*- mode: ruby -*- # vi: set ft=ruby : -conf = { -# Generic parameters used across all ONAP components + +configuration = { + # Generic parameters used across all ONAP components 'public_net_id' => '00000000-0000-0000-0000-000000000000', 'key_name' => 'ecomp_key', 'pub_key' => '', @@ -32,379 +33,381 @@ conf = { 'enable_oparent' => 'True' } -Vagrant.require_version ">= 1.8.6" -# Determine the OS for the host computer -module OS - def OS.windows? - (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM) != nil - end +box = { + :virtualbox => 'ubuntu/trusty64', + :libvirt => 'sputnik13/trusty64', + :openstack => nil +} - def OS.mac? - (/darwin/ =~ RUBY_PLATFORM) != nil - end - def OS.unix? - !OS.windows? - end +nodes = [ + { + :name => "aai", + :ips => ['10.252.0.6', "192.168.50.6"], + :macs => [], + :cpus => 2, + :cpu => "50", + :ram => 4 * 1024, + :groups => ["individual"], + :args => ["aai"] + }, + { + :name => "all-in-one", + :ips => ['10.252.0.3', "192.168.50.3"], + :macs => [], + :cpus => 2, + :cpu => "50", + :ram => 12 * 1024, + :groups => ["all-in-one"], + :flavor => 'm1.xlarge', + :args => ['mr', 'sdc', 'aai', 'mso', 'robot', 'vid', 'sdnc', 'portal', 'dcae', 'policy', 'appc', 'vfc', 'ccsdk'], + }, + { + :name => "appc", + :ips => ['10.252.0.14', "192.168.50.14"], + :macs => [], + :cpus => 2, + :cpu => "50", + :ram => 4 * 1024, + :groups => ["individual"], + :args => ["appc"], + }, + { + :name => "ccsdk", + :ips => ['10.252.0.14', "192.168.50.17"], + :macs => [], + :cpus => 2, + :cpu => "50", + :ram => 4 * 1024, + :groups => ["individual"], + :args => ["ccsdk"], + }, + { + :name => "dcae", + :ips => ['10.252.0.12', "192.168.50.12"], + :macs => [], + :cpus => 2, + :cpu => "50", + :ram => 4 * 1024, + :groups => ["individual"], + :args => ["dcae"], + }, + { + :name => "dns", + :ips => ['10.252.0.3', "192.168.50.3"], + :macs => [], + :cpus => 2, + :cpu => "50", + :ram => 1 * 1024, + :groups => ["individual"], + :flavor => 'm1.small', + :args => [" "] + }, + { + :name => "message-router", + :ips => ['10.252.0.4', "192.168.50.4"], + :macs => [], + :cpus => 2, + :cpu => "50", + :ram => 4 * 1024, + :groups => ["individual"], + :args => ["mr"], + }, + { + :name => "mso", + :ips => ['10.252.0.7', "192.168.50.7"], + :macs => [], + :cpus => 2, + :cpu => "50", + :ram => 4 * 1024, + :groups => ["individual"], + :args => ["mso"], + }, + { + :name => "multicloud", + :ips => ['10.252.0.16', "192.168.50.16"], + :macs => [], + :cpus => 2, + :cpu => "50", + :ram => 4 * 1024, + :groups => ["individual"], + :args => ["multicloud"], + }, + { + :name => "policy", + :ips => ['10.252.0.13', "192.168.50.13"], + :macs => [], + :cpus => 2, + :cpu => "50", + :ram => 4 * 1024, + :groups => ["individual"], + :args => ["policy"], + }, + { + :name => "portal", + :ips => ['10.252.0.11', "192.168.50.11"], + :macs => [], + :cpus => 2, + :cpu => "50", + :ram => 4 * 1024, + :groups => ["individual"], + :args => ["portal"], + }, + { + :name => "robot", + :ips => ['10.252.0.8', "192.168.50.8"], + :macs => [], + :cpus => 2, + :cpu => "50", + :ram => 4 * 1024, + :groups => ["individual"], + :args => ["robot"], + }, + { + :name => "sdc", + :ips => ['10.252.0.5', "192.168.50.5"], + :macs => [], + :cpus => 2, + :cpu => "50", + :ram => 8 * 1024, + :groups => ["individual"], + :args => ["sdc"], + }, + { + :name => "sdnc", + :ips => ['10.252.0.10', "192.168.50.10"], + :macs => [], + :cpus => 2, + :cpu => "50", + :ram => 4 * 1024, + :groups => ["individual"], + :args => ["sdnc"], + }, + { + :name => "testing", + :ips => ['10.252.0.3', "192.168.50.3"], + :macs => [], + :cpus => 2, + :cpu => "50", + :ram => 4 * 1024, + :groups => ["testing"], + :flavor => 'm1.small', + :args => [""], + }, + { + :name => "vfc", + :ips => ['10.252.0.15', "192.168.50.15"], + :macs => [], + :cpus => 2, + :cpu => "50", + :ram => 4 * 1024, + :groups => ["individual"], + :args => ['vfc'], + }, + { + :name => "vid", + :ips => ['10.252.0.9', "192.168.50.9"], + :macs => [], + :cpus => 2, + :cpu => "50", + :ram => 4 * 1024, + :groups => ["individual"], + :args => ['vid'], + }, +] + + +run_path = 'vagrant_utils/postinstall.sh' +sdc_volume = 'vol1-sdc-data.vdi' - def OS.linux? - OS.unix? and not OS.mac? - end -end - -if OS.windows? - puts "Vagrant launched from windows. This configuration has not fully tested." -end +Vagrant.require_version ">= 1.8.6" # Determine the provider used provider = (ENV['VAGRANT_DEFAULT_PROVIDER'] || :virtualbox).to_sym -puts "Using #{provider} provider" +puts "[INFO] Provider: #{provider} " vd_conf = ENV.fetch('VD_CONF', 'etc/settings.yaml') if File.exist?(vd_conf) require 'yaml' user_conf = YAML.load_file(vd_conf) - conf.update(user_conf) + configuration.update(user_conf) end -deploy_mode = ENV.fetch('DEPLOY_MODE', 'individual') -sdc_volume='vol1-sdc-data.vdi' +#Set network interface +is_windows = Gem.win_platform? +if is_windows + net_interface = 'VirtualBox Host-Only Ethernet Adapter #2' +else + net_interface = 'vboxnet0' +end +puts "[INFO] Net interface: #{net_interface}" -Vagrant.configure("2") do |config| - if ENV['http_proxy'] != nil and ENV['https_proxy'] != nil and ENV['no_proxy'] != nil - if not Vagrant.has_plugin?('vagrant-proxyconf') - system 'vagrant plugin install vagrant-proxyconf' - raise 'vagrant-proxyconf was installed but it requires to execute again' - end - config.proxy.http = ENV['http_proxy'] - config.proxy.https = ENV['https_proxy'] - config.proxy.no_proxy = ENV['no_proxy'] - end - - if Vagrant.has_plugin?('vagrant-vbguest') - puts 'vagrant-vbguest auto_update feature will be disable to avoid sharing conflicts' - config.vbguest.auto_update = false - end - - config.vm.box = 'ubuntu/trusty64' - if provider == :libvirt - config.vm.box = 'sputnik13/trusty64' - if not Vagrant.has_plugin?('vagrant-libvirt') - system 'vagrant plugin install vagrant-libvirt' - raise 'vagrant-libvirt was installed but it requires to execute again' - end - end - if provider == :openstack - config.vm.box = nil - config.ssh.username = 'ubuntu' - if not Vagrant.has_plugin?('vagrant-openstack-provider') - system 'vagrant plugin install vagrant-openstack-provider' - raise 'vagrant-openstack-provider was installed but it requires to execute again' - end - end - #config.vm.provision "docker" - config.vm.synced_folder './opt', '/opt/', create: true - config.vm.synced_folder './lib', '/var/onap/', create: true - config.vm.synced_folder '~/.m2', '/root/.m2/', create: true - - config.vm.provider :virtualbox do |v| - v.customize ["modifyvm", :id, "--memory", 4 * 1024] - end - config.vm.provider :libvirt do |v| - v.memory = 4 * 1024 - v.nested = true - end - config.vm.provider :openstack do |v| - - v.openstack_auth_url = ENV.fetch('OS_AUTH_URL', '') - v.tenant_name = ENV.fetch('OS_TENANT_NAME', '') - v.username = ENV.fetch('OS_USERNAME', '') - v.password = ENV.fetch('OS_PASSWORD', '') - v.region = ENV.fetch('OS_REGION_NAME', '') - v.identity_api_version = ENV.fetch('OS_IDENTITY_API_VERSION', '') - v.domain_name = ENV.fetch('OS_PROJECT_DOMAIN_ID', '') - v.project_name = ENV.fetch('OS_PROJECT_NAME', '') - - v.floating_ip_pool = ENV.fetch('OS_FLOATING_IP_POOL', '') - v.floating_ip_pool_always_allocate = (ENV['OS_FLOATING_IP_ALWAYS_ALLOCATE'] == 'true') - v.image = ENV.fetch('OS_IMAGE', '') - v.security_groups = [ENV.fetch('OS_SEC_GROUP', '')] - v.flavor = 'm1.medium' - v.networks = ENV.fetch('OS_NETWORK', '') - end - - case deploy_mode - - when 'all-in-one' - - config.vm.define :all_in_one do |all_in_one| - all_in_one.vm.hostname = 'all-in-one' - all_in_one.vm.network :private_network, ip: '192.168.50.3' - all_in_one.vm.provider "virtualbox" do |v| - v.customize ["modifyvm", :id, "--memory", 12 * 1024] - unless File.exist?(sdc_volume) - v.customize ['createhd', '--filename', sdc_volume, '--size', 20 * 1024] - end - v.customize ['storageattach', :id, '--storagectl', 'SATAController', '--port', 1, '--device', 0, '--type', 'hdd', '--medium', sdc_volume] - end - all_in_one.vm.provider "libvirt" do |v| - v.memory = 12 * 1024 - v.nested = true - v.storage :file, path: sdc_volume, bus: 'sata', device: 'vdb', size: '2G' - end - all_in_one.vm.provider "openstack" do |v| - v.server_name = 'all-in-one' - v.flavor = 'm1.xlarge' - end - all_in_one.vm.provision 'shell' do |s| - s.path = 'vagrant_utils/postinstall.sh' - s.args = ['mr', 'sdc', 'aai', 'mso', 'robot', 'vid', 'sdnc', 'portal', 'dcae', 'policy', 'appc', 'vfc', 'ccsdk'] - s.env = conf - end +#If argument is given use it. Otherwise use Env: DEPLOY_MODE else use default +requested_machine = ARGV[1] + +deploy_mode = ENV.fetch('DEPLOY_MODE', 'individual') +if requested_machine != nil + if requested_machine.include?("all-in-one") || requested_machine.include?("testing") + deploy_mode = requested_machine end +end - when 'individual' +#Catch the status of all machines +if ARGV[0] == 'status' || ARGV[0] == 'destroy' + deploy_mode = 'NA' +end - config.vm.define :dns do |dns| - dns.vm.hostname = 'dns' - dns.vm.network :private_network, ip: '192.168.50.3' - dns.vm.provider "virtualbox" do |v| - v.customize ["modifyvm", :id, "--memory", 1 * 1024] - end - dns.vm.provider "libvirt" do |v| - v.memory = 1 * 1024 - v.nested = true - end - dns.vm.provider "openstack" do |v| - v.server_name = 'dns' - v.flavor = 'm1.small' - end - dns.vm.provision 'shell' do |s| - s.path = 'vagrant_utils/postinstall.sh' - s.env = conf - end - end +puts "[INFO] Deploy Mode: #{deploy_mode}" - config.vm.define :mr do |mr| - mr.vm.hostname = 'message-router' - mr.vm.network :private_network, ip: '192.168.50.4' - mr.vm.provider "openstack" do |v| - v.server_name = 'message-router' - end - mr.vm.provision 'shell' do |s| - s.path = 'vagrant_utils/postinstall.sh' - s.args = ['mr'] - s.env = conf - end - end +#In case of all-in-one or testing clean the nodes list +case deploy_mode + when 'all-in-one' + nodes.select! do |node| + if node[:name].include?("all-in-one") + true if node[:name] + end + end - config.vm.define :sdc do |sdc| - sdc.vm.hostname = 'sdc' - sdc.vm.network :private_network, ip: '192.168.50.5' - sdc.vm.provider "virtualbox" do |v| - unless File.exist?(sdc_volume) - v.customize ['createhd', '--filename', sdc_volume, '--size', 20 * 1024] + when 'individual' + nodes.select! do |node| + if node[:groups][0].include?("individual") + true if node[:name] + end end - v.customize ['storageattach', :id, '--storagectl', 'SATAController', '--port', 1, '--device', 0, '--type', 'hdd', '--medium', sdc_volume] - end - sdc.vm.provider "libvirt" do |v| - v.storage :file, path: sdc_volume, bus: 'sata', device: 'vdb', size: '2G' - end - sdc.vm.provider "openstack" do |v| - v.server_name = 'sdc' - end - sdc.vm.provision 'shell' do |s| - s.path = 'vagrant_utils/postinstall.sh' - s.args = ['sdc'] - s.env = conf - end - end - config.vm.define :aai do |aai| - aai.vm.hostname = 'aai' - aai.vm.network :private_network, ip: '192.168.50.6' - aai.vm.provider "openstack" do |v| - v.server_name = 'aai' - end - aai.vm.provision 'shell' do |s| - s.path = 'vagrant_utils/postinstall.sh' - s.args = ['aai'] - s.env = conf - end - end + when 'testing' + nodes.select! do |node| + if node[:name].include?("testing") + true if node[:name] + end + end +end - config.vm.define :mso do |mso| - mso.vm.hostname = 'mso' - mso.vm.network :private_network, ip: '192.168.50.7' - mso.vm.provider "openstack" do |v| - v.server_name = 'mso' - end - mso.vm.provision 'shell' do |s| - s.path = 'vagrant_utils/postinstall.sh' - s.args = ['mso'] - s.env = conf - end - end - - config.vm.define :robot do |robot| - robot.vm.hostname = 'robot' - robot.vm.network :private_network, ip: '192.168.50.8' - robot.vm.provider "openstack" do |v| - v.server_name = 'robot' - end - robot.vm.provision 'shell' do |s| - s.path = 'vagrant_utils/postinstall.sh' - s.args = ['robot'] - s.env = conf - end - end +Vagrant.configure("2") do |config| - config.vm.define :vid do |vid| - vid.vm.hostname = 'vid' - vid.vm.network :private_network, ip: '192.168.50.9' - vid.vm.provider "openstack" do |v| - v.server_name = 'vid' - end - vid.vm.provision 'shell' do |s| - s.path = 'vagrant_utils/postinstall.sh' - s.args = ['vid'] - s.env = conf + # PROXY definitions + if ENV['http_proxy'] != nil and ENV['https_proxy'] != nil and ENV['no_proxy'] != nil + if not Vagrant.has_plugin?('vagrant-proxyconf') + system 'vagrant plugin install vagrant-proxyconf' + raise 'vagrant-proxyconf was installed but it requires to execute again' end + config.proxy.http = ENV['http_proxy'] + config.proxy.https = ENV['https_proxy'] + config.proxy.no_proxy = ENV['no_proxy'] end - config.vm.define :sdnc do |sdnc| - sdnc.vm.hostname = 'sdnc' - sdnc.vm.network :private_network, ip: '192.168.50.10' - sdnc.vm.provider "openstack" do |v| - v.server_name = 'sdnc' - end - sdnc.vm.provision 'shell' do |s| - s.path = 'vagrant_utils/postinstall.sh' - s.args = ['sdnc'] - s.env = conf - end + if Vagrant.has_plugin?('vagrant-vbguest') + puts 'vagrant-vbguest auto_update feature will be disable to avoid sharing conflicts' + config.vbguest.auto_update = false end - config.vm.define :portal do |portal| - portal.vm.hostname = 'portal' - portal.vm.network :private_network, ip: '192.168.50.11' - portal.vm.provider "openstack" do |v| - v.server_name = 'portal' - end - portal.vm.provision 'shell' do |s| - s.path = 'vagrant_utils/postinstall.sh' - s.args = ['portal'] - s.env = conf + if provider == :libvirt + if not Vagrant.has_plugin?('vagrant-libvirt') + system 'vagrant plugin install vagrant-libvirt' + raise 'vagrant-libvirt was installed but it requires to execute again' end end - - config.vm.define :dcae do |dcae| - dcae.vm.hostname = 'dcae' - dcae.vm.network :private_network, ip: '192.168.50.12' - dcae.vm.provider "openstack" do |v| - v.server_name = 'dcae' - end - dcae.vm.provision 'shell' do |s| - s.path = 'vagrant_utils/postinstall.sh' - s.args = ['dcae'] - s.env = conf + if provider == :openstack + config.ssh.username = 'ubuntu' + if not Vagrant.has_plugin?('vagrant-openstack-provider') + system 'vagrant plugin install vagrant-openstack-provider' + raise 'vagrant-openstack-provider was installed but it requires to execute again' end end - config.vm.define :policy do |policy| - policy.vm.hostname = 'policy' - policy.vm.network :private_network, ip: '192.168.50.13' - policy.vm.provider "openstack" do |v| - v.server_name = 'policy' - end - policy.vm.provision 'shell' do |s| - s.path = 'vagrant_utils/postinstall.sh' - s.args = ['policy'] - s.env = conf - end - end + nodes.each do |node| + config.vm.define node[:name] do |nodeconfig| - config.vm.define :appc do |appc| - appc.vm.hostname = 'appc' - appc.vm.network :private_network, ip: '192.168.50.14' - appc.vm.provider "openstack" do |v| - v.server_name = 'appc' - end - appc.vm.provision 'shell' do |s| - s.path = 'vagrant_utils/postinstall.sh' - s.args = ['appc'] - s.env = conf - end - end + # Common Settings: - config.vm.define :vfc do |vfc| - vfc.vm.hostname = 'vfc' - vfc.vm.network :private_network, ip: '192.168.50.15' - vfc.vm.provider "openstack" do |v| - v.server_name = 'vfc' - end - vfc.vm.provision 'docker' - vfc.vm.provision 'shell' do |s| - s.path = 'vagrant_utils/postinstall.sh' - s.args = ['vfc'] - s.env = conf - end - end + nodeconfig.vm.provider "virtualbox" do |vbox| + vbox.customize ['modifyvm', :id, '--nictype1', 'virtio'] + vbox.customize ['modifyvm', :id, '--audio', 'none'] + vbox.customize ['modifyvm', :id, '--vram', '1'] + vbox.customize ['modifyvm', :id, "--cpuhotplug", "off"] + vbox.customize ['modifyvm', :id, "--cpuexecutioncap", node[:cpu]] + vbox.customize ['modifyvm', :id, "--cpus", node[:cpus]] + vbox.customize ["modifyvm", :id, "--memory", node[:ram]] + end - config.vm.define :multicloud do |multicloud| - multicloud.vm.hostname = 'multicloud' - multicloud.vm.network :private_network, ip: '192.168.50.16' - multicloud.vm.provider "openstack" do |v| - v.server_name = 'multicloud' - end - multicloud.vm.provision 'shell' do |s| - s.path = 'vagrant_utils/postinstall.sh' - s.args = ['multicloud'] - s.env = conf - end - end + nodeconfig.vm.provider "libvirt" do |lbox| + lbox.memory = node[:ram] + lbox.nested = true + end - config.vm.define :ccsdk do |ccsdk| - ccsdk.vm.hostname = 'ccsdk' - ccsdk.vm.network :private_network, ip: '192.168.50.17' - ccsdk.vm.provider "openstack" do |v| - v.server_name = 'ccsdk' - end - ccsdk.vm.provision 'shell' do |s| - s.path = 'vagrant_utils/postinstall.sh' - s.args = ['ccsdk'] - s.env = conf - end - end + nodeconfig.vm.provider :openstack do |obox| + obox.openstack_auth_url = ENV.fetch('OS_AUTH_URL', '') + obox.tenant_name = ENV.fetch('OS_TENANT_NAME', '') + obox.username = ENV.fetch('OS_USERNAME', '') + obox.password = ENV.fetch('OS_PASSWORD', '') + obox.region = ENV.fetch('OS_REGION_NAME', '') + obox.identity_api_version = ENV.fetch('OS_IDENTITY_API_VERSION', '') + obox.domain_name = ENV.fetch('OS_PROJECT_DOMAIN_ID', '') + obox.project_name = ENV.fetch('OS_PROJECT_NAME', '') + obox.floating_ip_pool = ENV.fetch('OS_FLOATING_IP_POOL', '') + obox.floating_ip_pool_always_allocate = (ENV['OS_FLOATING_IP_ALWAYS_ALLOCATE'] == 'true') + obox.image = ENV.fetch('OS_IMAGE', '') + obox.security_groups = [ENV.fetch('OS_SEC_GROUP', '')] + obox.networks = ENV.fetch('OS_NETWORK', '') + obox.flavor = node[:flavor] + obox.server_name = node[:name] + end - when 'testing' + # Set Box type + nodeconfig.vm.box = box[provider] - config.vm.define :testing do |testing| - test_suite = ENV.fetch('TEST_SUITE', '*') - test_case = ENV.fetch('TEST_CASE', '*') + # Set Node name + nodeconfig.vm.hostname = node[:name] - testing.vm.hostname = 'testing' - testing.vm.network :private_network, ip: '192.168.50.3' - testing.vm.synced_folder './tests', '/var/onap_tests/', create: true - testing.vm.provider "virtualbox" do |v| - v.customize ["modifyvm", :id, "--memory", 4 * 1024] - end - testing.vm.provider "libvirt" do |v| - v.memory = 4 * 1024 - v.nested = true - end - testing.vm.provider "openstack" do |v| - v.server_name = 'testing' - v.flavor = 'm1.small' - end - testing.vm.provision 'shell' do |s| - s.path = 'vagrant_utils/unit_testing.sh' - s.args = [test_suite, test_case] - s.env = conf - end - end + # Set Sync Folder + nodeconfig.vm.synced_folder ".", "/vagrant", disabled: true + nodeconfig.vm.synced_folder './opt', '/opt/', create: true + nodeconfig.vm.synced_folder './lib', '/var/onap/', create: true + if !is_windows + nodeconfig.vm.synced_folder '~/.m2', '/root/.m2/', create: true + end + # Set Network + nodeconfig.vm.network :private_network, ip: node[:ips][1] + + # Specific settings: + + #Set Storage (For SDC or All-in-one) + if node[:name].include?("all-in-one") || node[:name].include?("sdc") + nodeconfig.vm.provider "virtualbox" do |v| + unless File.exist?(sdc_volume) + v.customize ['createhd', '--filename', sdc_volume, '--size', 20 * 1024] + end + v.customize ['storageattach', :id, '--storagectl', 'SATAController', '--port', 1, '--device', 0, '--type', 'hdd', '--medium', sdc_volume] + end + + nodeconfig.vm.provider "libvirt" do |v| + v.storage :file, path: sdc_volume, bus: 'sata', device: 'vdb', size: '2G' + end + end + + + if node[:name].include? "testing" + nodeconfig.vm.synced_folder './tests', '/var/onap_tests/', create: true + test_suite = ENV.fetch('TEST_SUITE', '*') + test_case = ENV.fetch('TEST_CASE', '*') + # Override variables + run_path = 'vagrant_utils/unit_testing.sh' + node[:args] = [test_suite, test_case] + end - end -end + + if node[:name].include? "vfc" + nodeconfig.vm.provision 'docker' + end + + nodeconfig.vm.provision 'shell' do |s| + s.path = run_path + s.args = node[:args] + s.env = configuration + end + + end #nodeconfig + end #node +end #config diff --git a/bootstrap/vagrant-onap/lib/portal b/bootstrap/vagrant-onap/lib/portal index 505bdde0c..998d6c075 100755 --- a/bootstrap/vagrant-onap/lib/portal +++ b/bootstrap/vagrant-onap/lib/portal @@ -4,26 +4,26 @@ set -o xtrace source /var/onap/functions -policy_src_folder=$git_src_folder/portal -policy_repos=("sdk") +portal_src_folder=$git_src_folder/portal +portal_repos=("sdk") # clone_all_portal_repos() - Function that clones Portal source repo. function clone_all_portal_repos { - clone_repo portal $policy_src_folder - clone_repo ecompsdkos $policy_src_folder/ecompsdkos - clone_repo "ui/dmaapbc" $policy_src_folder/dmaapbc + clone_repo portal $portal_src_folder + clone_repo ecompsdkos $portal_src_folder/ecompsdkos + clone_repo "ui/dmaapbc" $portal_src_folder/dmaapbc - for dirc in ${policy_repos[@]}; do - clone_repo portal/$dirc $policy_src_folder/$dirc + for dirc in ${portal_repos[@]}; do + clone_repo portal/$dirc $portal_src_folder/$dirc done } # compile_all_portal_repos() - Function that compiles Portal source repo. function compile_all_portal_repos { - compile_src $policy_src_folder + compile_src $portal_src_folder - for dirc in ${policy_repos[@]}; do - compile_src $policy_src_folder/$dirc + for dirc in ${portal_repos[@]}; do + compile_src $portal_src_folder/$dirc done } @@ -31,14 +31,12 @@ function compile_all_portal_repos { function _build_portal_images { install_maven - pushd $policy_src_folder/deliveries + pushd $portal_src_folder/deliveries chmod +x *.sh export MVN=$(which mvn) export GLOBAL_SETTINGS_FILE=/usr/share/maven3/conf/settings.xml export SETTINGS_FILE=$HOME/.m2/settings.xml bash build_portalapps_dockers.sh - compile_src $policy_src_folder/ecomp-portal-widget-ms - build_docker_image $policy_src_folder/ecomp-portal-widget-ms popd } @@ -64,7 +62,7 @@ function install_portal { docker rm -f ecompdb_portal docker rm -f 1610-1 - pushd $policy_src_folder/deliveries + pushd $portal_src_folder/deliveries mkdir -p /PROJECT/OpenSource/UbuntuEP/logs install_package unzip unzip -o etc.zip -d /PROJECT/OpenSource/UbuntuEP/ diff --git a/bootstrap/vagrant-onap/lib/sdc b/bootstrap/vagrant-onap/lib/sdc index 275f64485..9ec04b21b 100644 --- a/bootstrap/vagrant-onap/lib/sdc +++ b/bootstrap/vagrant-onap/lib/sdc @@ -5,7 +5,7 @@ set -o xtrace source /var/onap/functions sdc_src_folder=$git_src_folder/sdc -sdc_repos=("sdc-os-chef" "jtosca" "sdc-distribution-client" "sdc-titan-cassandra" "sdc-tosca" "sdc_common") +sdc_repos=("jtosca" "sdc-distribution-client" "sdc-docker-base" "sdc-titan-cassandra" "sdc-tosca" "sdc-vnfdesign" "sdc-workflow-designer" "sdc_common") # _mount_external_partition() - Create partition and mount the external volume function _mount_external_partition { @@ -69,7 +69,7 @@ function get_sdc_images { if [[ "$compile_repo" != "True" ]]; then compile_src $sdc_src_folder fi - build_docker_image $sdc_src_folder/sdc-os-chef docker + build_docker_image $sdc_src_folder/sdc-docker-base else for image in backend frontend elasticsearch kibana cassandra sanity; do pull_openecomp_image openecomp/sdc-$image @@ -81,8 +81,6 @@ function get_sdc_images { function install_sdc { local ENV_NAME=$dmaap_topic local MR_IP_ADDR='10.0.11.1' - local RELEASE=$docker_version - NEXUS_DOCKER_PORT=$(echo $nexus_docker_repo | cut -d':' -f2) _init_data_folders cp $sdc_src_folder/sdc-os-chef/environments/Template.json /data/environments @@ -99,7 +97,9 @@ function install_sdc { install_docker if [[ "$pull_docker_image" == "True" ]]; then docker_openecomp_login - bash /data/scripts/docker_run.sh -e $ENV_NAME -r $RELEASE -p $NEXUS_DOCKER_PORT + bash /data/scripts/docker_run.sh -e $ENV_NAME -r $docker_version -p $(echo $nexus_docker_repo | cut -d':' -f2) + else + bash /data/scripts/docker_run.sh -e $ENV_NAME -l fi } diff --git a/bootstrap/vagrant-onap/lib/sdnc b/bootstrap/vagrant-onap/lib/sdnc index 770f6be9f..c6d013b79 100755 --- a/bootstrap/vagrant-onap/lib/sdnc +++ b/bootstrap/vagrant-onap/lib/sdnc @@ -6,7 +6,7 @@ source /var/onap/functions source /var/onap/ccsdk sdnc_src_folder=$git_src_folder/openecomp/sdnc -sdnc_repos=("core" "adaptors" "northbound" "plugins" "oam") +sdnc_repos=("adaptors" "architecture" "core" "features" "northbound" "oam" "parent" "plugins") # clone_all_sdnc_repos() - Function that clones SDNC source repo. function clone_all_sdnc_repos { diff --git a/bootstrap/vagrant-onap/lib/vfc b/bootstrap/vagrant-onap/lib/vfc index 2d1418258..fb32708e0 100755 --- a/bootstrap/vagrant-onap/lib/vfc +++ b/bootstrap/vagrant-onap/lib/vfc @@ -19,8 +19,8 @@ function clone_all_vfc_repos { function compile_all_vfc_repos { install_python_package tox - tox_repos=("gvnfm/vnflcm/lcm" "gvnfm/vnfmgr/mgr" "gvnfm/vnfres/res" "nfvo/lcm" - "nfvo/driver/vnfm/gvnfm/gvnfmadapter" "nfvo/driver/vnfm/svnfm/zte/vmanager") + tox_repos=("gvnfm/vnflcm/lcm" "gvnfm/vnfmgr/mgr" "gvnfm/vnfres/res" "nfvo/lcm" \ + "nfvo/driver/vnfm/gvnfm/gvnfmadapter" "nfvo/driver/vnfm/svnfm/zte/vmanager") for dirc in ${tox_repos[@]}; do pushd $src_folder/$dirc tox -e py27 diff --git a/bootstrap/vagrant-onap/tests/test_policy b/bootstrap/vagrant-onap/tests/test_policy index d7ed98df6..0c544cd7d 100644 --- a/bootstrap/vagrant-onap/tests/test_policy +++ b/bootstrap/vagrant-onap/tests/test_policy @@ -27,20 +27,20 @@ function test_clone_all_policy_repos { # test_compile_all_policy_repos() - Verify compiling of Policy source code function test_compile_all_policy_repos { -# clone_all_policy_repos -# compile_all_policy_repos + clone_all_policy_repos + compile_all_policy_repos asserts_file_exist $policy_src_folder/common/common-logging/target/ONAP-Logging-1.1.0-SNAPSHOT.jar asserts_file_exist $policy_src_folder/common/integrity-audit/target/integrity-audit-1.1.0-SNAPSHOT.jar asserts_file_exist $policy_src_folder/common/integrity-monitor/target/integrity-monitor-1.1.0-SNAPSHOT.jar asserts_file_exist $policy_src_folder/common/site-manager/target/site-manager-1.1.0-SNAPSHOT.jar - for actor in appc mso test vfc; do + for actor in appc appclcm so test vfc; do asserts_file_exist $policy_src_folder/drools-applications/controlloop/common/actors/actor.$actor/target/actor.$actor-1.1.0-SNAPSHOT.jar done asserts_file_exist $policy_src_folder/drools-applications/controlloop/common/actors/actorServiceProvider/target/actorServiceProvider-1.1.0-SNAPSHOT.jar asserts_file_exist $policy_src_folder/drools-applications/controlloop/common/eventmanager/target/eventmanager-1.1.0-SNAPSHOT.jar asserts_file_exist $policy_src_folder/drools-applications/controlloop/common/guard/target/guard-1.1.0-SNAPSHOT.jar - for module in aai appc events mso rest sdc trafficgenerator vfc; do + for module in aai appc appclcm events rest sdc so trafficgenerator vfc; do asserts_file_exist $policy_src_folder/drools-applications/controlloop/common/model-impl/$module/target/$module-1.1.0-SNAPSHOT.jar done asserts_file_exist $policy_src_folder/drools-applications/controlloop/common/policy-yaml/target/policy-yaml-1.1.0-SNAPSHOT.jar diff --git a/bootstrap/vagrant-onap/tests/test_portal b/bootstrap/vagrant-onap/tests/test_portal index d586b73f5..ebfd21de8 100644 --- a/bootstrap/vagrant-onap/tests/test_portal +++ b/bootstrap/vagrant-onap/tests/test_portal @@ -14,10 +14,10 @@ covered_functions=( function test_clone_all_portal_repos { clone_all_portal_repos - asserts_file_exist $policy_src_folder/pom.xml - asserts_file_exist $policy_src_folder/ecompsdkos/LICENSE.txt - asserts_file_exist $policy_src_folder/dmaapbc/pom.xml - asserts_file_exist $policy_src_folder/sdk/LICENSE.txt + asserts_file_exist $portal_src_folder/pom.xml + asserts_file_exist $portal_src_folder/ecompsdkos/LICENSE.txt + asserts_file_exist $portal_src_folder/dmaapbc/pom.xml + asserts_file_exist $portal_src_folder/sdk/LICENSE.txt } # test_compile_all_portal_repos() - Verify compiling of Portal source code @@ -25,9 +25,9 @@ function test_compile_all_portal_repos { clone_all_portal_repos compile_all_portal_repos - asserts_file_exist $policy_src_folder/ecomp-portal-BE-common/target/ecompportal-be-common.war - asserts_file_exist $policy_src_folder/ecomp-portal-BE-common-test/target/ecomp-portal-BE-common-test.jar - asserts_file_exist $policy_src_folder/ecomp-portal-BE-os/target/ecompportal-be-os.war + asserts_file_exist $portal_src_folder/ecomp-portal-BE-common/target/ecompportal-be-common.war + asserts_file_exist $portal_src_folder/ecomp-portal-BE-common-test/target/ecomp-portal-BE-common-test.jar + asserts_file_exist $portal_src_folder/ecomp-portal-BE-os/target/ecompportal-be-os.war } # test_get_portal_images() - Verify that Portal Docker images are retrieved or built properly diff --git a/bootstrap/vagrant-onap/tests/test_sdc b/bootstrap/vagrant-onap/tests/test_sdc index bb0cd7010..9b6f5a5a5 100644 --- a/bootstrap/vagrant-onap/tests/test_sdc +++ b/bootstrap/vagrant-onap/tests/test_sdc @@ -1,7 +1,7 @@ #!/bin/bash source /var/onap_tests/_test_base -source /var/onap/asdc +source /var/onap/sdc covered_functions=( "clone_all_sdc_repos" "compile_all_sdc_repos" "get_sdc_images" "install_sdc" @@ -26,11 +26,10 @@ function test_compile_all_sdc_repos { compile_all_sdc_repos asserts_file_exist $sdc_src_folder/jtosca/target/jtosca-1.1.10-SNAPSHOT.jar - asserts_file_exist $sdc_src_folder/sdc-distribution-client/sdc-distribution-ci/target/sdc-distribution-ci-1.1.32-SNAPSHOT.jar - asserts_file_exist $sdc_src_folder/sdc-distribution-client/sdc-distribution-client/target/sdc-distribution-client-1.1.32-SNAPSHOT.jar - asserts_file_exist $sdc_src_folder/sdc-os-chef/target/sdc-os-chef-1.1.0-SNAPSHOT.jar - asserts_file_exist $sdc_src_folder/sdc-titan-cassandra/target/sdc-titan-cassandra-1.0.0.jar - asserts_file_exist $sdc_src_folder/sdc-tosca/target/sdc-tosca-1.1.50-SNAPSHOT.jar + asserts_file_exist $sdc_src_folder/sdc-distribution-client/sdc-distribution-ci/target/sdc-distribution-ci-1.1.*-SNAPSHOT.jar + asserts_file_exist $sdc_src_folder/sdc-distribution-client/sdc-distribution-client/target/sdc-distribution-client-1.1.*-SNAPSHOT.jar + asserts_file_exist $sdc_src_folder/sdc-titan-cassandra/target/jamm-0.3.0.jar + asserts_file_exist $sdc_src_folder/sdc-tosca/target/sdc-tosca-1.1.*-SNAPSHOT.jar for dirc in logging sdc-artifact-generator; do name="openecomp-$dirc" @@ -46,8 +45,8 @@ function test_get_sdc_images { clone_all_sdc_repos get_sdc_images - for image in backend frontend elasticsearch kibana cassandra sanity; do - asserts_image openecomp/sdc-$image + for image in sanity elasticsearch cassandra kibana frontend backend; do + asserts_image openecomp/base_sdc-$image done } @@ -57,8 +56,8 @@ function test_install_sdc { get_sdc_images install_sdc - for image in backend frontend elasticsearch kibana cassandra sanity; do - asserts_image_running openecomp/sdc-$image + for image in elasticsearch cassandra kibana frontend backend; do + asserts_image_running openecomp/base_sdc-$image done } diff --git a/bootstrap/vagrant-onap/tests/test_sdnc b/bootstrap/vagrant-onap/tests/test_sdnc index bc742fad2..ddc1d9c6b 100644 --- a/bootstrap/vagrant-onap/tests/test_sdnc +++ b/bootstrap/vagrant-onap/tests/test_sdnc @@ -11,11 +11,14 @@ covered_functions=( function test_clone_all_sdnc_repos { clone_all_sdnc_repos - asserts_file_exist $sdnc_src_folder/core/pom.xml asserts_file_exist $sdnc_src_folder/adaptors/pom.xml + # asserts_file_exist $sdnc_src_folder/architecture/pom.xml + asserts_file_exist $sdnc_src_folder/core/pom.xml + # asserts_file_exist $sdnc_src_folder/features/pom.xml asserts_file_exist $sdnc_src_folder/northbound/pom.xml - asserts_file_exist $sdnc_src_folder/plugins/pom.xml asserts_file_exist $sdnc_src_folder/oam/pom.xml + # asserts_file_exist $sdnc_src_folder/parent/pom.xml + asserts_file_exist $sdnc_src_folder/plugins/pom.xml } # test_compile_all_sdnc_repos() - Verify the correct compilation of SDNC projects @@ -23,36 +26,24 @@ function test_compile_all_sdnc_repos { clone_all_sdnc_repos compile_all_sdnc_repos - for adaptor in aai-service mdsal-resource resource-assignment sql-resource; do - asserts_file_exist $sdnc_src_folder/adaptors/$adaptor/features/target/$adaptor-features-1.1.2-SNAPSHOT.jar - asserts_file_exist $sdnc_src_folder/adaptors/$adaptor/installer/target/sdnc-$adaptor-1.1.2-SNAPSHOT-installer.zip - asserts_file_exist $sdnc_src_folder/adaptors/$adaptor/provider/target/$adaptor-provider-1.1.2-SNAPSHOT.jar - done - - asserts_file_exist $sdnc_src_folder/core/dblib/provider/target/dblib-provider-1.1.2-SNAPSHOT.jar - asserts_file_exist $sdnc_src_folder/core/rootpom/target/rootpom-1.1.0-site_en.xml - asserts_file_exist $sdnc_src_folder/core/target/sdnc-core-1.1.2-SNAPSHOT-site.xml - - for component in asdcApi dataChange vnfapi vnftools; do - asserts_file_exist $sdnc_src_folder/northbound/$component/features/target/$component-features-1.1.2-SNAPSHOT.jar - asserts_file_exist $sdnc_src_folder/northbound/$component/installer/target/sdnc-$component-1.1.2-SNAPSHOT-installer.zip - if [[ "$component" != "vnftools" ]]; then - asserts_file_exist $sdnc_src_folder/northbound/$component/model/target/$component-model-1.1.2-SNAPSHOT.jar + for component in generic-resource-api vnfapi vnftools; do + if [[ "$component" != "generic-resource-api" ]]; then + if [[ "$component" == "vnfapi" ]]; then + asserts_file_exist $sdnc_src_folder/northbound/vnfapi/model/target/vnfapi-model-1.2.0-SNAPSHOT.jar + fi + asserts_file_exist $sdnc_src_folder/northbound/$component/installer/target/sdnc-$component-1.2.0-SNAPSHOT-installer.zip + asserts_file_exist $sdnc_src_folder/northbound/$component/features/target/$component-features-1.2.0-SNAPSHOT.jar + asserts_file_exist $sdnc_src_folder/northbound/$component/provider/target/$component-provider-1.2.0-SNAPSHOT.jar + else + asserts_file_exist $sdnc_src_folder/northbound/generic-resource-api/features/target/generic-resource-api.features-1.2.0-SNAPSHOT.jar + asserts_file_exist $sdnc_src_folder/northbound/generic-resource-api/installer/target/sdnc-generic-resources-api-1.2.0-SNAPSHOT-installer.zip + asserts_file_exist $sdnc_src_folder/northbound/generic-resource-api/model/target/generic-resource-api.model-1.2.0-SNAPSHOT.jar + asserts_file_exist $sdnc_src_folder/northbound/generic-resource-api/provider/target/generic-resource-api.provider-1.2.0-SNAPSHOT.jar fi - asserts_file_exist $sdnc_src_folder/northbound/$component/provider/target/$component-provider-1.1.2-SNAPSHOT.jar - done - asserts_file_exist $sdnc_src_folder/northbound/dmaap-listener/target/dmaap-listener-1.1.2-SNAPSHOT.jar - asserts_file_exist $sdnc_src_folder/northbound/ueb-listener/target/ueb-listener-1.1.2-SNAPSHOT.jar - - asserts_file_exist $sdnc_src_folder/oam/admportal/target/admportal.1.1.2-SNAPSHOT.zip - asserts_file_exist $sdnc_src_folder/oam/dgbuilder/target/dgbuilder.1.1.2-SNAPSHOT.zip - asserts_file_exist $sdnc_src_folder/oam/platform-logic/installer/target/platform-logic-installer-1.1.2-SNAPSHOT.zip - - for plugin in properties-node restapi-call-node; do - asserts_file_exist $sdnc_src_folder/plugins/$plugin/features/target/$plugin-features-1.1.2-SNAPSHOT.jar - asserts_file_exist $sdnc_src_folder/plugins/$plugin/installer/target/sdnc-$plugin-1.1.2-SNAPSHOT-installer.zip - asserts_file_exist $sdnc_src_folder/plugins/$plugin/provider/target/$plugin-provider-1.1.2-SNAPSHOT.jar done + asserts_file_exist $sdnc_src_folder/oam/admportal/target/admportal.*-SNAPSHOT.zip + asserts_file_exist $sdnc_src_folder/oam/dgbuilder/target/dgbuilder.*-SNAPSHOT.zip + asserts_file_exist $sdnc_src_folder/oam/platform-logic/installer/target/platform-logic-installer-*-SNAPSHOT.zip } # test_get_sdnc_images() - Verify that the SDNC images are created or retrieved |