Merge branch 'master' into v7.0 25/8925/1
authorbeierlm <mark.beierl@canonical.com>
Sat, 16 May 2020 01:47:43 +0000 (21:47 -0400)
committerbeierlm <mark.beierl@canonical.com>
Sat, 16 May 2020 01:48:29 +0000 (21:48 -0400)
commit107d16a049da676f0017f64e059a130128915832
tree6e0556b6653f447d6917f39e1ab3df6ec80fb3f5
parent19dcb19d0fb3f738c2b4de22f4e55ebd65a7f336
Merge branch 'master' into v7.0

Change-Id: Iec1f1db2b2d4953e560c8e8b7be2f6ddca86edd1
Signed-off-by: beierlm <mark.beierl@canonical.com>
209 files changed:
.gitignore
docker/Keystone/Dockerfile
docker/Keystone/LDAP.md [new file with mode: 0644]
docker/Keystone/scripts/start.sh
docker/LCM/Dockerfile
docker/MON/Dockerfile
docker/RO/Dockerfile
installers/60-lxd-production.conf [new file with mode: 0644]
installers/charm/README.md [new file with mode: 0644]
installers/charm/build.sh [new file with mode: 0755]
installers/charm/bundles/osm-ha/bundle.yaml [new file with mode: 0644]
installers/charm/bundles/osm/bundle.yaml [new file with mode: 0644]
installers/charm/generate_bundle.py [new file with mode: 0644]
installers/charm/interfaces/osm-nbi/README.md [new file with mode: 0644]
installers/charm/interfaces/osm-nbi/copyright [new file with mode: 0644]
installers/charm/interfaces/osm-nbi/interface.yaml [new file with mode: 0644]
installers/charm/interfaces/osm-nbi/provides.py [new file with mode: 0644]
installers/charm/interfaces/osm-nbi/requires.py [new file with mode: 0644]
installers/charm/interfaces/osm-ro/README.md [new file with mode: 0644]
installers/charm/interfaces/osm-ro/copyright [new file with mode: 0644]
installers/charm/interfaces/osm-ro/interface.yaml [new file with mode: 0644]
installers/charm/interfaces/osm-ro/provides.py [new file with mode: 0644]
installers/charm/interfaces/osm-ro/requires.py [new file with mode: 0644]
installers/charm/layers/osm-common/README.md [new file with mode: 0644]
installers/charm/layers/osm-common/layer.yaml [new file with mode: 0644]
installers/charm/layers/osm-common/lib/charms/osm/k8s.py [new file with mode: 0644]
installers/charm/layers/osm-common/metadata.yaml [new file with mode: 0644]
installers/charm/layers/osm-common/reactive/osm_common.py [new file with mode: 0644]
installers/charm/lcm-k8s/.yamllint.yaml [new file with mode: 0644]
installers/charm/lcm-k8s/README.md [new file with mode: 0644]
installers/charm/lcm-k8s/config.yaml [new file with mode: 0644]
installers/charm/lcm-k8s/icon.svg [new file with mode: 0644]
installers/charm/lcm-k8s/layer.yaml [new file with mode: 0644]
installers/charm/lcm-k8s/metadata.yaml [new file with mode: 0644]
installers/charm/lcm-k8s/reactive/lcm.py [new file with mode: 0644]
installers/charm/lcm-k8s/reactive/spec_template.yaml [new file with mode: 0644]
installers/charm/lcm-k8s/tox.ini [new file with mode: 0644]
installers/charm/lint.sh [new file with mode: 0755]
installers/charm/mon-k8s/.yamllint.yaml [new file with mode: 0644]
installers/charm/mon-k8s/README.md [new file with mode: 0644]
installers/charm/mon-k8s/config.yaml [new file with mode: 0644]
installers/charm/mon-k8s/icon.svg [new file with mode: 0644]
installers/charm/mon-k8s/layer.yaml [new file with mode: 0644]
installers/charm/mon-k8s/metadata.yaml [new file with mode: 0644]
installers/charm/mon-k8s/reactive/mon_k8s.py [new file with mode: 0644]
installers/charm/mon-k8s/reactive/spec_template.yaml [new file with mode: 0644]
installers/charm/mon-k8s/tox.ini [new file with mode: 0644]
installers/charm/nbi-k8s/.yamllint.yaml [new file with mode: 0644]
installers/charm/nbi-k8s/README.md [new file with mode: 0755]
installers/charm/nbi-k8s/config.yaml [new file with mode: 0755]
installers/charm/nbi-k8s/icon.svg [new file with mode: 0644]
installers/charm/nbi-k8s/layer.yaml [new file with mode: 0644]
installers/charm/nbi-k8s/metadata.yaml [new file with mode: 0755]
installers/charm/nbi-k8s/reactive/nbi.py [new file with mode: 0644]
installers/charm/nbi-k8s/reactive/spec_template.yaml [new file with mode: 0644]
installers/charm/nbi-k8s/tox.ini [new file with mode: 0644]
installers/charm/nbi-k8s/wheelhouse.txt [new file with mode: 0644]
installers/charm/pol-k8s/.yamllint.yaml [new file with mode: 0644]
installers/charm/pol-k8s/README.md [new file with mode: 0644]
installers/charm/pol-k8s/config.yaml [new file with mode: 0644]
installers/charm/pol-k8s/icon.svg [new file with mode: 0644]
installers/charm/pol-k8s/layer.yaml [new file with mode: 0644]
installers/charm/pol-k8s/metadata.yaml [new file with mode: 0644]
installers/charm/pol-k8s/reactive/pol_k8s.py [new file with mode: 0644]
installers/charm/pol-k8s/reactive/spec_template.yaml [new file with mode: 0644]
installers/charm/pol-k8s/tox.ini [new file with mode: 0644]
installers/charm/ro-k8s/.yamllint.yaml [new file with mode: 0644]
installers/charm/ro-k8s/README.md [new file with mode: 0755]
installers/charm/ro-k8s/config.yaml [new file with mode: 0755]
installers/charm/ro-k8s/icon.svg [new file with mode: 0644]
installers/charm/ro-k8s/layer.yaml [new file with mode: 0644]
installers/charm/ro-k8s/metadata.yaml [new file with mode: 0755]
installers/charm/ro-k8s/reactive/ro.py [new file with mode: 0644]
installers/charm/ro-k8s/reactive/spec_template.yaml [new file with mode: 0644]
installers/charm/ro-k8s/tox.ini [new file with mode: 0644]
installers/charm/ui-k8s/.yamllint.yaml [new file with mode: 0644]
installers/charm/ui-k8s/README.md [new file with mode: 0755]
installers/charm/ui-k8s/config.yaml [new file with mode: 0755]
installers/charm/ui-k8s/icon.svg [new file with mode: 0644]
installers/charm/ui-k8s/layer.yaml [new file with mode: 0644]
installers/charm/ui-k8s/metadata.yaml [new file with mode: 0755]
installers/charm/ui-k8s/reactive/spec_template.yaml [new file with mode: 0644]
installers/charm/ui-k8s/reactive/ui.py [new file with mode: 0644]
installers/charm/ui-k8s/tox.ini [new file with mode: 0644]
installers/charmed_install.sh [new file with mode: 0755]
installers/charmed_uninstall.sh [new file with mode: 0755]
installers/docker/docker-compose.yaml
installers/docker/files/dashboards-osm.yml [deleted file]
installers/docker/files/datasource-prometheus.yml [deleted file]
installers/docker/files/node_exporter.service [deleted file]
installers/docker/files/osm-sample-dashboard.json [deleted file]
installers/docker/files/osm-system-dashboard.json [deleted file]
installers/docker/files/prometheus.yml [deleted file]
installers/docker/grafana/dashboards-osm.yml [new file with mode: 0644]
installers/docker/grafana/datasource-prometheus.yml [new file with mode: 0644]
installers/docker/grafana/osm-sample-dashboard.json [new file with mode: 0644]
installers/docker/grafana/osm-system-dashboard.json [new file with mode: 0644]
installers/docker/osm_pla/docker-compose.yaml [new file with mode: 0644]
installers/docker/osm_pla/pla.yaml [new file with mode: 0644]
installers/docker/osm_pods/keystone.yaml
installers/docker/osm_pods/prometheus.yaml
installers/docker/prometheus/prometheus.yml [new file with mode: 0644]
installers/docker/prometheus_exporters/node_exporter.service [new file with mode: 0644]
installers/full_install_osm.sh
installers/install_osm.sh
installers/lxd-preseed.conf [new file with mode: 0644]
robot-systest/README.md [new file with mode: 0644]
robot-systest/README_Robot_Test.md [deleted file]
robot-systest/deprecated/README_Robot_Test.md [new file with mode: 0644]
robot-systest/deprecated/lib/api/common.robot [new file with mode: 0644]
robot-systest/deprecated/lib/api/vim_lib.robot [new file with mode: 0644]
robot-systest/deprecated/lib/cli/network_slicing_lib.robot [new file with mode: 0644]
robot-systest/deprecated/lib/cli/ns_lib.robot [new file with mode: 0644]
robot-systest/deprecated/lib/cli/nsd_lib.robot [new file with mode: 0644]
robot-systest/deprecated/lib/cli/osm_package_tools_lib.robot [new file with mode: 0644]
robot-systest/deprecated/lib/cli/osm_platform_resiliancy_recovery_lib.robot [new file with mode: 0644]
robot-systest/deprecated/lib/cli/rbac_lib.robot [new file with mode: 0644]
robot-systest/deprecated/lib/cli/sdnc_account_lib.robot [new file with mode: 0644]
robot-systest/deprecated/lib/cli/vim_account_lib.robot [new file with mode: 0644]
robot-systest/deprecated/lib/cli/vnfd_lib.robot [new file with mode: 0644]
robot-systest/deprecated/lib/client_lib/client_lib.py [new file with mode: 0644]
robot-systest/deprecated/lib/custom_lib.py [new file with mode: 0644]
robot-systest/deprecated/lib/gui/login_gui.robot [new file with mode: 0644]
robot-systest/deprecated/resource/api/common.robot [new file with mode: 0644]
robot-systest/deprecated/resource/api/variables.py [new file with mode: 0644]
robot-systest/deprecated/resource/cli/disable_port_security_ns_data.py [new file with mode: 0644]
robot-systest/deprecated/resource/cli/hackfest_basic_ns_data.py [new file with mode: 0644]
robot-systest/deprecated/resource/cli/hackfest_cloudinit_ns_data.py [new file with mode: 0644]
robot-systest/deprecated/resource/cli/hackfest_epa_ns_data.py [new file with mode: 0644]
robot-systest/deprecated/resource/cli/hackfest_multivdu_ns_data.py [new file with mode: 0644]
robot-systest/deprecated/resource/cli/hackfest_simplecharm_ns_data.py [new file with mode: 0644]
robot-systest/deprecated/resource/cli/test_vnf_data.py [new file with mode: 0644]
robot-systest/deprecated/resource/cli/ubuntu-cloudinit_ns_data.py [new file with mode: 0644]
robot-systest/deprecated/run_test.sh [new file with mode: 0644]
robot-systest/deprecated/testsuite/api/TS01__Vim_Account.robot [new file with mode: 0644]
robot-systest/deprecated/testsuite/cli/TS008__Test_SDNC.robot [new file with mode: 0644]
robot-systest/deprecated/testsuite/cli/TS009__Feature_6283_Network_Slicing_Test.robot [new file with mode: 0644]
robot-systest/deprecated/testsuite/cli/TS010__OSM_Platform_Resiliency_and_Recovery_Test.robot [new file with mode: 0644]
robot-systest/deprecated/testsuite/cli/TS011__Feature_1415_RBAC_For_Platform_Test.robot [new file with mode: 0644]
robot-systest/deprecated/testsuite/cli/TS012__Feature_7181_Allow_Instantiation_Parameters_in_CloudInit.robot [new file with mode: 0644]
robot-systest/deprecated/testsuite/cli/TS013__Feature_1415_RBAC_Visibility_Of_Packages_And_Instances.robot [new file with mode: 0644]
robot-systest/deprecated/testsuite/cli/TS014__Feature_7921_MongoDB_Filesystem_Test.robot [new file with mode: 0644]
robot-systest/deprecated/testsuite/cli/TS015__Feature_8047_OSMClient_Package_Creation_And_Validation.robot [new file with mode: 0644]
robot-systest/deprecated/testsuite/cli/TS016__Manual_VNF_VDU_Scaling_Test.robot [new file with mode: 0644]
robot-systest/deprecated/testsuite/cli/TS017__Feature_7326_Disable_Port_Security_at_Network_level.robot [new file with mode: 0644]
robot-systest/deprecated/testsuite/cli/TS01__Test_VNF.robot [new file with mode: 0644]
robot-systest/deprecated/testsuite/cli/TS02__Test_Vim.robot [new file with mode: 0644]
robot-systest/deprecated/testsuite/cli/TS03__Hackfest_Basic_NS.robot [new file with mode: 0644]
robot-systest/deprecated/testsuite/cli/TS04__Hackfest_Simplecharm_NS.robot [new file with mode: 0644]
robot-systest/deprecated/testsuite/cli/TS05__Hackfest_Multivdu_NS.robot [new file with mode: 0644]
robot-systest/deprecated/testsuite/cli/TS06__Hackfest_Cloudinit_NS.robot [new file with mode: 0644]
robot-systest/deprecated/testsuite/cli/TS07__Hackfest_EPA_NS.robot [new file with mode: 0644]
robot-systest/deprecated/testsuite/cli/__init__.robot [new file with mode: 0644]
robot-systest/deprecated/testsuite/client_library/TS01__OSMClient_Library_Test.robot [new file with mode: 0644]
robot-systest/deprecated/testsuite/gui/TS01__Test_GUI_Login.robot [new file with mode: 0644]
robot-systest/environment.rc [new file with mode: 0644]
robot-systest/lib/api/common.robot [deleted file]
robot-systest/lib/api/vim_lib.robot [deleted file]
robot-systest/lib/cli/network_slicing_lib.robot [deleted file]
robot-systest/lib/cli/ns_lib.robot [deleted file]
robot-systest/lib/cli/nsd_lib.robot [deleted file]
robot-systest/lib/cli/osm_platform_resiliancy_recovery_lib.robot [deleted file]
robot-systest/lib/cli/rbac_lib.robot [deleted file]
robot-systest/lib/cli/sdnc_account_lib.robot [deleted file]
robot-systest/lib/cli/vim_account_lib.robot [deleted file]
robot-systest/lib/cli/vnfd_lib.robot [deleted file]
robot-systest/lib/client_lib/client_lib.py [deleted file]
robot-systest/lib/connectivity_lib.robot [new file with mode: 0644]
robot-systest/lib/custom_lib.py [deleted file]
robot-systest/lib/gui/login_gui.robot [deleted file]
robot-systest/lib/ns_lib.robot [new file with mode: 0644]
robot-systest/lib/nsd_lib.robot [new file with mode: 0644]
robot-systest/lib/ssh_lib.robot [new file with mode: 0644]
robot-systest/lib/vnfd_lib.robot [new file with mode: 0644]
robot-systest/resource/api/common.robot [deleted file]
robot-systest/resource/api/variables.py [deleted file]
robot-systest/resource/cli/hackfest_basic_ns_data.py [deleted file]
robot-systest/resource/cli/hackfest_cloudinit_ns_data.py [deleted file]
robot-systest/resource/cli/hackfest_epa_ns_data.py [deleted file]
robot-systest/resource/cli/hackfest_multivdu_ns_data.py [deleted file]
robot-systest/resource/cli/hackfest_simplecharm_ns_data.py [deleted file]
robot-systest/resource/cli/test_vnf_data.py [deleted file]
robot-systest/resource/cli/ubuntu-cloudinit_ns_data.py [deleted file]
robot-systest/resources/hackfest_basic_ns_data.py [new file with mode: 0644]
robot-systest/resources/hackfest_cloudinit_ns_data.py [new file with mode: 0644]
robot-systest/resources/hackfest_multivdu_ns_data.py [new file with mode: 0644]
robot-systest/run_test.sh [deleted file]
robot-systest/testsuite/api/TS01__Vim_Account.robot [deleted file]
robot-systest/testsuite/cli/TS008__Test_SDNC.robot [deleted file]
robot-systest/testsuite/cli/TS009__Feature_6283_Network_Slicing_Test.robot [deleted file]
robot-systest/testsuite/cli/TS010__OSM_Platform_Resiliency_and_Recovery_Test.robot [deleted file]
robot-systest/testsuite/cli/TS011__Feature_1415_RBAC_For_Platform_Test.robot [deleted file]
robot-systest/testsuite/cli/TS012__Feature_7181_Allow_Instantiation_Parameters_in_CloudInit.robot [deleted file]
robot-systest/testsuite/cli/TS01__Test_VNF.robot [deleted file]
robot-systest/testsuite/cli/TS02__Test_Vim.robot [deleted file]
robot-systest/testsuite/cli/TS03__Hackfest_Basic_NS.robot [deleted file]
robot-systest/testsuite/cli/TS04__Hackfest_Simplecharm_NS.robot [deleted file]
robot-systest/testsuite/cli/TS05__Hackfest_Multivdu_NS.robot [deleted file]
robot-systest/testsuite/cli/TS06__Hackfest_Cloudinit_NS.robot [deleted file]
robot-systest/testsuite/cli/TS07__Hackfest_EPA_NS.robot [deleted file]
robot-systest/testsuite/cli/__init__.robot [deleted file]
robot-systest/testsuite/client_library/TS01__OSMClient_Library_Test.robot [deleted file]
robot-systest/testsuite/gui/TS01__Test_GUI_Login.robot [deleted file]
robot-systest/testsuite/hackfest_basic.robot [new file with mode: 0644]
robot-systest/testsuite/hackfest_cloudinit.robot [new file with mode: 0644]
robot-systest/testsuite/hackfest_multivdu.robot [new file with mode: 0644]
systest/lib/osm/osm.py
systest/testcases/vnfs/test_vnfs.py
tools/license_scan.sh