From 3ce698ee20cca69104874d42e64300abe641a27c Mon Sep 17 00:00:00 2001 From: Bertrand Souville Date: Mon, 27 Nov 2017 17:15:54 +0100 Subject: Proposal to move Promise shim-layer code to a new deprecated folder Promise test cases have been disabled in Functest Promise shim-layer has been marked as DEPRECATED in Euphrates Change-Id: I98ecd9ae2b25c102f478fc3869f23e6c70d32d8d Signed-off-by: Bertrand Souville --- .../config/custom-environment-variables.yaml | 25 +++++ deprecated/source/config/default.yaml | 11 ++ deprecated/source/config/demo.json | 118 +++++++++++++++++++++ deprecated/source/config/functest.yaml | 9 ++ deprecated/source/config/test-intercloud.yaml | 21 ++++ 5 files changed, 184 insertions(+) create mode 100644 deprecated/source/config/custom-environment-variables.yaml create mode 100644 deprecated/source/config/default.yaml create mode 100644 deprecated/source/config/demo.json create mode 100644 deprecated/source/config/functest.yaml create mode 100644 deprecated/source/config/test-intercloud.yaml (limited to 'deprecated/source/config') diff --git a/deprecated/source/config/custom-environment-variables.yaml b/deprecated/source/config/custom-environment-variables.yaml new file mode 100644 index 0000000..001e799 --- /dev/null +++ b/deprecated/source/config/custom-environment-variables.yaml @@ -0,0 +1,25 @@ +# OPNFV FuncTest config (refer to schema/opnfv-functest.yang) +opnfv-functest: + environment: + installer: + type: INSTALLER_TYPE + address: INSTALLER_IP + lab: NODE_NAME + +# OpenStack config (native) +openstack: + auth: + endpoint: OS_AUTH_URL + strategy: OS_AUTH_STRATEGY + project: + id: OS_PROJECT_ID + name: OS_PROJECT_NAME + domain-name: OS_PROJECT_DOMAIN_NAME + username: OS_USERNAME + password: OS_PASSWORD + user-domain-name: OS_USER_DOMAIN_NAME + test: + image: OS_TEST_IMAGE + flavor: OS_TEST_FLAVOR + network: OS_TEST_NETWORK + diff --git a/deprecated/source/config/default.yaml b/deprecated/source/config/default.yaml new file mode 100644 index 0000000..52bb61a --- /dev/null +++ b/deprecated/source/config/default.yaml @@ -0,0 +1,11 @@ +# default configuration for 'npm test' + +opnfv-promise: + promise: + policy: + reservation: + max-future-start-range: + max-future-end-range: + max-duration: + expiry: 600 + diff --git a/deprecated/source/config/demo.json b/deprecated/source/config/demo.json new file mode 100644 index 0000000..dffb3af --- /dev/null +++ b/deprecated/source/config/demo.json @@ -0,0 +1,118 @@ +{ + "opnfv-promise": { + "promise": { + "providers": [ + { + "name": "example-demo-provider", + "token": "dummy-token" + } + ], + "pools": [ + { + "ResourcePool": { + "id": "4085f0da-8030-4252-a0ff-c6f93870eb5f", + "name": "OPNFV OpenStack - West", + "source": "example-demo-provider", + "capacity": { + "cores": 100, + "ram": 262144, + "instances": 500, + "networks": 100, + "ports": 100, + "routers": 30, + "subnets": 1000, + "addresses": 500, + "gigabytes": 10000, + "snapshots": 100, + "volumes": 100 + } + } + } + ], + "reservations": [ + { + "capacity": { + "cores": 10, + "ram": 4096, + "instances": 10, + "networks": 4, + "ports": 10, + "routers": 1, + "subnets": 1, + "addresses": 10, + "gigabytes": 0, + "snapshots": 0, + "volumes": 0 + }, + "start": "2015-11-07T10:17:12.747Z", + "end": "2016-02-13T10:17:18.226Z", + "pools": [ + "4085f0da-8030-4252-a0ff-c6f93870eb5f" + ] + }, + { + "capacity": { + "cores": 20, + "ram": 10000, + "instances": 5, + "networks": 2, + "ports": 10, + "routers": 1, + "subnets": 1, + "addresses": 5, + "gigabytes": 0, + "snapshots": 0, + "volumes": 0 + }, + "start": "2015-11-09T10:17:12.747Z", + "end": "2016-02-11T10:17:18.226Z", + "pools": [ + "4085f0da-8030-4252-a0ff-c6f93870eb5f" + ] + }, + { + "id": "c7287f30-2c65-4a88-a047-48724b8ff747", + "capacity": { + "cores": 10, + "ram": 4096, + "instances": 10, + "networks": 5, + "ports": 10, + "routers": 1, + "subnets": 5, + "addresses": 20, + "gigabytes": 0, + "snapshots": 0, + "volumes": 0 + }, + "start": "2015-11-10T10:17:12.747Z", + "end": "2015-12-13T10:17:18.226Z", + "pools": [ + "4085f0da-8030-4252-a0ff-c6f93870eb5f" + ] + }, + { + "id": "0f2e31f7-9760-416d-8d53-1ee68aa4b11f", + "capacity": { + "cores": 10, + "ram": 4096, + "instances": 5, + "networks": 2, + "ports": 10, + "routers": 1, + "subnets": 1, + "addresses": 5, + "gigabytes": 0, + "snapshots": 0, + "volumes": 0 + }, + "start": "2015-11-09T10:17:12.747Z", + "end": "2015-12-03T10:17:18.226Z", + "pools": [ + "4085f0da-8030-4252-a0ff-c6f93870eb5f" + ] + } + ] + } + } +} diff --git a/deprecated/source/config/functest.yaml b/deprecated/source/config/functest.yaml new file mode 100644 index 0000000..6655fc4 --- /dev/null +++ b/deprecated/source/config/functest.yaml @@ -0,0 +1,9 @@ +# NODE_ENV=functest + +opnfv-functest: + environment: + images: + - + name: cirros + path: /home/opnfv/functest/images/cirros-0.3.5-x86_64-disk.img + diff --git a/deprecated/source/config/test-intercloud.yaml b/deprecated/source/config/test-intercloud.yaml new file mode 100644 index 0000000..f5e04ed --- /dev/null +++ b/deprecated/source/config/test-intercloud.yaml @@ -0,0 +1,21 @@ +# the following config is used when ENV is as follows: +# NODE_ENV=test +# NODE_APP_INSTANCE=intercloud +openstack: + auth: + strategy: keystone + endpoint: http://vhub4.intercloud.net:5000/v2.0 + tenant: + id: 62a2d90992114994977fd6707bac5758 + username: peter + password: # set OS_PASSWORD=xxxx environmental variable + test: + image: ee0fb445-0fc2-4fda-a2dc-175bf3cc3cb1 + flavor: 2312fd98-369e-4361-b967-606373891c11 + +opnfv-promise: + promise: + policy: + reservation: + max-future-start-range: 7 + max-duration: 24 -- cgit 1.2.3-korg