aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plans/so/integration-etsi-testing/config/env5
-rw-r--r--plans/so/integration-etsi-testing/config/override-files/bpmn-infra/onapheat/override.yaml2
-rw-r--r--plans/so/integration-etsi-testing/config/override-files/so-etsi-nfvo-ns-lcm/onapheat/override.yaml2
-rw-r--r--plans/so/integration-etsi-testing/config/override-files/so-vnfm-adapter/onapheat/override.yaml2
-rw-r--r--plans/so/integration-etsi-testing/config/override-files/vnfm-simulator/onapheat/override.yaml2
-rw-r--r--plans/so/integration-etsi-testing/docker-compose.local.yml8
-rw-r--r--plans/so/integration-etsi-testing/docker-compose.yml36
-rw-r--r--plans/so/integration-etsi-testing/so-simulators/vnfm-simulator/vnfm-service/src/main/java/org/onap/so/svnfm/simulator/services/SubscriptionManager.java2
-rw-r--r--plans/so/integration-etsi-testing/so-simulators/vnfm-simulator/vnfm-service/src/main/resources/application.yaml2
-rw-r--r--plans/so/integration-etsi-testing/so-simulators/vnfm-simulator/vnfm-service/src/test/java/org/onap/so/svnfm/simulator/controllers/TestSubscriptionNotificationController.java2
-rw-r--r--plans/so/integration-etsi-testing/so-simulators/vnfm-simulator/vnfm-service/src/test/resources/application.yaml2
-rw-r--r--tests/so/etsi/data/responses/expectedVnfPackage.json6
12 files changed, 36 insertions, 35 deletions
diff --git a/plans/so/integration-etsi-testing/config/env b/plans/so/integration-etsi-testing/config/env
index e5290a9e..1b6a88f8 100644
--- a/plans/so/integration-etsi-testing/config/env
+++ b/plans/so/integration-etsi-testing/config/env
@@ -5,6 +5,7 @@ TIME_OUT_DEFAULT_VALUE_SEC=1200
PROJECT_NAME=etsiintegrationtesting
DEFAULT_NETWORK_NAME=etsiintegrationtesting_default
ETSI_CATALOG_IMAGE_VERSION=1.0.9
-SOL_003_ADAPTER_IMAGE_VERSION=1.8.0-STAGING-latest
-ETSI_NFVO_NS_LCM_IMAGE_VERSION=1.8.0-STAGING-latest
+SOL_003_ADAPTER_IMAGE_VERSION=1.8.1
+ETSI_NFVO_NS_LCM_IMAGE_VERSION=1.8.1
+SO_ADMIN_COCKPIT_IMAGE_VERSION=1.8.1
MARIADB_VERSION=10.5.8
diff --git a/plans/so/integration-etsi-testing/config/override-files/bpmn-infra/onapheat/override.yaml b/plans/so/integration-etsi-testing/config/override-files/bpmn-infra/onapheat/override.yaml
index 87e30663..df831c0b 100644
--- a/plans/so/integration-etsi-testing/config/override-files/bpmn-infra/onapheat/override.yaml
+++ b/plans/so/integration-etsi-testing/config/override-files/bpmn-infra/onapheat/override.yaml
@@ -358,7 +358,7 @@ spring:
so:
vnfm:
adapter:
- url: http://so-vnfm-adapter.onap:9092/so/vnfm-adapter/v1/
+ url: http://so-etsi-sol003-adapter.onap:9092/so/vnfm-adapter/v1/
auth: Basic dm5mbTpwYXNzd29yZDEk
org:
onap:
diff --git a/plans/so/integration-etsi-testing/config/override-files/so-etsi-nfvo-ns-lcm/onapheat/override.yaml b/plans/so/integration-etsi-testing/config/override-files/so-etsi-nfvo-ns-lcm/onapheat/override.yaml
index bb35d1f9..8b1a72c6 100644
--- a/plans/so/integration-etsi-testing/config/override-files/so-etsi-nfvo-ns-lcm/onapheat/override.yaml
+++ b/plans/so/integration-etsi-testing/config/override-files/so-etsi-nfvo-ns-lcm/onapheat/override.yaml
@@ -33,7 +33,7 @@ mso:
so:
adapters:
sol003-adapter:
- url: http://so-vnfm-adapter:9092/so/vnfm-adapter/v1
+ url: http://so-etsi-sol003-adapter:9092/so/vnfm-adapter/v1
auth: Basic dm5mbTpwYXNzd29yZDEk
etsi-catalog-manager:
base:
diff --git a/plans/so/integration-etsi-testing/config/override-files/so-vnfm-adapter/onapheat/override.yaml b/plans/so/integration-etsi-testing/config/override-files/so-vnfm-adapter/onapheat/override.yaml
index 38c2f6d3..ee939021 100644
--- a/plans/so/integration-etsi-testing/config/override-files/so-vnfm-adapter/onapheat/override.yaml
+++ b/plans/so/integration-etsi-testing/config/override-files/so-vnfm-adapter/onapheat/override.yaml
@@ -28,7 +28,7 @@ sdc:
endpoint: http://sdc-simulator:9991/
toscametapath: Artifacts/Deployment/OTHER/TOSCA.meta
vnfmadapter:
- endpoint: http://so-vnfm-adapter.onap:9092
+ endpoint: http://so-etsi-sol003-adapter.onap:9092
etsi-catalog-manager:
vnfpkgm:
endpoint: http://modeling-etsicatalog:8806/api/vnfpkgm/v1
diff --git a/plans/so/integration-etsi-testing/config/override-files/vnfm-simulator/onapheat/override.yaml b/plans/so/integration-etsi-testing/config/override-files/vnfm-simulator/onapheat/override.yaml
index b0f54e36..3adfe78d 100644
--- a/plans/so/integration-etsi-testing/config/override-files/vnfm-simulator/onapheat/override.yaml
+++ b/plans/so/integration-etsi-testing/config/override-files/vnfm-simulator/onapheat/override.yaml
@@ -30,7 +30,7 @@ server:
vnfm-adapter:
base:
- endpoint: http://so-vnfm-adapter.onap:9092
+ endpoint: http://so-etsi-sol003-adapter.onap:9092
vnfds:
vnfdlist:
diff --git a/plans/so/integration-etsi-testing/docker-compose.local.yml b/plans/so/integration-etsi-testing/docker-compose.local.yml
index f92aa150..1f07a032 100644
--- a/plans/so/integration-etsi-testing/docker-compose.local.yml
+++ b/plans/so/integration-etsi-testing/docker-compose.local.yml
@@ -22,11 +22,11 @@ services:
api-handler-infra:
image: onap/so/api-handler-infra:${TAG}
#############################################################################
- so-monitoring:
- image: onap/so/so-monitoring:${TAG}
+ so-admin-cockpit:
+ image: onap/so/so-admin-cockpit:${SO_ADMIN_COCKPIT_IMAGE_VERSION}
################################################################################
- so-vnfm-adapter:
- image: onap/so/vnfm-adapter:${SOL_003_ADAPTER_IMAGE_VERSION}
+ so-etsi-sol003-adapter:
+ image: onap/so/so-etsi-sol003-adapter:${SOL_003_ADAPTER_IMAGE_VERSION}
################################################################################
modeling-etsicatalog:
image: ${NEXUS_DOCKER_REPO_MSO}/onap/modeling/etsicatalog:${ETSI_CATALOG_IMAGE_VERSION}
diff --git a/plans/so/integration-etsi-testing/docker-compose.yml b/plans/so/integration-etsi-testing/docker-compose.yml
index 5f3d34cf..0c4d03f0 100644
--- a/plans/so/integration-etsi-testing/docker-compose.yml
+++ b/plans/so/integration-etsi-testing/docker-compose.yml
@@ -190,7 +190,7 @@ services:
hostname:
bpmn-infra.so.testlab.onap.org
links:
- - "so-vnfm-adapter:so-vnfm-adapter.onap"
+ - "so-etsi-sol003-adapter:so-etsi-sol003-adapter.onap"
depends_on:
- mariadb
- catalog-db-adapter
@@ -233,24 +233,24 @@ services:
user: root
entrypoint: /bin/sh -c '/app/wait-for.sh -q -t "300" request-db-adapter:8083 -- "/app/start-app.sh"'
#############################################################################
- so-monitoring:
- image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/so-monitoring:${TAG}
+ so-admin-cockpit:
+ image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/so-admin-cockpit:${SO_ADMIN_COCKPIT_IMAGE_VERSION}
ports:
- "30224:30224"
volumes:
- ${CONFIG_DIR_PATH}/override-files/so-monitoring/onapheat:/app/config
environment:
- - APP=so-monitoring
+ - APP=so-admin-cockpit
- JVM_ARGS=-Xms64m -Xmx512m
hostname:
- so-monitoring.so.testlab.onap.org
+ so-admin-cockpit.so.testlab.onap.org
depends_on:
- mariadb
- catalog-db-adapter
- request-db-adapter
################################################################################
- so-vnfm-adapter:
- image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/vnfm-adapter:${SOL_003_ADAPTER_IMAGE_VERSION}
+ so-etsi-sol003-adapter:
+ image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/so-etsi-sol003-adapter:${SOL_003_ADAPTER_IMAGE_VERSION}
ports:
- "9092:9092"
volumes:
@@ -258,10 +258,10 @@ services:
- ${CONFIG_DIR_PATH}/certificates/so-vnfm-adapter-certs:/app/so-vnfm-adapter-certs
- ${CONFIG_DIR_PATH}/certificates/truststore/root-ca.crt:/app/ca-certificates/root-ca.crt
environment:
- - APP=so-vnfm-adapter
+ - APP=so-etsi-sol003-adapter
- JVM_ARGS=-Xms64m -Xmx512m
hostname:
- so-vnfm-adapter
+ so-etsi-sol003-adapter
depends_on:
- request-db-adapter
logging:
@@ -283,7 +283,7 @@ services:
sdc-simulator
depends_on:
- mariadb
- - so-vnfm-adapter
+ - so-etsi-sol003-adapter
logging:
driver: "json-file"
options:
@@ -301,7 +301,7 @@ services:
aai-simulator
depends_on:
- mariadb
- - so-vnfm-adapter
+ - so-etsi-sol003-adapter
logging:
driver: "json-file"
options:
@@ -321,10 +321,10 @@ services:
hostname:
so-vnfm-simulator
links:
- - "so-vnfm-adapter:so-vnfm-adapter.onap"
+ - "so-etsi-sol003-adapter:so-etsi-sol003-adapter.onap"
depends_on:
- mariadb
- - so-vnfm-adapter
+ - so-etsi-sol003-adapter
logging:
driver: "json-file"
options:
@@ -344,7 +344,7 @@ services:
- CATALOG_DB=catalogdb
depends_on:
- mariadb
- - so-vnfm-adapter
+ - so-etsi-sol003-adapter
command:
- "/config/apply-workarounds.sh"
#################################################################################
@@ -359,7 +359,7 @@ services:
sdnc-simulator
depends_on:
- mariadb
- - so-vnfm-adapter
+ - so-etsi-sol003-adapter
logging:
driver: "json-file"
options:
@@ -377,7 +377,7 @@ services:
multicloud-simulator
depends_on:
- mariadb
- - so-vnfm-adapter
+ - so-etsi-sol003-adapter
logging:
driver: "json-file"
options:
@@ -414,7 +414,7 @@ services:
hostname:
modeling-etsicatalog
links:
- - "so-vnfm-adapter:so-vnfm-adapter.onap"
+ - "so-etsi-sol003-adapter:so-etsi-sol003-adapter.onap"
depends_on:
- mariadb
- sdc-simulator
@@ -449,6 +449,6 @@ services:
- aai-simulator
- sdc-simulator
- modeling-etsicatalog
- - so-vnfm-adapter
+ - so-etsi-sol003-adapter
user: root
entrypoint: /bin/sh -c '/app/wait-for.sh -q -t "300" mariadb:3306 -- "/app/start-app.sh"'
diff --git a/plans/so/integration-etsi-testing/so-simulators/vnfm-simulator/vnfm-service/src/main/java/org/onap/so/svnfm/simulator/services/SubscriptionManager.java b/plans/so/integration-etsi-testing/so-simulators/vnfm-simulator/vnfm-service/src/main/java/org/onap/so/svnfm/simulator/services/SubscriptionManager.java
index d886da9b..ddda7b64 100644
--- a/plans/so/integration-etsi-testing/so-simulators/vnfm-simulator/vnfm-service/src/main/java/org/onap/so/svnfm/simulator/services/SubscriptionManager.java
+++ b/plans/so/integration-etsi-testing/so-simulators/vnfm-simulator/vnfm-service/src/main/java/org/onap/so/svnfm/simulator/services/SubscriptionManager.java
@@ -37,7 +37,7 @@ public class SubscriptionManager {
@Value("${vnfm-adapter.auth.password}")
private String password;
- @Value("${vnfm-adapter.base.endpoint:http://so-vnfm-adapter.onap:9092}")
+ @Value("${vnfm-adapter.base.endpoint:http://so-etsi-sol003-adapter.onap:9092}")
private String baseEndpoint;
@Autowired
diff --git a/plans/so/integration-etsi-testing/so-simulators/vnfm-simulator/vnfm-service/src/main/resources/application.yaml b/plans/so/integration-etsi-testing/so-simulators/vnfm-simulator/vnfm-service/src/main/resources/application.yaml
index 6079a799..5d655b82 100644
--- a/plans/so/integration-etsi-testing/so-simulators/vnfm-simulator/vnfm-service/src/main/resources/application.yaml
+++ b/plans/so/integration-etsi-testing/so-simulators/vnfm-simulator/vnfm-service/src/main/resources/application.yaml
@@ -48,7 +48,7 @@ vnfm-adapter:
name: vnfm
password: password1$
base:
- endpoint: http://so-vnfm-adapter.onap:9092
+ endpoint: http://so-etsi-sol003-adapter.onap:9092
vnfds:
vnfdlist:
- vnfdid: 1
diff --git a/plans/so/integration-etsi-testing/so-simulators/vnfm-simulator/vnfm-service/src/test/java/org/onap/so/svnfm/simulator/controllers/TestSubscriptionNotificationController.java b/plans/so/integration-etsi-testing/so-simulators/vnfm-simulator/vnfm-service/src/test/java/org/onap/so/svnfm/simulator/controllers/TestSubscriptionNotificationController.java
index ba8ec00b..c35bbaf7 100644
--- a/plans/so/integration-etsi-testing/so-simulators/vnfm-simulator/vnfm-service/src/test/java/org/onap/so/svnfm/simulator/controllers/TestSubscriptionNotificationController.java
+++ b/plans/so/integration-etsi-testing/so-simulators/vnfm-simulator/vnfm-service/src/test/java/org/onap/so/svnfm/simulator/controllers/TestSubscriptionNotificationController.java
@@ -80,7 +80,7 @@ import static org.springframework.test.web.client.response.MockRestResponseCreat
public class TestSubscriptionNotificationController {
private static final Logger LOGGER = getLogger(TestSubscriptionNotificationController.class);
- private static final String SOL003_SUBSCRIPTION_URL = "http://so-vnfm-adapter.onap:9092" + VNFM_ADAPTER_SUBSCRIPTION_ENDPOINT;
+ private static final String SOL003_SUBSCRIPTION_URL = "http://so-etsi-sol003-adapter.onap:9092" + VNFM_ADAPTER_SUBSCRIPTION_ENDPOINT;
@LocalServerPort
private int port;
diff --git a/plans/so/integration-etsi-testing/so-simulators/vnfm-simulator/vnfm-service/src/test/resources/application.yaml b/plans/so/integration-etsi-testing/so-simulators/vnfm-simulator/vnfm-service/src/test/resources/application.yaml
index 2f84beb9..5e5aba8b 100644
--- a/plans/so/integration-etsi-testing/so-simulators/vnfm-simulator/vnfm-service/src/test/resources/application.yaml
+++ b/plans/so/integration-etsi-testing/so-simulators/vnfm-simulator/vnfm-service/src/test/resources/application.yaml
@@ -41,7 +41,7 @@ vnfm-adapter:
name: vnfm
password: password1$
base:
- endpoint: http://so-vnfm-adapter.onap:9092
+ endpoint: http://so-etsi-sol003-adapter.onap:9092
vnfds:
vnfdlist:
- vnfdid: 1
diff --git a/tests/so/etsi/data/responses/expectedVnfPackage.json b/tests/so/etsi/data/responses/expectedVnfPackage.json
index 41eeb8b1..c97865ee 100644
--- a/tests/so/etsi/data/responses/expectedVnfPackage.json
+++ b/tests/so/etsi/data/responses/expectedVnfPackage.json
@@ -10,13 +10,13 @@
"operationalState": "ENABLED",
"_links": {
"self": {
- "href": "http://so-vnfm-adapter.onap:9092/so/vnfm-adapter/v1/vnfpkgm/v1/vnf_packages/73522444-e8e9-49c1-be29-d355800aa349"
+ "href": "http://so-etsi-sol003-adapter.onap:9092/so/vnfm-adapter/v1/vnfpkgm/v1/vnf_packages/73522444-e8e9-49c1-be29-d355800aa349"
},
"vnfd": {
- "href": "http://so-vnfm-adapter.onap:9092/so/vnfm-adapter/v1/vnfpkgm/v1/vnf_packages/73522444-e8e9-49c1-be29-d355800aa349/vnfd"
+ "href": "http://so-etsi-sol003-adapter.onap:9092/so/vnfm-adapter/v1/vnfpkgm/v1/vnf_packages/73522444-e8e9-49c1-be29-d355800aa349/vnfd"
},
"packageContent": {
- "href": "http://so-vnfm-adapter.onap:9092/so/vnfm-adapter/v1/vnfpkgm/v1/vnf_packages/73522444-e8e9-49c1-be29-d355800aa349/package_content"
+ "href": "http://so-etsi-sol003-adapter.onap:9092/so/vnfm-adapter/v1/vnfpkgm/v1/vnf_packages/73522444-e8e9-49c1-be29-d355800aa349/package_content"
}
}
}