From 3161bfe20dd1fa280e8b6292e79dfeb1d776eec2 Mon Sep 17 00:00:00 2001 From: Bartek Grzybowski Date: Wed, 19 Feb 2020 13:37:31 +0100 Subject: Fix YAML linter indentation errors in yaml files Change-Id: I5548de0d7afb0e249ab8b6dbc93c102a2a2ac648 Signed-off-by: Bartek Grzybowski Issue-ID: INT-1451 --- bootstrap/jenkins/vagrant/jjb/docker-jobs.yaml | 134 +-- bootstrap/jenkins/vagrant/jjb/java-jobs.yaml | 914 ++++++++++----------- deployment/heat/onap-rke/onap-oom.yaml | 10 +- deployment/heat/onap-rke/parts/onap-oom-1.yaml | 10 +- deployment/onap-lab-ci/jjb/jobs.yaml | 232 +++--- .../scaleout/k8s-tca-clamp-policy-05162019.yaml | 158 ++-- .../dr-sim/docker-compose.yml | 8 +- .../mr-sim/docker-compose.yml | 4 +- .../simulator-group/docker-compose-template.yml | 32 +- .../deployment/PnP_PNF_sim_heat_template.yml | 6 +- .../docker-compose-template.yml | 4 +- .../etsi_nfv_sol001_vnfd_2_5_1_types.yaml | 76 +- .../deployment/PnP_PNF_sim_heat_template.yml | 6 +- .../preload_templates/simple_neutron_heat.yaml | 6 +- 14 files changed, 800 insertions(+), 800 deletions(-) diff --git a/bootstrap/jenkins/vagrant/jjb/docker-jobs.yaml b/bootstrap/jenkins/vagrant/jjb/docker-jobs.yaml index 5925b5d01..928267434 100644 --- a/bootstrap/jenkins/vagrant/jjb/docker-jobs.yaml +++ b/bootstrap/jenkins/vagrant/jjb/docker-jobs.yaml @@ -1,76 +1,76 @@ - project: name: onap-docker-with-pom jobs: - - 'docker-with-pom' + - 'docker-with-pom' project: - - 'aai_aai-service_ajsc-aai': - repo: 'aai/aai-service' - pom: 'ajsc-aai/pom.xml' - mvn-options: 'docker:build' - - 'aai_data-router': - repo: 'aai/data-router' - pom: 'pom.xml' - mvn-options: 'docker:build' - - 'aai_model-loader': - repo: 'aai/model-loader' - pom: 'pom.xml' - mvn-options: 'docker:build' - - 'aai_resources_aai-resources': - repo: 'aai/resources' - pom: 'aai-resources/pom.xml' - mvn-options: 'docker:build' - - 'aai_search-data-service': - repo: 'aai/search-data-service' - mvn-options: 'docker:build' - - 'aai_sparky-be': - repo: 'aai/sparky-be' - mvn-options: 'docker:build' - - 'aai_traversal_aai-traversal': - repo: 'aai/traversal' - pom: 'aai-traversal/pom.xml' - mvn-options: 'docker:build' - - 'appc': - repo: 'appc/deployment' - mvn-options: '-P docker' - - 'dcae_dcae-controller': - repo: 'dcae/demo' - shell-cmd: 'bash dcae-demo-controller/src/main/docker-build/build.sh' - - 'dcae_dcae-dmaapbc': - repo: 'dcae/dmaapbc' - shell-cmd: 'docker build -f ./Dockerfile .' - - 'dcae_dcae-inventory': - repo: 'dcae/dcae-inventory' - mvn-options: 'docker:build' - - 'mso': - repo: 'mso' - pom: 'packages/docker/pom.xml' - mvn-options: '-P docker' - - 'policy': - repo: 'policy/docker' - shell-cmd: './docker_build.sh' - - 'portal_ecomp-portal-widget-ms': - repo: 'portal' - pom: 'ecomp-portal-widget-ms/pom.xml' - mvn-options: 'docker:build' - - 'sdc': - repo: 'sdc' - pom: 'pom.xml' - mvn-options: '-P docker' - - 'sdnc': - repo: 'sdnc/oam' - mvn-options: '-P docker' - - 'vid': - repo: 'vid' - mvn-options: '-P docker' + - 'aai_aai-service_ajsc-aai': + repo: 'aai/aai-service' + pom: 'ajsc-aai/pom.xml' + mvn-options: 'docker:build' + - 'aai_data-router': + repo: 'aai/data-router' + pom: 'pom.xml' + mvn-options: 'docker:build' + - 'aai_model-loader': + repo: 'aai/model-loader' + pom: 'pom.xml' + mvn-options: 'docker:build' + - 'aai_resources_aai-resources': + repo: 'aai/resources' + pom: 'aai-resources/pom.xml' + mvn-options: 'docker:build' + - 'aai_search-data-service': + repo: 'aai/search-data-service' + mvn-options: 'docker:build' + - 'aai_sparky-be': + repo: 'aai/sparky-be' + mvn-options: 'docker:build' + - 'aai_traversal_aai-traversal': + repo: 'aai/traversal' + pom: 'aai-traversal/pom.xml' + mvn-options: 'docker:build' + - 'appc': + repo: 'appc/deployment' + mvn-options: '-P docker' + - 'dcae_dcae-controller': + repo: 'dcae/demo' + shell-cmd: 'bash dcae-demo-controller/src/main/docker-build/build.sh' + - 'dcae_dcae-dmaapbc': + repo: 'dcae/dmaapbc' + shell-cmd: 'docker build -f ./Dockerfile .' + - 'dcae_dcae-inventory': + repo: 'dcae/dcae-inventory' + mvn-options: 'docker:build' + - 'mso': + repo: 'mso' + pom: 'packages/docker/pom.xml' + mvn-options: '-P docker' + - 'policy': + repo: 'policy/docker' + shell-cmd: './docker_build.sh' + - 'portal_ecomp-portal-widget-ms': + repo: 'portal' + pom: 'ecomp-portal-widget-ms/pom.xml' + mvn-options: 'docker:build' + - 'sdc': + repo: 'sdc' + pom: 'pom.xml' + mvn-options: '-P docker' + - 'sdnc': + repo: 'sdnc/oam' + mvn-options: '-P docker' + - 'vid': + repo: 'vid' + mvn-options: '-P docker' - project: name: onap-docker-without-pom jobs: - - 'docker-without-pom' + - 'docker-without-pom' project: - - 'dcae_dcae-orch-dispatcher': - repo: 'dcae/orch-dispatcher' - shell-cmd: 'docker build -f ./Dockerfile .' - - 'portal': - repo: 'portal' - shell-cmd: 'git -C ecompsdkos pull || git clone $GIT_NO_PROJECT/ecompsdkos; git -C dmaapbc pull || git clone $GIT_NO_PROJECT/ui/dmaapbc dmaapbc; cd deliveries; chmod +x *.sh; ./run.sh' + - 'dcae_dcae-orch-dispatcher': + repo: 'dcae/orch-dispatcher' + shell-cmd: 'docker build -f ./Dockerfile .' + - 'portal': + repo: 'portal' + shell-cmd: 'git -C ecompsdkos pull || git clone $GIT_NO_PROJECT/ecompsdkos; git -C dmaapbc pull || git clone $GIT_NO_PROJECT/ui/dmaapbc dmaapbc; cd deliveries; chmod +x *.sh; ./run.sh' diff --git a/bootstrap/jenkins/vagrant/jjb/java-jobs.yaml b/bootstrap/jenkins/vagrant/jjb/java-jobs.yaml index 0cbaf5e5f..c75c69bbe 100644 --- a/bootstrap/jenkins/vagrant/jjb/java-jobs.yaml +++ b/bootstrap/jenkins/vagrant/jjb/java-jobs.yaml @@ -1,461 +1,461 @@ - project: name: onap-java jobs: - - 'java-{project}' + - 'java-{project}' project: - - 'aaf_authz': - repo: 'aaf/authz' - pom: 'pom.xml' - - 'aaf_cadi': - repo: 'aaf/cadi' - pom: 'pom.xml' - - 'aaf_inno': - repo: 'aaf/inno' - pom: 'pom.xml' - - 'aaf_luaplugin': - repo: 'aaf/luaplugin' - pom: 'pom.xml' - - 'aai_aai-common': - repo: 'aai/aai-common' - pom: 'pom.xml' - - 'aai_aai-service': - repo: 'aai/aai-service' - pom: 'pom.xml' - - 'aai_babel': - repo: 'aai/babel' - pom: 'pom.xml' - - 'aai_champ': - repo: 'aai/champ' - pom: 'pom.xml' - - 'aai_data-router': - repo: 'aai/data-router' - pom: 'pom.xml' - - 'aai_esr-gui': - repo: 'aai/esr-gui' - pom: 'pom.xml' - - 'aai_esr-server': - repo: 'aai/esr-server' - pom: 'pom.xml' - - 'aai_gizmo': - repo: 'aai/gizmo' - pom: 'pom.xml' - - 'aai_logging-service': - repo: 'aai/logging-service' - pom: 'pom.xml' - - 'aai_model-loader': - repo: 'aai/model-loader' - pom: 'pom.xml' - - 'aai_resources': - repo: 'aai/resources' - pom: 'pom.xml' - - 'aai_rest-client': - repo: 'aai/rest-client' - pom: 'pom.xml' - - 'aai_router-core': - repo: 'aai/router-core' - pom: 'pom.xml' - - 'aai_search-data-service': - repo: 'aai/search-data-service' - pom: 'pom.xml' - - 'aai_sparky-be': - repo: 'aai/sparky-be' - pom: 'pom.xml' - - 'aai_sparky-fe': - repo: 'aai/sparky-fe' - pom: 'pom.xml' - - 'aai_traversal': - repo: 'aai/traversal' - pom: 'pom.xml' - - 'appc': - repo: 'appc' - pom: 'pom.xml' - - 'appc_deployment': - repo: 'appc/deployment' - pom: 'pom.xml' - - 'ccsdk_dashboard': - repo: 'ccsdk/dashboard' - pom: 'pom.xml' - - 'ccsdk_distribution': - repo: 'ccsdk/distribution' - pom: 'pom.xml' - - 'ccsdk_parent': - repo: 'ccsdk/parent' - pom: 'pom.xml' - - 'ccsdk_platform_blueprints': - repo: 'ccsdk/platform/blueprints' - pom: 'pom.xml' - - 'ccsdk_platform_nbapi': - repo: 'ccsdk/platform/nbapi' - pom: 'pom.xml' - - 'ccsdk_platform_plugins': - repo: 'ccsdk/platform/plugins' - pom: 'pom.xml' - - 'ccsdk_sli_adaptors': - repo: 'ccsdk/sli/adaptors' - pom: 'pom.xml' - - 'ccsdk_sli_core': - repo: 'ccsdk/sli/core' - pom: 'pom.xml' - - 'ccsdk_sli_northbound': - repo: 'ccsdk/sli/northbound' - pom: 'pom.xml' - - 'ccsdk_sli_plugins': - repo: 'ccsdk/sli/plugins' - pom: 'pom.xml' - - 'ccsdk_storage_esaas': - repo: 'ccsdk/storage/esaas' - pom: 'pom.xml' - - 'ccsdk_storage_pgaas': - repo: 'ccsdk/storage/pgaas' - pom: 'pom.xml' - - 'ccsdk_utils': - repo: 'ccsdk/utils' - pom: 'pom.xml' - - 'clamp': - repo: 'clamp' - pom: 'pom.xml' - - 'cli': - repo: 'cli' - pom: 'pom.xml' - - 'dcae_apod_analytics': - repo: 'dcae/apod/analytics' - pom: 'pom.xml' - - 'dcae_collectors_ves': - repo: 'dcae/collectors/ves' - pom: 'pom.xml' - - 'dcae_controller': - repo: 'dcae/controller' - pom: 'pom.xml' - - 'dcae_controller_analytics': - repo: 'dcae/controller/analytics' - pom: 'pom.xml' - - 'dcae_dcae-inventory': - repo: 'dcae/dcae-inventory' - pom: 'pom.xml' - - 'dcae_demo': - repo: 'dcae/demo' - pom: 'pom.xml' - - 'dcae_dmaapbc': - repo: 'dcae/dmaapbc' - pom: 'pom.xml' - - 'dcae_operation_utils': - repo: 'dcae/operation/utils' - pom: 'pom.xml' - - 'dcae_pgaas_cdf_src_cdf-prop-value_cdf-prop-value': - repo: 'dcae/pgaas' - pom: 'cdf/src/cdf-prop-value/cdf-prop-value/pom.xml' - - 'dcae_pgaas_cdf_src_cdf-prop-value_cdf-util': - repo: 'dcae/pgaas' - pom: 'cdf/src/cdf-prop-value/cdf-util/pom.xml' - - 'dcaegen2': - repo: 'dcaegen2' - pom: 'pom.xml' - - 'dcaegen2_analytics': - repo: 'dcaegen2/analytics' - pom: 'pom.xml' - - 'dcaegen2_analytics_tca': - repo: 'dcaegen2/analytics/tca' - pom: 'pom.xml' - - 'dcaegen2_collectors': - repo: 'dcaegen2/collectors' - pom: 'pom.xml' - - 'dcaegen2_collectors_snmptrap': - repo: 'dcaegen2/collectors/snmptrap' - pom: 'pom.xml' - - 'dcaegen2_collectors_ves': - repo: 'dcaegen2/collectors/ves' - pom: 'pom.xml' - - 'dcaegen2_deployments': - repo: 'dcaegen2/deployments' - pom: 'pom.xml' - - 'dcaegen2_platform': - repo: 'dcaegen2/platform' - pom: 'pom.xml' - - 'dcaegen2_platform_blueprints': - repo: 'dcaegen2/platform/blueprints' - pom: 'pom.xml' - - 'dcaegen2_platform_cdapbroker': - repo: 'dcaegen2/platform/cdapbroker' - pom: 'pom.xml' - - 'dcaegen2_platform_cli': - repo: 'dcaegen2/platform/cli' - pom: 'pom.xml' - - 'dcaegen2_platform_configbinding': - repo: 'dcaegen2/platform/configbinding' - pom: 'pom.xml' - - 'dcaegen2_platform_deployment-handler': - repo: 'dcaegen2/platform/deployment-handler' - pom: 'pom.xml' - - 'dcaegen2_platform_inventory-api': - repo: 'dcaegen2/platform/inventory-api' - pom: 'pom.xml' - - 'dcaegen2_platform_plugins': - repo: 'dcaegen2/platform/plugins' - pom: 'pom.xml' - - 'dcaegen2_platform_policy-handler': - repo: 'dcaegen2/platform/policy-handler' - pom: 'pom.xml' - - 'dcaegen2_platform_servicechange-handler': - repo: 'dcaegen2/platform/servicechange-handler' - pom: 'pom.xml' - - 'dcaegen2_utils': - repo: 'dcaegen2/utils' - pom: 'pom.xml' - - 'demo': - repo: 'demo' - pom: 'pom.xml' - - 'dmaap_buscontroller': - repo: 'dmaap/buscontroller' - pom: 'pom.xml' - - 'dmaap_datarouter': - repo: 'dmaap/datarouter' - pom: 'pom.xml' - - 'dmaap_dbcapi': - repo: 'dmaap/dbcapi' - pom: 'pom.xml' - - 'dmaap_messagerouter_dmaapclient': - repo: 'dmaap/messagerouter/dmaapclient' - pom: 'pom.xml' - - 'dmaap_messagerouter_messageservice': - repo: 'dmaap/messagerouter/messageservice' - pom: 'pom.xml' - - 'dmaap_messagerouter_mirroragent': - repo: 'dmaap/messagerouter/mirroragent' - pom: 'pom.xml' - - 'dmaap_messagerouter_msgrtr': - repo: 'dmaap/messagerouter/msgrtr' - pom: 'pom.xml' - - 'ecompsdkos_ecomp-sdk': - repo: 'ecompsdkos' - pom: 'ecomp-sdk/pom.xml' - - 'holmes_common': - repo: 'holmes/common' - pom: 'pom.xml' - - 'holmes_dsa': - repo: 'holmes/dsa' - pom: 'pom.xml' - - 'holmes_engine-management': - repo: 'holmes/engine-management' - pom: 'pom.xml' - - 'holmes_rule-management': - repo: 'holmes/rule-management' - pom: 'pom.xml' - - 'integration_test_mocks_sniroemulator': - repo: 'integration' - pom: 'test/mocks/sniroemulator/pom.xml' - - 'integration_version-manifest': - repo: 'integration' - pom: 'version-manifest/pom.xml' - - 'modeling_toscaparsers_javatoscachecker': - repo: 'modeling/toscaparsers' - pom: 'javatoscachecker/pom.xml' - - 'modeling_toscaparsers_nfvparser': - repo: 'modeling/toscaparsers' - pom: 'nfvparser/pom.xml' - - 'msb_apigateway': - repo: 'msb/apigateway' - pom: 'pom.xml' - - 'msb_discovery': - repo: 'msb/discovery' - pom: 'pom.xml' - - 'msb_java-sdk': - repo: 'msb/java-sdk' - pom: 'pom.xml' - - 'msb_swagger-sdk': - repo: 'msb/swagger-sdk' - pom: 'pom.xml' - - 'mso': - repo: 'mso' - pom: 'pom.xml' - - 'mso_libs': - repo: 'mso/libs' - pom: 'pom.xml' - - 'multicloud_framework': - repo: 'multicloud/framework' - pom: 'pom.xml' - - 'multicloud_openstack': - repo: 'multicloud/openstack' - pom: 'pom.xml' - - 'multicloud_openstack_vmware': - repo: 'multicloud/openstack/vmware' - pom: 'pom.xml' - - 'multicloud_openstack_windriver': - repo: 'multicloud/openstack/windriver' - pom: 'pom.xml' - - 'ncomp_cdap': - repo: 'ncomp/cdap' - pom: 'pom.xml' - - 'ncomp_core': - repo: 'ncomp/core' - pom: 'pom.xml' - - 'ncomp_docker': - repo: 'ncomp/docker' - pom: 'pom.xml' - - 'ncomp_maven': - repo: 'ncomp/maven' - pom: 'pom.xml' - - 'ncomp_openstack': - repo: 'ncomp/openstack' - pom: 'pom.xml' - - 'ncomp_sirius_manager': - repo: 'ncomp/sirius/manager' - pom: 'pom.xml' - - 'ncomp_utils': - repo: 'ncomp/utils' - pom: 'pom.xml' - - 'oom_registrator': - repo: 'oom/registrator' - pom: 'pom.xml' - - 'oparent': - repo: 'oparent' - pom: 'pom.xml' - - 'policy_api': - repo: 'policy/api' - pom: 'pom.xml' - - 'policy_common': - repo: 'policy/common' - pom: 'pom.xml' - - 'policy_docker': - repo: 'policy/docker' - pom: 'pom.xml' - - 'policy_drools-applications': - repo: 'policy/drools-applications' - pom: 'pom.xml' - - 'policy_drools-pdp': - repo: 'policy/drools-pdp' - pom: 'pom.xml' - - 'policy_engine': - repo: 'policy/engine' - pom: 'pom.xml' - - 'policy_gui': - repo: 'policy/gui' - pom: 'pom.xml' - - 'policy_pap': - repo: 'policy/pap' - pom: 'pom.xml' - - 'policy_pdp': - repo: 'policy/pdp' - pom: 'pom.xml' - - 'portal': - repo: 'portal' - pom: 'pom.xml' - - 'portal_sdk_ecomp-sdk': - repo: 'portal/sdk' - pom: 'ecomp-sdk/pom.xml' - - 'sdc': - repo: 'sdc' - pom: 'pom.xml' - - 'sdc_jtosca': - repo: 'sdc/jtosca' - pom: 'pom.xml' - - 'sdc_sdc-distribution-client': - repo: 'sdc/sdc-distribution-client' - pom: 'pom.xml' - - 'sdc_sdc-docker-base': - repo: 'sdc/sdc-docker-base' - pom: 'pom.xml' - - 'sdc_sdc-titan-cassandra': - repo: 'sdc/sdc-titan-cassandra' - pom: 'pom.xml' - - 'sdc_sdc-tosca': - repo: 'sdc/sdc-tosca' - pom: 'pom.xml' - - 'sdc_sdc-workflow-designer': - repo: 'sdc/sdc-workflow-designer' - pom: 'pom.xml' - - 'sdnc_adaptors': - repo: 'sdnc/adaptors' - pom: 'pom.xml' - - 'sdnc_core': - repo: 'sdnc/core' - pom: 'pom.xml' - - 'sdnc_northbound': - repo: 'sdnc/northbound' - pom: 'pom.xml' - - 'sdnc_oam': - repo: 'sdnc/oam' - pom: 'pom.xml' - - 'sdnc_plugins': - repo: 'sdnc/plugins' - pom: 'pom.xml' - - 'so': - repo: 'so' - pom: 'pom.xml' - - 'so_libs': - repo: 'so/libs' - pom: 'pom.xml' - - 'testsuite_heatbridge': - repo: 'testsuite/heatbridge' - pom: 'pom.xml' - - 'ui_dmaapbc': - repo: 'ui/dmaapbc' - pom: 'pom.xml' - - 'usecase-ui': - repo: 'usecase-ui' - pom: 'pom.xml' - - 'usecase-ui_server': - repo: 'usecase-ui/server' - pom: 'pom.xml' - - 'vfc_gvnfm_vnflcm': - repo: 'vfc/gvnfm/vnflcm' - pom: 'pom.xml' - - 'vfc_gvnfm_vnfmgr': - repo: 'vfc/gvnfm/vnfmgr' - pom: 'pom.xml' - - 'vfc_gvnfm_vnfres': - repo: 'vfc/gvnfm/vnfres' - pom: 'pom.xml' - - 'vfc_nfvo_catalog': - repo: 'vfc/nfvo/catalog' - pom: 'pom.xml' - - 'vfc_nfvo_driver_ems': - repo: 'vfc/nfvo/driver/ems' - pom: 'pom.xml' - - 'vfc_nfvo_driver_sfc': - repo: 'vfc/nfvo/driver/sfc' - pom: 'pom.xml' - - 'vfc_nfvo_driver_vnfm_gvnfm': - repo: 'vfc/nfvo/driver/vnfm/gvnfm' - pom: 'pom.xml' - - 'vfc_nfvo_driver_vnfm_svnfm': - repo: 'vfc/nfvo/driver/vnfm/svnfm' - pom: 'pom.xml' - - 'vfc_nfvo_lcm': - repo: 'vfc/nfvo/lcm' - pom: 'pom.xml' - - 'vfc_nfvo_resmanagement': - repo: 'vfc/nfvo/resmanagement' - pom: 'pom.xml' - - 'vfc_nfvo_wfengine': - repo: 'vfc/nfvo/wfengine' - pom: 'pom.xml' - - 'vid': - repo: 'vid' - pom: 'pom.xml' - - 'vid_asdcclient': - repo: 'vid/asdcclient' - pom: 'pom.xml' - - 'vnfsdk_compliance_veslibrary_ves_clibrary_VESreporting_vFW': - repo: 'vnfsdk/compliance' - pom: 'veslibrary/ves_clibrary/VESreporting_vFW/pom.xml' - - 'vnfsdk_compliance_veslibrary_ves_clibrary_VESreporting_vLB': - repo: 'vnfsdk/compliance' - pom: 'veslibrary/ves_clibrary/VESreporting_vLB/pom.xml' - - 'vnfsdk_compliance_veslibrary_ves_javalibrary_evel_javalib2': - repo: 'vnfsdk/compliance' - pom: 'veslibrary/ves_javalibrary/evel_javalib2/pom.xml' - - 'vnfsdk_functest': - repo: 'vnfsdk/functest' - pom: 'pom.xml' - - 'vnfsdk_lctest': - repo: 'vnfsdk/lctest' - pom: 'pom.xml' - - 'vnfsdk_pkgtools': - repo: 'vnfsdk/pkgtools' - pom: 'pom.xml' - - 'vnfsdk_refrepo': - repo: 'vnfsdk/refrepo' - pom: 'pom.xml' - - 'vnfsdk_validation': - repo: 'vnfsdk/validation' - pom: 'pom.xml' + - 'aaf_authz': + repo: 'aaf/authz' + pom: 'pom.xml' + - 'aaf_cadi': + repo: 'aaf/cadi' + pom: 'pom.xml' + - 'aaf_inno': + repo: 'aaf/inno' + pom: 'pom.xml' + - 'aaf_luaplugin': + repo: 'aaf/luaplugin' + pom: 'pom.xml' + - 'aai_aai-common': + repo: 'aai/aai-common' + pom: 'pom.xml' + - 'aai_aai-service': + repo: 'aai/aai-service' + pom: 'pom.xml' + - 'aai_babel': + repo: 'aai/babel' + pom: 'pom.xml' + - 'aai_champ': + repo: 'aai/champ' + pom: 'pom.xml' + - 'aai_data-router': + repo: 'aai/data-router' + pom: 'pom.xml' + - 'aai_esr-gui': + repo: 'aai/esr-gui' + pom: 'pom.xml' + - 'aai_esr-server': + repo: 'aai/esr-server' + pom: 'pom.xml' + - 'aai_gizmo': + repo: 'aai/gizmo' + pom: 'pom.xml' + - 'aai_logging-service': + repo: 'aai/logging-service' + pom: 'pom.xml' + - 'aai_model-loader': + repo: 'aai/model-loader' + pom: 'pom.xml' + - 'aai_resources': + repo: 'aai/resources' + pom: 'pom.xml' + - 'aai_rest-client': + repo: 'aai/rest-client' + pom: 'pom.xml' + - 'aai_router-core': + repo: 'aai/router-core' + pom: 'pom.xml' + - 'aai_search-data-service': + repo: 'aai/search-data-service' + pom: 'pom.xml' + - 'aai_sparky-be': + repo: 'aai/sparky-be' + pom: 'pom.xml' + - 'aai_sparky-fe': + repo: 'aai/sparky-fe' + pom: 'pom.xml' + - 'aai_traversal': + repo: 'aai/traversal' + pom: 'pom.xml' + - 'appc': + repo: 'appc' + pom: 'pom.xml' + - 'appc_deployment': + repo: 'appc/deployment' + pom: 'pom.xml' + - 'ccsdk_dashboard': + repo: 'ccsdk/dashboard' + pom: 'pom.xml' + - 'ccsdk_distribution': + repo: 'ccsdk/distribution' + pom: 'pom.xml' + - 'ccsdk_parent': + repo: 'ccsdk/parent' + pom: 'pom.xml' + - 'ccsdk_platform_blueprints': + repo: 'ccsdk/platform/blueprints' + pom: 'pom.xml' + - 'ccsdk_platform_nbapi': + repo: 'ccsdk/platform/nbapi' + pom: 'pom.xml' + - 'ccsdk_platform_plugins': + repo: 'ccsdk/platform/plugins' + pom: 'pom.xml' + - 'ccsdk_sli_adaptors': + repo: 'ccsdk/sli/adaptors' + pom: 'pom.xml' + - 'ccsdk_sli_core': + repo: 'ccsdk/sli/core' + pom: 'pom.xml' + - 'ccsdk_sli_northbound': + repo: 'ccsdk/sli/northbound' + pom: 'pom.xml' + - 'ccsdk_sli_plugins': + repo: 'ccsdk/sli/plugins' + pom: 'pom.xml' + - 'ccsdk_storage_esaas': + repo: 'ccsdk/storage/esaas' + pom: 'pom.xml' + - 'ccsdk_storage_pgaas': + repo: 'ccsdk/storage/pgaas' + pom: 'pom.xml' + - 'ccsdk_utils': + repo: 'ccsdk/utils' + pom: 'pom.xml' + - 'clamp': + repo: 'clamp' + pom: 'pom.xml' + - 'cli': + repo: 'cli' + pom: 'pom.xml' + - 'dcae_apod_analytics': + repo: 'dcae/apod/analytics' + pom: 'pom.xml' + - 'dcae_collectors_ves': + repo: 'dcae/collectors/ves' + pom: 'pom.xml' + - 'dcae_controller': + repo: 'dcae/controller' + pom: 'pom.xml' + - 'dcae_controller_analytics': + repo: 'dcae/controller/analytics' + pom: 'pom.xml' + - 'dcae_dcae-inventory': + repo: 'dcae/dcae-inventory' + pom: 'pom.xml' + - 'dcae_demo': + repo: 'dcae/demo' + pom: 'pom.xml' + - 'dcae_dmaapbc': + repo: 'dcae/dmaapbc' + pom: 'pom.xml' + - 'dcae_operation_utils': + repo: 'dcae/operation/utils' + pom: 'pom.xml' + - 'dcae_pgaas_cdf_src_cdf-prop-value_cdf-prop-value': + repo: 'dcae/pgaas' + pom: 'cdf/src/cdf-prop-value/cdf-prop-value/pom.xml' + - 'dcae_pgaas_cdf_src_cdf-prop-value_cdf-util': + repo: 'dcae/pgaas' + pom: 'cdf/src/cdf-prop-value/cdf-util/pom.xml' + - 'dcaegen2': + repo: 'dcaegen2' + pom: 'pom.xml' + - 'dcaegen2_analytics': + repo: 'dcaegen2/analytics' + pom: 'pom.xml' + - 'dcaegen2_analytics_tca': + repo: 'dcaegen2/analytics/tca' + pom: 'pom.xml' + - 'dcaegen2_collectors': + repo: 'dcaegen2/collectors' + pom: 'pom.xml' + - 'dcaegen2_collectors_snmptrap': + repo: 'dcaegen2/collectors/snmptrap' + pom: 'pom.xml' + - 'dcaegen2_collectors_ves': + repo: 'dcaegen2/collectors/ves' + pom: 'pom.xml' + - 'dcaegen2_deployments': + repo: 'dcaegen2/deployments' + pom: 'pom.xml' + - 'dcaegen2_platform': + repo: 'dcaegen2/platform' + pom: 'pom.xml' + - 'dcaegen2_platform_blueprints': + repo: 'dcaegen2/platform/blueprints' + pom: 'pom.xml' + - 'dcaegen2_platform_cdapbroker': + repo: 'dcaegen2/platform/cdapbroker' + pom: 'pom.xml' + - 'dcaegen2_platform_cli': + repo: 'dcaegen2/platform/cli' + pom: 'pom.xml' + - 'dcaegen2_platform_configbinding': + repo: 'dcaegen2/platform/configbinding' + pom: 'pom.xml' + - 'dcaegen2_platform_deployment-handler': + repo: 'dcaegen2/platform/deployment-handler' + pom: 'pom.xml' + - 'dcaegen2_platform_inventory-api': + repo: 'dcaegen2/platform/inventory-api' + pom: 'pom.xml' + - 'dcaegen2_platform_plugins': + repo: 'dcaegen2/platform/plugins' + pom: 'pom.xml' + - 'dcaegen2_platform_policy-handler': + repo: 'dcaegen2/platform/policy-handler' + pom: 'pom.xml' + - 'dcaegen2_platform_servicechange-handler': + repo: 'dcaegen2/platform/servicechange-handler' + pom: 'pom.xml' + - 'dcaegen2_utils': + repo: 'dcaegen2/utils' + pom: 'pom.xml' + - 'demo': + repo: 'demo' + pom: 'pom.xml' + - 'dmaap_buscontroller': + repo: 'dmaap/buscontroller' + pom: 'pom.xml' + - 'dmaap_datarouter': + repo: 'dmaap/datarouter' + pom: 'pom.xml' + - 'dmaap_dbcapi': + repo: 'dmaap/dbcapi' + pom: 'pom.xml' + - 'dmaap_messagerouter_dmaapclient': + repo: 'dmaap/messagerouter/dmaapclient' + pom: 'pom.xml' + - 'dmaap_messagerouter_messageservice': + repo: 'dmaap/messagerouter/messageservice' + pom: 'pom.xml' + - 'dmaap_messagerouter_mirroragent': + repo: 'dmaap/messagerouter/mirroragent' + pom: 'pom.xml' + - 'dmaap_messagerouter_msgrtr': + repo: 'dmaap/messagerouter/msgrtr' + pom: 'pom.xml' + - 'ecompsdkos_ecomp-sdk': + repo: 'ecompsdkos' + pom: 'ecomp-sdk/pom.xml' + - 'holmes_common': + repo: 'holmes/common' + pom: 'pom.xml' + - 'holmes_dsa': + repo: 'holmes/dsa' + pom: 'pom.xml' + - 'holmes_engine-management': + repo: 'holmes/engine-management' + pom: 'pom.xml' + - 'holmes_rule-management': + repo: 'holmes/rule-management' + pom: 'pom.xml' + - 'integration_test_mocks_sniroemulator': + repo: 'integration' + pom: 'test/mocks/sniroemulator/pom.xml' + - 'integration_version-manifest': + repo: 'integration' + pom: 'version-manifest/pom.xml' + - 'modeling_toscaparsers_javatoscachecker': + repo: 'modeling/toscaparsers' + pom: 'javatoscachecker/pom.xml' + - 'modeling_toscaparsers_nfvparser': + repo: 'modeling/toscaparsers' + pom: 'nfvparser/pom.xml' + - 'msb_apigateway': + repo: 'msb/apigateway' + pom: 'pom.xml' + - 'msb_discovery': + repo: 'msb/discovery' + pom: 'pom.xml' + - 'msb_java-sdk': + repo: 'msb/java-sdk' + pom: 'pom.xml' + - 'msb_swagger-sdk': + repo: 'msb/swagger-sdk' + pom: 'pom.xml' + - 'mso': + repo: 'mso' + pom: 'pom.xml' + - 'mso_libs': + repo: 'mso/libs' + pom: 'pom.xml' + - 'multicloud_framework': + repo: 'multicloud/framework' + pom: 'pom.xml' + - 'multicloud_openstack': + repo: 'multicloud/openstack' + pom: 'pom.xml' + - 'multicloud_openstack_vmware': + repo: 'multicloud/openstack/vmware' + pom: 'pom.xml' + - 'multicloud_openstack_windriver': + repo: 'multicloud/openstack/windriver' + pom: 'pom.xml' + - 'ncomp_cdap': + repo: 'ncomp/cdap' + pom: 'pom.xml' + - 'ncomp_core': + repo: 'ncomp/core' + pom: 'pom.xml' + - 'ncomp_docker': + repo: 'ncomp/docker' + pom: 'pom.xml' + - 'ncomp_maven': + repo: 'ncomp/maven' + pom: 'pom.xml' + - 'ncomp_openstack': + repo: 'ncomp/openstack' + pom: 'pom.xml' + - 'ncomp_sirius_manager': + repo: 'ncomp/sirius/manager' + pom: 'pom.xml' + - 'ncomp_utils': + repo: 'ncomp/utils' + pom: 'pom.xml' + - 'oom_registrator': + repo: 'oom/registrator' + pom: 'pom.xml' + - 'oparent': + repo: 'oparent' + pom: 'pom.xml' + - 'policy_api': + repo: 'policy/api' + pom: 'pom.xml' + - 'policy_common': + repo: 'policy/common' + pom: 'pom.xml' + - 'policy_docker': + repo: 'policy/docker' + pom: 'pom.xml' + - 'policy_drools-applications': + repo: 'policy/drools-applications' + pom: 'pom.xml' + - 'policy_drools-pdp': + repo: 'policy/drools-pdp' + pom: 'pom.xml' + - 'policy_engine': + repo: 'policy/engine' + pom: 'pom.xml' + - 'policy_gui': + repo: 'policy/gui' + pom: 'pom.xml' + - 'policy_pap': + repo: 'policy/pap' + pom: 'pom.xml' + - 'policy_pdp': + repo: 'policy/pdp' + pom: 'pom.xml' + - 'portal': + repo: 'portal' + pom: 'pom.xml' + - 'portal_sdk_ecomp-sdk': + repo: 'portal/sdk' + pom: 'ecomp-sdk/pom.xml' + - 'sdc': + repo: 'sdc' + pom: 'pom.xml' + - 'sdc_jtosca': + repo: 'sdc/jtosca' + pom: 'pom.xml' + - 'sdc_sdc-distribution-client': + repo: 'sdc/sdc-distribution-client' + pom: 'pom.xml' + - 'sdc_sdc-docker-base': + repo: 'sdc/sdc-docker-base' + pom: 'pom.xml' + - 'sdc_sdc-titan-cassandra': + repo: 'sdc/sdc-titan-cassandra' + pom: 'pom.xml' + - 'sdc_sdc-tosca': + repo: 'sdc/sdc-tosca' + pom: 'pom.xml' + - 'sdc_sdc-workflow-designer': + repo: 'sdc/sdc-workflow-designer' + pom: 'pom.xml' + - 'sdnc_adaptors': + repo: 'sdnc/adaptors' + pom: 'pom.xml' + - 'sdnc_core': + repo: 'sdnc/core' + pom: 'pom.xml' + - 'sdnc_northbound': + repo: 'sdnc/northbound' + pom: 'pom.xml' + - 'sdnc_oam': + repo: 'sdnc/oam' + pom: 'pom.xml' + - 'sdnc_plugins': + repo: 'sdnc/plugins' + pom: 'pom.xml' + - 'so': + repo: 'so' + pom: 'pom.xml' + - 'so_libs': + repo: 'so/libs' + pom: 'pom.xml' + - 'testsuite_heatbridge': + repo: 'testsuite/heatbridge' + pom: 'pom.xml' + - 'ui_dmaapbc': + repo: 'ui/dmaapbc' + pom: 'pom.xml' + - 'usecase-ui': + repo: 'usecase-ui' + pom: 'pom.xml' + - 'usecase-ui_server': + repo: 'usecase-ui/server' + pom: 'pom.xml' + - 'vfc_gvnfm_vnflcm': + repo: 'vfc/gvnfm/vnflcm' + pom: 'pom.xml' + - 'vfc_gvnfm_vnfmgr': + repo: 'vfc/gvnfm/vnfmgr' + pom: 'pom.xml' + - 'vfc_gvnfm_vnfres': + repo: 'vfc/gvnfm/vnfres' + pom: 'pom.xml' + - 'vfc_nfvo_catalog': + repo: 'vfc/nfvo/catalog' + pom: 'pom.xml' + - 'vfc_nfvo_driver_ems': + repo: 'vfc/nfvo/driver/ems' + pom: 'pom.xml' + - 'vfc_nfvo_driver_sfc': + repo: 'vfc/nfvo/driver/sfc' + pom: 'pom.xml' + - 'vfc_nfvo_driver_vnfm_gvnfm': + repo: 'vfc/nfvo/driver/vnfm/gvnfm' + pom: 'pom.xml' + - 'vfc_nfvo_driver_vnfm_svnfm': + repo: 'vfc/nfvo/driver/vnfm/svnfm' + pom: 'pom.xml' + - 'vfc_nfvo_lcm': + repo: 'vfc/nfvo/lcm' + pom: 'pom.xml' + - 'vfc_nfvo_resmanagement': + repo: 'vfc/nfvo/resmanagement' + pom: 'pom.xml' + - 'vfc_nfvo_wfengine': + repo: 'vfc/nfvo/wfengine' + pom: 'pom.xml' + - 'vid': + repo: 'vid' + pom: 'pom.xml' + - 'vid_asdcclient': + repo: 'vid/asdcclient' + pom: 'pom.xml' + - 'vnfsdk_compliance_veslibrary_ves_clibrary_VESreporting_vFW': + repo: 'vnfsdk/compliance' + pom: 'veslibrary/ves_clibrary/VESreporting_vFW/pom.xml' + - 'vnfsdk_compliance_veslibrary_ves_clibrary_VESreporting_vLB': + repo: 'vnfsdk/compliance' + pom: 'veslibrary/ves_clibrary/VESreporting_vLB/pom.xml' + - 'vnfsdk_compliance_veslibrary_ves_javalibrary_evel_javalib2': + repo: 'vnfsdk/compliance' + pom: 'veslibrary/ves_javalibrary/evel_javalib2/pom.xml' + - 'vnfsdk_functest': + repo: 'vnfsdk/functest' + pom: 'pom.xml' + - 'vnfsdk_lctest': + repo: 'vnfsdk/lctest' + pom: 'pom.xml' + - 'vnfsdk_pkgtools': + repo: 'vnfsdk/pkgtools' + pom: 'pom.xml' + - 'vnfsdk_refrepo': + repo: 'vnfsdk/refrepo' + pom: 'pom.xml' + - 'vnfsdk_validation': + repo: 'vnfsdk/validation' + pom: 'pom.xml' diff --git a/deployment/heat/onap-rke/onap-oom.yaml b/deployment/heat/onap-rke/onap-oom.yaml index f4b55c7a1..8534444a7 100644 --- a/deployment/heat/onap-rke/onap-oom.yaml +++ b/deployment/heat/onap-rke/onap-oom.yaml @@ -30,12 +30,12 @@ parameters: oam_ext_network_host_route: type: json description: > - host routes - "destination": '10.12.0.0/16' - "nexthop": '10.100.0.1' + host routes + "destination": '10.12.0.0/16' + "nexthop": '10.100.0.1' default: - "destination": '10.12.0.0/16' - "nexthop": '10.100.0.1' + "destination": '10.12.0.0/16' + "nexthop": '10.100.0.1' ubuntu_1804_image: type: string diff --git a/deployment/heat/onap-rke/parts/onap-oom-1.yaml b/deployment/heat/onap-rke/parts/onap-oom-1.yaml index eaa7159c1..13888e95f 100644 --- a/deployment/heat/onap-rke/parts/onap-oom-1.yaml +++ b/deployment/heat/onap-rke/parts/onap-oom-1.yaml @@ -25,12 +25,12 @@ parameters: oam_ext_network_host_route: type: json description: > - host routes - "destination": '10.12.0.0/16' - "nexthop": '10.100.0.1' + host routes + "destination": '10.12.0.0/16' + "nexthop": '10.100.0.1' default: - "destination": '10.12.0.0/16' - "nexthop": '10.100.0.1' + "destination": '10.12.0.0/16' + "nexthop": '10.100.0.1' ubuntu_1804_image: type: string diff --git a/deployment/onap-lab-ci/jjb/jobs.yaml b/deployment/onap-lab-ci/jjb/jobs.yaml index 128ec8bb1..5fc398397 100644 --- a/deployment/onap-lab-ci/jjb/jobs.yaml +++ b/deployment/onap-lab-ci/jjb/jobs.yaml @@ -1,142 +1,142 @@ - project: name: staging jobs: - - '{env}-staging-{frequency}' + - '{env}-staging-{frequency}' integration-branch: 'master' oom-branch: 'staging' env: - - 'windriver': - lab-name: 'windriver' - tenant-name: 'Integration-Staging-Daily' - stack-name: 'staging' - frequency: 'daily' - disabled_var: false - triggers_var: - - timed: 'H 4 * * *' - - 'windriver-sb00': - lab-name: 'windriver' - tenant-name: 'Integration-SB-00' - stack-name: 'sb00' - frequency: 'manual' - disabled_var: false - - 'windriver-sb01': - lab-name: 'windriver' - tenant-name: 'Integration-SB-01' - stack-name: 'sb01' - frequency: 'manual' - disabled_var: false - - 'windriver-sb02': - lab-name: 'windriver' - tenant-name: 'Integration-SB-02' - stack-name: 'sb02' - frequency: 'manual' - disabled_var: false - - 'windriver-sb03': - lab-name: 'windriver' - tenant-name: 'Integration-SB-03' - stack-name: 'sb03' - frequency: 'manual' - disabled_var: false - - 'windriver-sb04': - lab-name: 'windriver' - tenant-name: 'Integration-SB-04' - stack-name: 'sb04' - frequency: 'manual' - disabled_var: false - - 'windriver-integration-design': - lab-name: 'windriver' - tenant-name: 'Integration-Design' - stack-name: 'design' - frequency: 'manual' - disabled_var: false - - 'windriver-integration-instantiation': - lab-name: 'windriver' - tenant-name: 'Integration-Instantiation' - stack-name: 'instantiation' - frequency: 'manual' - disabled_var: false - - 'windriver-integration-closedloop': - lab-name: 'windriver' - tenant-name: 'Integration-ClosedLoop' - stack-name: 'closedloop' - frequency: 'manual' - disabled_var: false + - 'windriver': + lab-name: 'windriver' + tenant-name: 'Integration-Staging-Daily' + stack-name: 'staging' + frequency: 'daily' + disabled_var: false + triggers_var: + - timed: 'H 4 * * *' + - 'windriver-sb00': + lab-name: 'windriver' + tenant-name: 'Integration-SB-00' + stack-name: 'sb00' + frequency: 'manual' + disabled_var: false + - 'windriver-sb01': + lab-name: 'windriver' + tenant-name: 'Integration-SB-01' + stack-name: 'sb01' + frequency: 'manual' + disabled_var: false + - 'windriver-sb02': + lab-name: 'windriver' + tenant-name: 'Integration-SB-02' + stack-name: 'sb02' + frequency: 'manual' + disabled_var: false + - 'windriver-sb03': + lab-name: 'windriver' + tenant-name: 'Integration-SB-03' + stack-name: 'sb03' + frequency: 'manual' + disabled_var: false + - 'windriver-sb04': + lab-name: 'windriver' + tenant-name: 'Integration-SB-04' + stack-name: 'sb04' + frequency: 'manual' + disabled_var: false + - 'windriver-integration-design': + lab-name: 'windriver' + tenant-name: 'Integration-Design' + stack-name: 'design' + frequency: 'manual' + disabled_var: false + - 'windriver-integration-instantiation': + lab-name: 'windriver' + tenant-name: 'Integration-Instantiation' + stack-name: 'instantiation' + frequency: 'manual' + disabled_var: false + - 'windriver-integration-closedloop': + lab-name: 'windriver' + tenant-name: 'Integration-ClosedLoop' + stack-name: 'closedloop' + frequency: 'manual' + disabled_var: false - project: name: release jobs: - - '{env}-release-{frequency}' + - '{env}-release-{frequency}' integration-branch: 'master' oom-branch: 'master' env: - - 'windriver': - lab-name: 'windriver' - tenant-name: 'Integration-Release-Daily' - stack-name: 'release' - frequency: 'daily' - disabled_var: false - triggers_var: - - timed: 'H 6 * * *' - - 'windriver-longevity': - lab-name: 'windriver' - tenant-name: 'Integration-Longevity' - stack-name: 'long' - frequency: 'manual' - disabled_var: false - - 'windriver-sb00': - lab-name: 'windriver' - tenant-name: 'Integration-SB-00' - stack-name: 'sb00' - frequency: 'manual' - disabled_var: false - - 'windriver-sb01': - lab-name: 'windriver' - tenant-name: 'Integration-SB-01' - stack-name: 'sb01' - frequency: 'manual' - disabled_var: false - - 'windriver-sb02': - lab-name: 'windriver' - tenant-name: 'Integration-SB-02' - stack-name: 'sb02' - frequency: 'manual' - disabled_var: false - - 'windriver-sb03': - lab-name: 'windriver' - tenant-name: 'Integration-SB-03' - stack-name: 'sb03' - frequency: 'manual' - disabled_var: false - - 'windriver-sb04': - lab-name: 'windriver' - tenant-name: 'Integration-SB-04' - stack-name: 'sb04' - frequency: 'manual' - disabled_var: false + - 'windriver': + lab-name: 'windriver' + tenant-name: 'Integration-Release-Daily' + stack-name: 'release' + frequency: 'daily' + disabled_var: false + triggers_var: + - timed: 'H 6 * * *' + - 'windriver-longevity': + lab-name: 'windriver' + tenant-name: 'Integration-Longevity' + stack-name: 'long' + frequency: 'manual' + disabled_var: false + - 'windriver-sb00': + lab-name: 'windriver' + tenant-name: 'Integration-SB-00' + stack-name: 'sb00' + frequency: 'manual' + disabled_var: false + - 'windriver-sb01': + lab-name: 'windriver' + tenant-name: 'Integration-SB-01' + stack-name: 'sb01' + frequency: 'manual' + disabled_var: false + - 'windriver-sb02': + lab-name: 'windriver' + tenant-name: 'Integration-SB-02' + stack-name: 'sb02' + frequency: 'manual' + disabled_var: false + - 'windriver-sb03': + lab-name: 'windriver' + tenant-name: 'Integration-SB-03' + stack-name: 'sb03' + frequency: 'manual' + disabled_var: false + - 'windriver-sb04': + lab-name: 'windriver' + tenant-name: 'Integration-SB-04' + stack-name: 'sb04' + frequency: 'manual' + disabled_var: false - project: name: dublin jobs: - - '{env}-release-{frequency}' + - '{env}-release-{frequency}' integration-branch: 'master' oom-branch: 'dublin' env: - - 'windriver-dublin-sb04': - lab-name: 'windriver' - tenant-name: 'Integration-SB-04' - stack-name: 'dublin' - frequency: 'manual' - disabled_var: false + - 'windriver-dublin-sb04': + lab-name: 'windriver' + tenant-name: 'Integration-SB-04' + stack-name: 'dublin' + frequency: 'manual' + disabled_var: false - project: name: stability jobs: - - '{env}-stability72hr' - - '{env}-vfwclosedloop' + - '{env}-stability72hr' + - '{env}-vfwclosedloop' integration-branch: 'master' env: - - 'windriver-longevity': - lab-name: 'windriver' - tenant-name: 'Integration-Longevity' - stack-name: 'long' - disabled_var: false + - 'windriver-longevity': + lab-name: 'windriver' + tenant-name: 'Integration-Longevity' + stack-name: 'long' + disabled_var: false diff --git a/docs/files/scaleout/k8s-tca-clamp-policy-05162019.yaml b/docs/files/scaleout/k8s-tca-clamp-policy-05162019.yaml index 406494961..fb7174bfa 100644 --- a/docs/files/scaleout/k8s-tca-clamp-policy-05162019.yaml +++ b/docs/files/scaleout/k8s-tca-clamp-policy-05162019.yaml @@ -80,95 +80,95 @@ node_templates: - target: tca_policy type: cloudify.relationships.depends_on properties: - service_component_type: 'dcaegen2-analytics-tca' - docker_config: {} - image: - get_input: tag_version - log_info: - log_directory: "/opt/app/TCAnalytics/logs" - application_config: - app_config: - appDescription: DCAE Analytics Threshold Crossing Alert Application - appName: dcae-tca - tcaAlertsAbatementTableName: TCAAlertsAbatementTable - tcaAlertsAbatementTableTTLSeconds: '1728000' - tcaSubscriberOutputStreamName: TCASubscriberOutputStream - tcaVESAlertsTableName: TCAVESAlertsTable - tcaVESAlertsTableTTLSeconds: '1728000' - tcaVESMessageStatusTableName: TCAVESMessageStatusTable - tcaVESMessageStatusTableTTLSeconds: '86400' - thresholdCalculatorFlowletInstances: '2' - app_preferences: - aaiEnrichmentHost: - get_input: aaiEnrichmentHost - aaiEnrichmentIgnoreSSLCertificateErrors: 'true' - aaiEnrichmentPortNumber: '8443' - aaiEnrichmentProtocol: https - aaiEnrichmentUserName: dcae@dcae.onap.org - aaiEnrichmentUserPassword: demo123456! - aaiVMEnrichmentAPIPath: /aai/v11/search/nodes-query - aaiVNFEnrichmentAPIPath: /aai/v11/network/generic-vnfs/generic-vnf - enableAAIEnrichment: - get_input: enableAAIEnrichment - enableRedisCaching: - get_input: enableRedisCaching - redisHosts: - get_input: redisHosts - enableAlertCEFFormat: 'false' - publisherContentType: application/json - publisherHostName: - get_input: dmaap_host - publisherHostPort: - get_input: dmaap_port - publisherMaxBatchSize: '1' - publisherMaxRecoveryQueueSize: '100000' - publisherPollingInterval: '20000' - publisherProtocol: http - publisherTopicName: unauthenticated.DCAE_CL_OUTPUT - subscriberConsumerGroup: OpenDCAE-clamp - subscriberConsumerId: c12 - subscriberContentType: application/json - subscriberHostName: - get_input: dmaap_host - subscriberHostPort: - get_input: dmaap_port - subscriberMessageLimit: '-1' - subscriberPollingInterval: '30000' - subscriberProtocol: http - subscriberTimeoutMS: '-1' - subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT - tca_policy: '' + service_component_type: 'dcaegen2-analytics-tca' + docker_config: {} + image: + get_input: tag_version + log_info: + log_directory: "/opt/app/TCAnalytics/logs" + application_config: + app_config: + appDescription: DCAE Analytics Threshold Crossing Alert Application + appName: dcae-tca + tcaAlertsAbatementTableName: TCAAlertsAbatementTable + tcaAlertsAbatementTableTTLSeconds: '1728000' + tcaSubscriberOutputStreamName: TCASubscriberOutputStream + tcaVESAlertsTableName: TCAVESAlertsTable + tcaVESAlertsTableTTLSeconds: '1728000' + tcaVESMessageStatusTableName: TCAVESMessageStatusTable + tcaVESMessageStatusTableTTLSeconds: '86400' + thresholdCalculatorFlowletInstances: '2' + app_preferences: + aaiEnrichmentHost: + get_input: aaiEnrichmentHost + aaiEnrichmentIgnoreSSLCertificateErrors: 'true' + aaiEnrichmentPortNumber: '8443' + aaiEnrichmentProtocol: https + aaiEnrichmentUserName: dcae@dcae.onap.org + aaiEnrichmentUserPassword: demo123456! + aaiVMEnrichmentAPIPath: /aai/v11/search/nodes-query + aaiVNFEnrichmentAPIPath: /aai/v11/network/generic-vnfs/generic-vnf + enableAAIEnrichment: + get_input: enableAAIEnrichment + enableRedisCaching: + get_input: enableRedisCaching + redisHosts: + get_input: redisHosts + enableAlertCEFFormat: 'false' + publisherContentType: application/json + publisherHostName: + get_input: dmaap_host + publisherHostPort: + get_input: dmaap_port + publisherMaxBatchSize: '1' + publisherMaxRecoveryQueueSize: '100000' + publisherPollingInterval: '20000' + publisherProtocol: http + publisherTopicName: unauthenticated.DCAE_CL_OUTPUT + subscriberConsumerGroup: OpenDCAE-clamp + subscriberConsumerId: c12 + subscriberContentType: application/json + subscriberHostName: + get_input: dmaap_host + subscriberHostPort: + get_input: dmaap_port + subscriberMessageLimit: '-1' + subscriberPollingInterval: '30000' + subscriberProtocol: http + subscriberTimeoutMS: '-1' + subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT + tca_policy: '' service_component_type: dcaegen2-analytics_tca interfaces: cloudify.interfaces.lifecycle: start: inputs: envs: - DMAAPHOST: - { get_input: dmaap_host } - DMAAPPORT: - { get_input: dmaap_port } - DMAAPPUBTOPIC: "unauthenticated.DCAE_CL_OUTPUT" - DMAAPSUBTOPIC: "unauthenticated.VES_MEASUREMENT_OUTPUT" - AAIHOST: - { get_input: aaiEnrichmentHost } - AAIPORT: - { get_input: aaiEnrichmentPort } - CONSUL_HOST: - { get_input: consul_host } - CONSUL_PORT: - { get_input: consul_port } - CBS_HOST: - { get_input: cbs_host } - CBS_PORT: - { get_input: cbs_port } - CONFIG_BINDING_SERVICE: "config_binding_service" + MAAPHOST: + { get_input: dmaap_host } + DMAAPPORT: + { get_input: dmaap_port } + DMAAPPUBTOPIC: "unauthenticated.DCAE_CL_OUTPUT" + DMAAPSUBTOPIC: "unauthenticated.VES_MEASUREMENT_OUTPUT" + AAIHOST: + { get_input: aaiEnrichmentHost } + AAIPORT: + { get_input: aaiEnrichmentPort } + CONSUL_HOST: + { get_input: consul_host } + CONSUL_PORT: + { get_input: consul_port } + CBS_HOST: + { get_input: cbs_host } + CBS_PORT: + { get_input: cbs_port } + CONFIG_BINDING_SERVICE: "config_binding_service" ports: - concat: ["11011:", { get_input: external_port }] tca_policy: type: clamp.nodes.policy properties: policy_id: - get_input: policy_id + get_input: policy_id policy_model_id: - get_input: policy_model_id + get_input: policy_model_id diff --git a/test/mocks/datafilecollector-testharness/dr-sim/docker-compose.yml b/test/mocks/datafilecollector-testharness/dr-sim/docker-compose.yml index efcc33f58..e60a742c6 100644 --- a/test/mocks/datafilecollector-testharness/dr-sim/docker-compose.yml +++ b/test/mocks/datafilecollector-testharness/dr-sim/docker-compose.yml @@ -3,15 +3,15 @@ services: drsim: image: drsim_common:latest ports: - - "3906:3906" - - "3907:3907" + - "3906:3906" + - "3907:3907" container_name: drsim command: node dmaapDR.js drsim_redir: image: drsim_common:latest ports: - - "3908:3908" - - "3909:3909" + - "3908:3908" + - "3909:3909" container_name: drsim_redir command: node dmaapDR_redir.js diff --git a/test/mocks/datafilecollector-testharness/mr-sim/docker-compose.yml b/test/mocks/datafilecollector-testharness/mr-sim/docker-compose.yml index ff8aa29cd..cc7cafdbe 100644 --- a/test/mocks/datafilecollector-testharness/mr-sim/docker-compose.yml +++ b/test/mocks/datafilecollector-testharness/mr-sim/docker-compose.yml @@ -4,8 +4,8 @@ services: mrsim: image: mrsim:latest ports: - - "2222:2222" - - "2223:2223" + - "2222:2222" + - "2223:2223" container_name: mrsim command: python mr-sim.py --tc100 # Change -tc100 to other tc number for desired behavior. diff --git a/test/mocks/datafilecollector-testharness/simulator-group/docker-compose-template.yml b/test/mocks/datafilecollector-testharness/simulator-group/docker-compose-template.yml index 88b2afd58..e853efdb1 100644 --- a/test/mocks/datafilecollector-testharness/simulator-group/docker-compose-template.yml +++ b/test/mocks/datafilecollector-testharness/simulator-group/docker-compose-template.yml @@ -1,9 +1,9 @@ version: '2' networks: - dfcnet: - external: - name: dfcnet + dfcnet: + external: + name: dfcnet services: @@ -41,12 +41,12 @@ services: networks: - dfcnet environment: - DRR_SIM_IP: ${DR_REDIR_SIM} - DR_FEEDS: ${DR_FEEDS} + DRR_SIM_IP: ${DR_REDIR_SIM} + DR_FEEDS: ${DR_FEEDS} image: drsim_common:latest ports: - - "3906:3906" - - "3907:3907" + - "3906:3906" + - "3907:3907" container_name: dfc_dr-sim command: node dmaapDR.js ${DR_TC} volumes: @@ -58,12 +58,12 @@ services: networks: - dfcnet environment: - DR_SIM_IP: drsim - DR_REDIR_FEEDS: ${DR_REDIR_FEEDS} + DR_SIM_IP: drsim + DR_REDIR_FEEDS: ${DR_REDIR_FEEDS} image: drsim_common:latest ports: - - "3908:3908" - - "3909:3909" + - "3908:3908" + - "3909:3909" container_name: dfc_dr-redir-sim command: node dmaapDR_redir.js ${DR_REDIR_TC} volumes: @@ -75,11 +75,11 @@ services: networks: - dfcnet environment: - SFTP_SIMS: ${SFTP_SIMS} - FTPS_SIMS: ${FTPS_SIMS} - NUM_FTP_SERVERS: ${NUM_FTP_SERVERS} - MR_GROUPS: ${MR_GROUPS} - MR_FILE_PREFIX_MAPPING: ${MR_FILE_PREFIX_MAPPING} + SFTP_SIMS: ${SFTP_SIMS} + FTPS_SIMS: ${FTPS_SIMS} + NUM_FTP_SERVERS: ${NUM_FTP_SERVERS} + MR_GROUPS: ${MR_GROUPS} + MR_FILE_PREFIX_MAPPING: ${MR_FILE_PREFIX_MAPPING} image: mrsim:latest ports: - "2222:2222" diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/deployment/PnP_PNF_sim_heat_template.yml b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/deployment/PnP_PNF_sim_heat_template.yml index 76719ae44..6f9b5f02f 100644 --- a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/deployment/PnP_PNF_sim_heat_template.yml +++ b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/deployment/PnP_PNF_sim_heat_template.yml @@ -2,12 +2,12 @@ description: Heat template that deploys PnP PNF simulator heat_template_version: '2013-05-23' parameters: flavor_name: {description: Type of instance (flavor) to be used, label: Flavor, - type: string} + type: string} image_name: {description: Image to be used for compute instance, label: Image name - or ID, type: string} + or ID, type: string} key_name: {description: Public/Private key pair name, label: Key pair name, type: string} public_net_id: {description: Public network that enables remote connection to VNF, - label: Public network name or ID, type: string} + label: Public network name or ID, type: string} private_net_id: {type: string, description: Private network id, label: Private network name or ID} private_subnet_id: {type: string, description: Private subnet id, label: Private subnetwork name or ID} proxy: {type: string, description: Proxy, label: Proxy, default: ""} diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/docker-compose-template.yml b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/docker-compose-template.yml index a4bbcd995..a13a76bd7 100644 --- a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/docker-compose-template.yml +++ b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/docker-compose-template.yml @@ -45,8 +45,8 @@ services: front-${I}: ipv4_address: "${IPFTPS}" ports: - - "${PORTFTPS}:21" - - "${FTPS_PASV_MIN}-${FTPS_PASV_MAX}:${FTPS_PASV_MIN}-${FTPS_PASV_MAX}" + - "${PORTFTPS}:21" + - "${FTPS_PASV_MIN}-${FTPS_PASV_MAX}:${FTPS_PASV_MIN}-${FTPS_PASV_MAX}" environment: FTP_USER: onap FTP_PASSWORD: pano diff --git a/test/mocks/pnf-onboarding/src/main/resources/csarContent/Definitions/etsi_nfv_sol001_vnfd_2_5_1_types.yaml b/test/mocks/pnf-onboarding/src/main/resources/csarContent/Definitions/etsi_nfv_sol001_vnfd_2_5_1_types.yaml index c0ca061b2..63e8b2ec6 100644 --- a/test/mocks/pnf-onboarding/src/main/resources/csarContent/Definitions/etsi_nfv_sol001_vnfd_2_5_1_types.yaml +++ b/test/mocks/pnf-onboarding/src/main/resources/csarContent/Definitions/etsi_nfv_sol001_vnfd_2_5_1_types.yaml @@ -264,19 +264,19 @@ data_types: description: describes one protocol layer and associated protocol data for a given virtual link used in a specific VNF deployment flavour properties: associated_layer_protocol: - type: string - description: Identifies one of the protocols a virtualLink gives access to (ethernet, mpls, odu2, ipv4, ipv6, pseudo-wire) as specified by the connectivity_type property. - required: true - constraints: - - valid_values: [ ethernet, mpls, odu2, ipv4, ipv6, pseudo-wire ] + type: string + description: Identifies one of the protocols a virtualLink gives access to (ethernet, mpls, odu2, ipv4, ipv6, pseudo-wire) as specified by the connectivity_type property. + required: true + constraints: + - valid_values: [ ethernet, mpls, odu2, ipv4, ipv6, pseudo-wire ] l2_protocol_data: - type: tosca.datatypes.nfv.L2ProtocolData - description: Specifies the L2 protocol data for a virtual link. Shall be present when the associatedLayerProtocol attribute indicates a L2 protocol and shall be absent otherwise. - required: false + type: tosca.datatypes.nfv.L2ProtocolData + description: Specifies the L2 protocol data for a virtual link. Shall be present when the associatedLayerProtocol attribute indicates a L2 protocol and shall be absent otherwise. + required: false l3_protocol_data: - type: tosca.datatypes.nfv.L3ProtocolData - description: Specifies the L3 protocol data for this virtual link. Shall be present when the associatedLayerProtocol attribute indicates a L3 protocol and shall be absent otherwise. - required: false + type: tosca.datatypes.nfv.L3ProtocolData + description: Specifies the L3 protocol data for this virtual link. Shall be present when the associatedLayerProtocol attribute indicates a L3 protocol and shall be absent otherwise. + required: false tosca.datatypes.nfv.L2ProtocolData: derived_from: tosca.datatypes.Root @@ -548,7 +548,7 @@ data_types: description: Specifies the maximum packet loss ratio required: false constraints: - - in_range: [ 0.0, 1.0 ] + - in_range: [ 0.0, 1.0 ] tosca.datatypes.nfv.VnfConfigurableProperties: derived_from: tosca.datatypes.Root @@ -702,26 +702,26 @@ data_types: default: false tosca.datatypes.nfv.VirtualObjectStorageData: - derived_from: tosca.datatypes.Root - description: VirtualObjectStorageData describes object storage requirements associated with compute resources in a particular VDU - properties: - max_size_of_storage: - type: scalar-unit.size - description: Maximum size of virtualized storage resource - required: false + derived_from: tosca.datatypes.Root + description: VirtualObjectStorageData describes object storage requirements associated with compute resources in a particular VDU + properties: + max_size_of_storage: + type: scalar-unit.size + description: Maximum size of virtualized storage resource + required: false tosca.datatypes.nfv.VirtualFileStorageData: - derived_from: tosca.datatypes.Root - description: VirtualFileStorageData describes file storage requirements associated with compute resources in a particular VDU - properties: - size_of_storage: - type: scalar-unit.size - description: Size of virtualized storage resource - required: true - file_system_protocol: - type: string - description: The shared file system protocol (e.g. NFS, CIFS) - required: true + derived_from: tosca.datatypes.Root + description: VirtualFileStorageData describes file storage requirements associated with compute resources in a particular VDU + properties: + size_of_storage: + type: scalar-unit.size + description: Size of virtualized storage resource + required: true + file_system_protocol: + type: string + description: The shared file system protocol (e.g. NFS, CIFS) + required: true tosca.datatypes.nfv.VirtualLinkBitrateLevel: derived_from: tosca.datatypes.Root @@ -802,7 +802,7 @@ data_types: description: Identifies a performance metric derived from those defined in ETSI GS NFV-IFA 027.The packetOutgoingVirtualLink and packetIncomingVirtualLink metrics shall be obtained by aggregation the PacketOutgoing and PacketIncoming measurements defined in clause 7.1 of GS NFV-IFA 027 of all virtual link ports attached to the virtual link to which the metrics apply. required: true constraints: - - valid_values: [ packet_outgoing_virtual_link, packet_incoming_virtual_link ] + - valid_values: [ packet_outgoing_virtual_link, packet_incoming_virtual_link ] collection_period: type: scalar-unit.time description: Describes the recommended periodicity at which to collect the performance information. @@ -917,18 +917,18 @@ capability_types: description: Describes the Logical Node requirements required: false entry_schema: - type: tosca.datatypes.nfv.LogicalNodeData + type: tosca.datatypes.nfv.LogicalNodeData requested_additional_capabilities: type: map description: Describes additional capability for a particular VDU required: false entry_schema: - type: tosca.datatypes.nfv.RequestedAdditionalCapability + type: tosca.datatypes.nfv.RequestedAdditionalCapability compute_requirements: type: map required: false entry_schema: - type: string + type: string virtual_memory: type: tosca.datatypes.nfv.VirtualMemory description: Describes virtual memory of the virtualized compute @@ -1297,10 +1297,10 @@ node_types: type: tosca.capabilities.nfv.VirtualStorage description: Defines the capabilities of virtual_storage. requirements: - - virtual_link: - capability: tosca.capabilities.nfv.VirtualLinkable - relationship: tosca.relationships.nfv.VirtualLinksTo - #description: Describes the requirements for linking to virtual link + - virtual_link: + capability: tosca.capabilities.nfv.VirtualLinkable + relationship: tosca.relationships.nfv.VirtualLinksTo + #description: Describes the requirements for linking to virtual link tosca.nodes.nfv.Cp: derived_from: tosca.nodes.Root diff --git a/test/mocks/pnfsimulator/pnfsimulator/deployment/PnP_PNF_sim_heat_template.yml b/test/mocks/pnfsimulator/pnfsimulator/deployment/PnP_PNF_sim_heat_template.yml index 76719ae44..6f9b5f02f 100644 --- a/test/mocks/pnfsimulator/pnfsimulator/deployment/PnP_PNF_sim_heat_template.yml +++ b/test/mocks/pnfsimulator/pnfsimulator/deployment/PnP_PNF_sim_heat_template.yml @@ -2,12 +2,12 @@ description: Heat template that deploys PnP PNF simulator heat_template_version: '2013-05-23' parameters: flavor_name: {description: Type of instance (flavor) to be used, label: Flavor, - type: string} + type: string} image_name: {description: Image to be used for compute instance, label: Image name - or ID, type: string} + or ID, type: string} key_name: {description: Public/Private key pair name, label: Key pair name, type: string} public_net_id: {description: Public network that enables remote connection to VNF, - label: Public network name or ID, type: string} + label: Public network name or ID, type: string} private_net_id: {type: string, description: Private network id, label: Private network name or ID} private_subnet_id: {type: string, description: Private subnet id, label: Private subnetwork name or ID} proxy: {type: string, description: Proxy, label: Proxy, default: ""} diff --git a/test/vcpe/preload_templates/simple_neutron_heat.yaml b/test/vcpe/preload_templates/simple_neutron_heat.yaml index f64248be8..1df0c7192 100644 --- a/test/vcpe/preload_templates/simple_neutron_heat.yaml +++ b/test/vcpe/preload_templates/simple_neutron_heat.yaml @@ -6,9 +6,9 @@ parameters: description: Name of the Neutron Network default: ONAP-NW1 shared: - type: boolean - description: Shared amongst tenants - default: False + type: boolean + description: Shared amongst tenants + default: False outputs: network_id: description: Openstack network identifier -- cgit 1.2.3-korg