summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Morales <victor.morales@intel.com>2018-10-19 04:08:48 +0000
committerGerrit Code Review <gerrit@onap.org>2018-10-19 04:08:48 +0000
commit85e4695525871532679a80fe1c85455731f80f1f (patch)
tree3efc7cb8f1ac204f7f33b1dc25977cfaef51f74d
parenta0717d420a2824347e5bcc673f368756fdceccd6 (diff)
parent1e63999fa28988282cb636fa230ae263c8a93c8f (diff)
Merge "Add License headers"
-rw-r--r--deployments/Dockerfile9
-rw-r--r--tox.ini9
-rw-r--r--vagrant/Vagrantfile8
-rw-r--r--vagrant/config/samples/pdf.yml.aio4
-rw-r--r--vagrant/inventory/group_vars/k8s-cluster.yml9
-rw-r--r--vagrant/tests/generic_simulator/aai/responses.yml189
6 files changed, 46 insertions, 182 deletions
diff --git a/deployments/Dockerfile b/deployments/Dockerfile
index 407af509..65c44b8c 100644
--- a/deployments/Dockerfile
+++ b/deployments/Dockerfile
@@ -1,3 +1,12 @@
+# SPDX-license-identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2018
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
FROM debian:jessie
ARG HTTP_PROXY=${HTTP_PROXY}
diff --git a/tox.ini b/tox.ini
index 049deaec..b3a24218 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,3 +1,12 @@
+# SPDX-license-identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2018
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
[tox]
minversion = 1.6
skipsdist = True
diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile
index 7ff18f06..1e6ebd7a 100644
--- a/vagrant/Vagrantfile
+++ b/vagrant/Vagrantfile
@@ -1,5 +1,13 @@
# -*- mode: ruby -*-
# vi: set ft=ruby :
+# SPDX-license-identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2018
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
box = {
:virtualbox => { :name => 'elastic/ubuntu-16.04-x86_64', :version => '20180708.0.0' },
diff --git a/vagrant/config/samples/pdf.yml.aio b/vagrant/config/samples/pdf.yml.aio
index 2ad95639..48a3c938 100644
--- a/vagrant/config/samples/pdf.yml.aio
+++ b/vagrant/config/samples/pdf.yml.aio
@@ -10,8 +10,8 @@
- name: "kubernetes"
ip: "10.10.10.3"
- memory: 8192
- cpus: 2
+ memory: 32768
+ cpus: 16
volumes:
- name: sda
size: 50
diff --git a/vagrant/inventory/group_vars/k8s-cluster.yml b/vagrant/inventory/group_vars/k8s-cluster.yml
index 8a012a32..e92f6381 100644
--- a/vagrant/inventory/group_vars/k8s-cluster.yml
+++ b/vagrant/inventory/group_vars/k8s-cluster.yml
@@ -1,3 +1,12 @@
+# SPDX-license-identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2018
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
## For some things, kubelet needs to load kernel modules. For example, dynamic kernel services are needed
## for mounting persistent volumes into containers. These may not be loaded by preinstall kubernetes
## processes. For example, ceph and rbd backed volumes. Set to true to allow kubelet to load kernel
diff --git a/vagrant/tests/generic_simulator/aai/responses.yml b/vagrant/tests/generic_simulator/aai/responses.yml
index f6d5fcd0..041e5207 100644
--- a/vagrant/tests/generic_simulator/aai/responses.yml
+++ b/vagrant/tests/generic_simulator/aai/responses.yml
@@ -1,3 +1,12 @@
+# SPDX-license-identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2018
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
aai/v13/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne:
GET:
body: '{"cloud-owner":"CloudOwner","cloud-region-id":"RegionOne","cloud-type":"openstack","owner-defined-type":"t1","cloud-region-version":"RegionOne","identity-url":"http://keystone:8080/v3","cloud-zone":"z1","complex-name":"clli1","sriov-automation":false,"cloud-extra-info":"","resource-version":"1524845154715"}'
@@ -7,183 +16,3 @@ aai/v13/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne:
body: ''
content_type: application/json
status_code: 200
-aai/v13/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/availability-zones/availability-zone/internal:
- GET:
- body: '{"requestError":{"serviceException":{"messageId":"SVC3001","text":"Resource
- not found for %1 using id %2 (msg=%3) (ec=%4)","variables":["GET","cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/availability-zones/availability-zone/internal","Node
- Not Found:No Node of type availability-zone found at: cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/availability-zones/availability-zone/internal","ERR.5.4.6114"]}}}'
- content_type: application/json
- status_code: 200
- PUT:
- body: ''
- content_type: application/json
- status_code: 200
-aai/v13/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/availability-zones/availability-zone/nova:
- GET:
- body: '{"requestError":{"serviceException":{"messageId":"SVC3001","text":"Resource
- not found for %1 using id %2 (msg=%3) (ec=%4)","variables":["GET","cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/availability-zones/availability-zone/nova","Node
- Not Found:No Node of type availability-zone found at: cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/availability-zones/availability-zone/nova","ERR.5.4.6114"]}}}'
- content_type: application/json
- status_code: 200
- PUT:
- body: ''
- content_type: application/json
- status_code: 200
-aai/v13/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/100:
- GET:
- body: '{"requestError":{"serviceException":{"messageId":"SVC3001","text":"Resource
- not found for %1 using id %2 (msg=%3) (ec=%4)","variables":["GET","cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/100","Node
- Not Found:No Node of type flavor found at: cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/100","ERR.5.4.6114"]}}}'
- content_type: application/json
- status_code: 200
- PUT:
- body: ''
- content_type: application/json
- status_code: 200
-aai/v13/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/110:
- GET:
- body: '{"requestError":{"serviceException":{"messageId":"SVC3001","text":"Resource
- not found for %1 using id %2 (msg=%3) (ec=%4)","variables":["GET","cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/110","Node
- Not Found:No Node of type flavor found at: cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/110","ERR.5.4.6114"]}}}'
- content_type: application/json
- status_code: 200
- PUT:
- body: ''
- content_type: application/json
- status_code: 200
-aai/v13/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/111:
- GET:
- body: '{"requestError":{"serviceException":{"messageId":"SVC3001","text":"Resource
- not found for %1 using id %2 (msg=%3) (ec=%4)","variables":["GET","cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/111","Node
- Not Found:No Node of type flavor found at: cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/111","ERR.5.4.6114"]}}}'
- content_type: application/json
- status_code: 200
- PUT:
- body: ''
- content_type: application/json
- status_code: 200
-aai/v13/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/112:
- GET:
- body: '{"requestError":{"serviceException":{"messageId":"SVC3001","text":"Resource
- not found for %1 using id %2 (msg=%3) (ec=%4)","variables":["GET","cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/112","Node
- Not Found:No Node of type flavor found at: cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/112","ERR.5.4.6114"]}}}'
- content_type: application/json
- status_code: 200
- PUT:
- body: ''
- content_type: application/json
- status_code: 200
-aai/v13/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/113:
- GET:
- body: '{"requestError":{"serviceException":{"messageId":"SVC3001","text":"Resource
- not found for %1 using id %2 (msg=%3) (ec=%4)","variables":["GET","cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/113","Node
- Not Found:No Node of type flavor found at: cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/113","ERR.5.4.6114"]}}}'
- content_type: application/json
- status_code: 200
- PUT:
- body: ''
- content_type: application/json
- status_code: 200
-aai/v13/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/114:
- GET:
- body: '{"requestError":{"serviceException":{"messageId":"SVC3001","text":"Resource
- not found for %1 using id %2 (msg=%3) (ec=%4)","variables":["GET","cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/114","Node
- Not Found:No Node of type flavor found at: cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/114","ERR.5.4.6114"]}}}'
- content_type: application/json
- status_code: 200
- PUT:
- body: ''
- content_type: application/json
- status_code: 200
-aai/v13/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/115:
- GET:
- body: '{"requestError":{"serviceException":{"messageId":"SVC3001","text":"Resource
- not found for %1 using id %2 (msg=%3) (ec=%4)","variables":["GET","cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/115","Node
- Not Found:No Node of type flavor found at: cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/115","ERR.5.4.6114"]}}}'
- content_type: application/json
- status_code: 200
- PUT:
- body: ''
- content_type: application/json
- status_code: 200
-aai/v13/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/116:
- GET:
- body: '{"requestError":{"serviceException":{"messageId":"SVC3001","text":"Resource
- not found for %1 using id %2 (msg=%3) (ec=%4)","variables":["GET","cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/116","Node
- Not Found:No Node of type flavor found at: cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/116","ERR.5.4.6114"]}}}'
- content_type: application/json
- status_code: 200
- PUT:
- body: ''
- content_type: application/json
- status_code: 200
-aai/v13/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/117:
- GET:
- body: '{"requestError":{"serviceException":{"messageId":"SVC3001","text":"Resource
- not found for %1 using id %2 (msg=%3) (ec=%4)","variables":["GET","cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/117","Node
- Not Found:No Node of type flavor found at: cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/117","ERR.5.4.6114"]}}}'
- content_type: application/json
- status_code: 200
- PUT:
- body: ''
- content_type: application/json
- status_code: 200
-aai/v13/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/images/image/660709df-e90b-471f-ac57-d8c2555e573d:
- GET:
- body: '{"requestError":{"serviceException":{"messageId":"SVC3001","text":"Resource
- not found for %1 using id %2 (msg=%3) (ec=%4)","variables":["GET","cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/images/image/660709df-e90b-471f-ac57-d8c2555e573d","Node
- Not Found:No Node of type image found at: cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/images/image/660709df-e90b-471f-ac57-d8c2555e573d","ERR.5.4.6114"]}}}'
- content_type: application/json
- status_code: 200
- PUT:
- body: ''
- content_type: application/json
- status_code: 200
-aai/v13/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/3543226ffed44daf90a2f71f36c00b8d:
- GET:
- body: '{"requestError":{"serviceException":{"messageId":"SVC3001","text":"Resource
- not found for %1 using id %2 (msg=%3) (ec=%4)","variables":["GET","cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/3543226ffed44daf90a2f71f36c00b8d","Node
- Not Found:No Node of type tenant found at: cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/3543226ffed44daf90a2f71f36c00b8d","ERR.5.4.6114"]}}}'
- content_type: application/json
- status_code: 200
- PUT:
- body: ''
- content_type: application/json
- status_code: 200
-aai/v13/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/b8f5d85bbcd84af28d7caa62d39f05c7:
- GET:
- body: '{"requestError":{"serviceException":{"messageId":"SVC3001","text":"Resource
- not found for %1 using id %2 (msg=%3) (ec=%4)","variables":["GET","cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/b8f5d85bbcd84af28d7caa62d39f05c7","Node
- Not Found:No Node of type tenant found at: cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/b8f5d85bbcd84af28d7caa62d39f05c7","ERR.5.4.6114"]}}}'
- content_type: application/json
- status_code: 200
- PUT:
- body: ''
- content_type: application/json
- status_code: 200
-aai/v13/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne:
- GET:
- body: '{"cloud-owner":"CloudOwner","cloud-region-id":"RegionOne","cloud-type":"openstack","owner-defined-type":"t1","cloud-region-version":"RegionOne","identity-url":"http://multicloud-ocata:80/api/multicloud-titanium_cloud/v0/CloudOwner_RegionOne/identity/v2.0","cloud-zone":"z1","complex-name":"clli1","sriov-automation":false,"cloud-extra-info":"","resource-version":"1524845276291"}'
- content_type: application/json
- status_code: 200
-aai/v13/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/esr-system-info-list:
- GET:
- body: '{"esr-system-info":[{"esr-system-info-id":"4ce895ad-82f7-4476-b5eb-d19d19585da2","service-url":"http://keystone:8080/v3","user-name":"admin","password":"secret","system-type":"VIM","ssl-insecure":true,"cloud-domain":"Default","default-tenant":"admin","resource-version":"1524845155617"}]}'
- content_type: application/json
- status_code: 200
-aai/v13/cloud-infrastructure/pservers/pserver/compute-0:
- GET:
- body: '{"requestError":{"serviceException":{"messageId":"SVC3001","text":"Resource
- not found for %1 using id %2 (msg=%3) (ec=%4)","variables":["GET","cloud-infrastructure/pservers/pserver/compute-0","Node
- Not Found:No Node of type pserver found at: cloud-infrastructure/pservers/pserver/compute-0","ERR.5.4.6114"]}}}'
- content_type: application/json
- status_code: 200
- PUT:
- body: ''
- content_type: application/json
- status_code: 200
-aai/v13/cloud-infrastructure/pservers/pserver/compute-0/relationship-list/relationship:
- PUT:
- body: ''
- content_type: application/json
- status_code: 200