summaryrefslogtreecommitdiffstats
path: root/adapters/mso-openstack-adapters
diff options
context:
space:
mode:
authorKalkere Ramesh, Sharan (sk720x) <sk720x@att.com>2018-12-05 15:17:08 -0500
committerKalkere Ramesh, Sharan (sk720x) <sk720x@att.com>2018-12-05 15:18:01 -0500
commite412668895e0baece7faa6b25479954f14d64887 (patch)
tree80155bbe068a915a2b965dbdb00e30cb8ac09fb3 /adapters/mso-openstack-adapters
parent35726250e078b57ebe6ea4e53b4b8ccd56573e50 (diff)
moved all ecomp.mso properties to org.onap.so
moved all ecomp.mso properties to org.onap.so Change-Id: I55bd57d1c1d1dca065575c03d3c0b8f83aa4594d Issue-ID: SO-1278 Signed-off-by: Kalkere Ramesh, Sharan (sk720x) <sk720x@att.com>
Diffstat (limited to 'adapters/mso-openstack-adapters')
-rw-r--r--adapters/mso-openstack-adapters/src/main/resources/application-local.yaml15
-rw-r--r--adapters/mso-openstack-adapters/src/test/resources/application-nomigrate.yaml37
-rw-r--r--adapters/mso-openstack-adapters/src/test/resources/application-test.yaml37
3 files changed, 38 insertions, 51 deletions
diff --git a/adapters/mso-openstack-adapters/src/main/resources/application-local.yaml b/adapters/mso-openstack-adapters/src/main/resources/application-local.yaml
index e07492e56c..67c4dd3c22 100644
--- a/adapters/mso-openstack-adapters/src/main/resources/application-local.yaml
+++ b/adapters/mso-openstack-adapters/src/main/resources/application-local.yaml
@@ -37,15 +37,12 @@ org:
default_orm_url_replace_with_this: 7080
default_quota_value: 10
set_default_quota: false
-ecomp:
- mso:
- adapters:
- po:
- retryCodes: 504
- retryDelay: 5
- retryCount: 3
- pollTimeout: 7500
- pollInterval: 15
+ po:
+ retryCodes: 504
+ retryDelay: 5
+ retryCount: 3
+ pollTimeout: 7500
+ pollInterval: 15
server-port: 8080
ssl-enable: false
diff --git a/adapters/mso-openstack-adapters/src/test/resources/application-nomigrate.yaml b/adapters/mso-openstack-adapters/src/test/resources/application-nomigrate.yaml
index 95b48cd8aa..d1a5bd9fa3 100644
--- a/adapters/mso-openstack-adapters/src/test/resources/application-nomigrate.yaml
+++ b/adapters/mso-openstack-adapters/src/test/resources/application-nomigrate.yaml
@@ -15,6 +15,12 @@ org:
retrycount: 5
retryinterval: -15
retrylist: 408,429,500,502,503,504,900
+ heat:
+ create:
+ pollInterval: 15
+ delete:
+ pollTimeout: 7500
+ pollInterval: 15
network:
bpelauth: 4771D91C24BB25366730561D630B131818CD9FF8D686AA8807F4CB30E1324C46ED16197C07
sockettimeout: 5
@@ -22,6 +28,12 @@ org:
retrycount: 5
retryinterval: -15
retrylist: 408,429,500,502,503,504,900
+ heat:
+ create:
+ pollInterval: 15
+ delete:
+ pollTimeout: 300
+ pollInterval: 15
tenant:
default_x_aic_orm_client_string: ONAP-SO
default_keystone_url_version: /v2.0
@@ -40,27 +52,10 @@ org:
base_url: http://localhost:${wiremock.server.port}
base_path: /api/valet/placement/v1/
valet_auth:
-ecomp:
- mso:
- adapters:
- po:
- retryCodes: 504
- retryDelay: 5
- retryCount: 3
- vnf:
- heat:
- create:
- pollInterval: 15
- delete:
- pollTimeout: 7500
- pollInterval: 15
- network:
- heat:
- create:
- pollInterval: 15
- delete:
- pollTimeout: 300
- pollInterval: 15
+ po:
+ retryCodes: 504
+ retryDelay: 5
+ retryCount: 3
server-port: 8080
ssl-enable: false
diff --git a/adapters/mso-openstack-adapters/src/test/resources/application-test.yaml b/adapters/mso-openstack-adapters/src/test/resources/application-test.yaml
index 58bde2ef14..175b08f747 100644
--- a/adapters/mso-openstack-adapters/src/test/resources/application-test.yaml
+++ b/adapters/mso-openstack-adapters/src/test/resources/application-test.yaml
@@ -15,6 +15,12 @@ org:
retrycount: 5
retryinterval: -15
retrylist: 408,429,500,502,503,504,900
+ heat:
+ create:
+ pollInterval: 15
+ delete:
+ pollTimeout: 7500
+ pollInterval: 15
network:
bpelauth: 4771D91C24BB25366730561D630B131818CD9FF8D686AA8807F4CB30E1324C46ED16197C07
sockettimeout: 5
@@ -23,6 +29,12 @@ org:
retryinterval: -15
retrylist: 408,429,500,502,503,504,900
encryptionKey: aa3871669d893c7fb8abbcda31b88b4f
+ heat:
+ create:
+ pollInterval: 15
+ delete:
+ pollTimeout: 300
+ pollInterval: 15
tenant:
default_x_aic_orm_client_string: ONAP-SO
default_keystone_url_version: /v2.0
@@ -41,27 +53,10 @@ org:
base_url: http://localhost:${wiremock.server.port}
base_path: /api/valet/placement/v1/
valet_auth:
-ecomp:
- mso:
- adapters:
- po:
- retryCodes: 504
- retryDelay: 5
- retryCount: 3
- vnf:
- heat:
- create:
- pollInterval: 15
- delete:
- pollTimeout: 7500
- pollInterval: 15
- network:
- heat:
- create:
- pollInterval: 15
- delete:
- pollTimeout: 300
- pollInterval: 15
+ po:
+ retryCodes: 504
+ retryDelay: 5
+ retryCount: 3
server-port: 8080
ssl-enable: false