X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=servicemanager%2Finternal%2Fdiscoverservice%2Fdiscoverservice_test.go;h=ab6ae857b9b90b47fc4a263b1227c30351c6436a;hb=fdb05902d0e3234446ac0cfd8ffed0743cfd20e5;hp=7c4b9f883fca6d52793f2d7029a1089a5c7eea28;hpb=40b608da2929aa753b3e87733fd0900b8e3dcbc4;p=nonrtric%2Fplt%2Fsme.git

diff --git a/servicemanager/internal/discoverservice/discoverservice_test.go b/servicemanager/internal/discoverservice/discoverservice_test.go
index 7c4b9f8..ab6ae85 100644
--- a/servicemanager/internal/discoverservice/discoverservice_test.go
+++ b/servicemanager/internal/discoverservice/discoverservice_test.go
@@ -54,17 +54,17 @@ import (
 	"oransc.org/nonrtric/servicemanager/internal/publishservice"
 
 	"oransc.org/nonrtric/capifcore"
-	"oransc.org/nonrtric/servicemanager/mockkong"
+	mockKong "oransc.org/nonrtric/servicemanager/mockkong"
 )
 
 var (
-	eServiceManager  	 *echo.Echo
-	eCapifWeb        	 *echo.Echo
-	eKong            	 *echo.Echo
-	mockConfigReader 	 *envreader.MockConfigReader
+	eServiceManager      *echo.Echo
+	eCapifWeb            *echo.Echo
+	eKong                *echo.Echo
+	mockConfigReader     *envreader.MockConfigReader
 	serviceManagerServer *httptest.Server
-	capifServer 		 *httptest.Server
-	mockKongServer 		 *httptest.Server
+	capifServer          *httptest.Server
+	mockKongServer       *httptest.Server
 )
 
 func TestMain(m *testing.M) {
@@ -117,9 +117,10 @@ func setupTest() error {
 		MockedConfig: map[string]string{
 			"KONG_DOMAIN":             "kong",
 			"KONG_PROTOCOL":           "http",
-			"KONG_IPV4":               mockKongHost,
-			"KONG_DATA_PLANE_PORT":    "32080",
+			"KONG_CONTROL_PLANE_IPV4": mockKongHost,
 			"KONG_CONTROL_PLANE_PORT": mockKongControlPlanePort,
+			"KONG_DATA_PLANE_IPV4":    "10.101.1.101",
+			"KONG_DATA_PLANE_PORT":    "32080",
 			"CAPIF_PROTOCOL":          "http",
 			"CAPIF_IPV4":              capifHost,
 			"CAPIF_PORT":              capifPort,
@@ -178,8 +179,7 @@ func getProvider() provapi.APIProviderEnrolmentDetails {
 	}
 }
 
-
-func capifCleanUp()  {
+func capifCleanUp() {
 	t := new(testing.T) // Create a new testing.T instance for capifCleanUp
 
 	// Delete the invoker
@@ -277,7 +277,7 @@ func TestPublishUnpublishService(t *testing.T) {
 
 	// Check if the parsed array is empty
 	assert.Zero(t, len(resultServices))
-	assert.True (t, len(resultServices) == 0)
+	assert.True(t, len(resultServices) == 0)
 
 	aefId := "AEF_id_rApp_Kong_as_AEF"
 	namespace := "namespace"
@@ -322,13 +322,13 @@ func TestPublishUnpublishService(t *testing.T) {
 	resultServiceIpv4 := *interfaceDescription.Ipv4Addr
 	resultServicePort := *interfaceDescription.Port
 
-	kongIPv4 := common29122.Ipv4Addr(myEnv["KONG_IPV4"])
+	kongDataPlaneIPv4 := common29122.Ipv4Addr(myEnv["KONG_DATA_PLANE_IPV4"])
 	kongDataPlanePort := common29122.Port(myPorts["KONG_DATA_PLANE_PORT"])
 
-	assert.NotEmpty(t, kongIPv4, "KONG_IPV4 is required in .env file for unit testing")
+	assert.NotEmpty(t, kongDataPlaneIPv4, "KONG_DATA_PLANE_IPV4 is required in .env file for unit testing")
 	assert.NotZero(t, kongDataPlanePort, "KONG_DATA_PLANE_PORT is required in .env file for unit testing")
 
-	assert.Equal(t, kongIPv4, resultServiceIpv4)
+	assert.Equal(t, kongDataPlaneIPv4, resultServiceIpv4)
 	assert.Equal(t, kongDataPlanePort, resultServicePort)
 
 	// Check one service published
@@ -340,7 +340,7 @@ func TestPublishUnpublishService(t *testing.T) {
 	assert.NoError(t, err, "error unmarshaling response")
 
 	// Check if the parsed array has one item
-	assert.True (t, len(resultServices) == 1)
+	assert.True(t, len(resultServices) == 1)
 
 	// Publish a second service for provider
 	apiName2 := "apiName2"
@@ -373,7 +373,7 @@ func TestPublishUnpublishService(t *testing.T) {
 	assert.NoError(t, err, "error unmarshaling response")
 
 	// Check if the parsed array has two items
-	assert.True (t, len(resultServices) == 2)
+	assert.True(t, len(resultServices) == 2)
 }
 
 func TestOnboardInvoker(t *testing.T) {
@@ -653,9 +653,10 @@ func registerHandlers(e *echo.Echo, myEnv map[string]string, myPorts map[string]
 	capifPort := common29122.Port(myPorts["CAPIF_PORT"])
 	kongDomain := myEnv["KONG_DOMAIN"]
 	kongProtocol := myEnv["KONG_PROTOCOL"]
-	kongIPv4 := common29122.Ipv4Addr(myEnv["KONG_IPV4"])
-	kongDataPlanePort := common29122.Port(myPorts["KONG_DATA_PLANE_PORT"])
+	kongControlPlaneIPv4 := common29122.Ipv4Addr(myEnv["KONG_CONTROL_PLANE_IPV4"])
 	kongControlPlanePort := common29122.Port(myPorts["KONG_CONTROL_PLANE_PORT"])
+	kongDataPlaneIPv4 := common29122.Ipv4Addr(myEnv["KONG_DATA_PLANE_IPV4"])
+	kongDataPlanePort := common29122.Port(myPorts["KONG_DATA_PLANE_PORT"])
 
 	// Register ProviderManagement
 	providerManagerSwagger, err := provapi.GetSwagger()
@@ -681,7 +682,11 @@ func registerHandlers(e *echo.Echo, myEnv map[string]string, myPorts map[string]
 
 	publishServiceSwagger.Servers = nil
 
-	ps := publishservice.NewPublishService(kongDomain, kongProtocol, kongIPv4, kongDataPlanePort, kongControlPlanePort, capifProtocol, capifIPv4, capifPort)
+	ps := publishservice.NewPublishService(
+		kongDomain, kongProtocol,
+		kongControlPlaneIPv4, kongControlPlanePort,
+		kongDataPlaneIPv4, kongDataPlanePort,
+		capifProtocol, capifIPv4, capifPort)
 
 	group = e.Group("/published-apis/v1")
 	group.Use(echomiddleware.Logger())