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
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:
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:
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
vnfm-adapter:
base:
- endpoint: http://so-vnfm-adapter.onap:9092
+ endpoint: http://so-etsi-sol003-adapter.onap:9092
vnfds:
vnfdlist:
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}
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
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:
- ${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:
sdc-simulator
depends_on:
- mariadb
- - so-vnfm-adapter
+ - so-etsi-sol003-adapter
logging:
driver: "json-file"
options:
aai-simulator
depends_on:
- mariadb
- - so-vnfm-adapter
+ - so-etsi-sol003-adapter
logging:
driver: "json-file"
options:
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:
- CATALOG_DB=catalogdb
depends_on:
- mariadb
- - so-vnfm-adapter
+ - so-etsi-sol003-adapter
command:
- "/config/apply-workarounds.sh"
#################################################################################
sdnc-simulator
depends_on:
- mariadb
- - so-vnfm-adapter
+ - so-etsi-sol003-adapter
logging:
driver: "json-file"
options:
multicloud-simulator
depends_on:
- mariadb
- - so-vnfm-adapter
+ - so-etsi-sol003-adapter
logging:
driver: "json-file"
options:
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
- 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"'
@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
name: vnfm
password: password1$
base:
- endpoint: http://so-vnfm-adapter.onap:9092
+ endpoint: http://so-etsi-sol003-adapter.onap:9092
vnfds:
vnfdlist:
- vnfdid: 1
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;
name: vnfm
password: password1$
base:
- endpoint: http://so-vnfm-adapter.onap:9092
+ endpoint: http://so-etsi-sol003-adapter.onap:9092
vnfds:
vnfdlist:
- vnfdid: 1
"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"
}
}
}