Clean-up existing docker-compose solutions

[oam.git] / solution / network / docker-compose.yml

diff --git a/solution/integration/network/docker-compose.yml b/solution/network/docker-compose.yml
similarity index 96%
rename from solution/integration/network/docker-compose.yml
rename to solution/network/docker-compose.yml
index 92bcc9b..7ad9a40 100755 (executable)
--- a/solution/integration/network/docker-compose.yml
+++ b/solution/network/docker-compose.yml
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright 2021 highstreet technologies GmbH
+# Copyright 2023 highstreet technologies GmbH
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -29,8 +29,8 @@ x-common_env: &common_env
     NTS_HOST_TRANSFER_SFTP_BASE_PORT: ${NTS_HOST_TRANSFER_SFTP_BASE_PORT}
 
     SDN_CONTROLLER_PROTOCOL: ${SDN_CONTROLLER_PROTOCOL}
-    SDN_CONTROLLER_IP: ${SDNC_OAM_IPv6}
-    SDN_CONTROLLER_PORT: ${SDNC_REST_PORT}
+    SDN_CONTROLLER_IP: ${SDNC_OAM_HOST}
+    # SDN_CONTROLLER_PORT: ${SDNC_REST_PORT}
     SDN_CONTROLLER_CALLHOME_IP: ${SDNC_OAM_IPv6}
     SDN_CONTROLLER_CALLHOME_PORT: ${SDN_CONTROLLER_CALLHOME_PORT}
     SDN_CONTROLLER_USERNAME: ${ADMIN_USERNAME}
@@ -38,7 +38,7 @@ x-common_env: &common_env
 
     VES_COMMON_HEADER_VERSION: ${VES_COMMON_HEADER_VERSION}
     VES_ENDPOINT_PROTOCOL: ${VES_ENDPOINT_PROTOCOL}
-    VES_ENDPOINT_IP: ${VES_COLLECTOR_OAM_IPv6}
+    VES_ENDPOINT_IP: ${VES_COLLECTOR_OAM_HOST}
     VES_ENDPOINT_PORT: ${VES_ENDPOINT_PORT}
     VES_ENDPOINT_AUTH_METHOD: ${VES_ENDPOINT_AUTH_METHOD}
     VES_ENDPOINT_USERNAME: ${VES_ENDPOINT_USERNAME}