From 850c8c3f317aa5130f585917e7a5c8b84a395d41 Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Fri, 1 Feb 2019 18:49:16 +0100
Subject: [PATCH] Fixed mock server configuration
---
SOL002/VNFFaultManagement-API/NotificationEndpoint.robot | 2 +-
SOL002/VNFFaultManagement-API/environment/variables.txt | 2 +-
.../VnfIndicatorNotification.robot | 2 +-
SOL002/VNFIndicatorNotification-API/environment/variables.txt | 3 ++-
SOL002/VNFLifecycleManagement-API/NotificationEndpoint.robot | 2 +-
SOL002/VNFLifecycleManagement-API/environment/variables.txt | 3 ++-
.../PerformanceManagementNotification.robot | 2 +-
.../environment/variables.txt | 1 +
.../NotificationEndpoint.robot | 2 +-
.../environment/variables.txt | 1 +
.../VnfIndicatorNotification.robot | 2 +-
SOL003/VNFIndicatorNotification-API/environment/variables.txt | 3 ++-
SOL003/VNFLifecycleManagement-API/NotificationEndpoint.robot | 3 ++-
.../VNFLifecycleManagement-API/environment/configuration.txt | 2 +-
.../PackageManagementNotification.robot | 2 +-
.../environment/variables.txt | 4 +++-
.../PerformanceManagementNotification.robot | 2 +-
.../environment/variables.txt | 2 ++
.../NotificationEndpoint.robot | 2 +-
.../environment/variables.txt | 1 +
SOL005/NSDManagement-API/NSDManagementNotification.robot | 3 ++-
SOL005/NSDManagement-API/environment/generic.txt | 2 ++
SOL005/VNFPackageManagement-API/Notifications.robot | 3 ++-
SOL005/VNFPackageManagement-API/environment/generic.txt | 2 ++
SOL005/VNFPerformanceManagement-API/Notifications.robot | 3 ++-
SOL005/VNFPerformanceManagement-API/environment/generic.txt | 2 ++
26 files changed, 39 insertions(+), 19 deletions(-)
diff --git a/SOL002/VNFFaultManagement-API/NotificationEndpoint.robot b/SOL002/VNFFaultManagement-API/NotificationEndpoint.robot
index aa3b33dc..a448be65 100644
--- a/SOL002/VNFFaultManagement-API/NotificationEndpoint.robot
+++ b/SOL002/VNFFaultManagement-API/NotificationEndpoint.robot
@@ -110,6 +110,6 @@ DELETE subscriptions - Method not implemented
*** Keywords ***
Create Sessions
- Start Process java -jar ../../bin/mockserver-netty-5.3.0-jar-with-dependencies.jar -serverPort ${callback_port} alias=mockInstance
+ Start Process java -jar ${MOCK_SERVER_JAR} -serverPort ${callback_port} alias=mockInstance
Wait For Process handle=mockInstance timeout=5s on_timeout=continue
Create Mock Session ${callback_schema}://${callback_uri}:${callback_port} #The API producer is set to NFVO according to SOL003-7.3.4
diff --git a/SOL002/VNFFaultManagement-API/environment/variables.txt b/SOL002/VNFFaultManagement-API/environment/variables.txt
index b604ec26..4035655b 100644
--- a/SOL002/VNFFaultManagement-API/environment/variables.txt
+++ b/SOL002/VNFFaultManagement-API/environment/variables.txt
@@ -39,5 +39,5 @@ ${managedObjectId} 007c111c-38a1-42c0-a666-7475ecb1567c
${invalid_alarm_filter} badFilter
${notification_ep} /notification
${notification_port} 9091
-
+${MOCK_SERVER_JAR} ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
diff --git a/SOL002/VNFIndicatorNotification-API/VnfIndicatorNotification.robot b/SOL002/VNFIndicatorNotification-API/VnfIndicatorNotification.robot
index 8745df34..4545ea7d 100644
--- a/SOL002/VNFIndicatorNotification-API/VnfIndicatorNotification.robot
+++ b/SOL002/VNFIndicatorNotification-API/VnfIndicatorNotification.robot
@@ -85,7 +85,7 @@ DELETE VNF Indicator Notification
*** Keywords ***
Create Sessions
- Start Process java -jar ../../bin/mockserver-netty-5.3.0-jar-with-dependencies.jar -serverPort ${callback_port} alias=mockInstance
+ Start Process java -jar ${MOCK_SERVER_JAR} -serverPort ${callback_port} alias=mockInstance
Wait For Process handle=mockInstance timeout=5s on_timeout=continue
Create Mock Session ${callback_uri}:${callback_port}
\ No newline at end of file
diff --git a/SOL002/VNFIndicatorNotification-API/environment/variables.txt b/SOL002/VNFIndicatorNotification-API/environment/variables.txt
index df8e5c4a..5820ea0b 100644
--- a/SOL002/VNFIndicatorNotification-API/environment/variables.txt
+++ b/SOL002/VNFIndicatorNotification-API/environment/variables.txt
@@ -3,4 +3,5 @@ ${callback_uri} http://localhost
${callback_port} 9091
${callback_endpoint} /endpoint
${callback_endpoint_error} /endpoint_404
-${sleep_interval} 20s
\ No newline at end of file
+${sleep_interval} 20s
+${MOCK_SERVER_JAR} ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/NotificationEndpoint.robot b/SOL002/VNFLifecycleManagement-API/NotificationEndpoint.robot
index 1d8fd3f6..3afd29d8 100644
--- a/SOL002/VNFLifecycleManagement-API/NotificationEndpoint.robot
+++ b/SOL002/VNFLifecycleManagement-API/NotificationEndpoint.robot
@@ -84,6 +84,6 @@ DELETE subscriptions - Method not implemented
*** Keywords ***
Create Sessions
- Start Process java -jar ../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar -serverPort ${callback_port} alias=mockInstance
+ Start Process java -jar ${MOCK_SERVER_JAR} -serverPort ${callback_port} alias=mockInstance
Wait For Process handle=mockInstance timeout=5s on_timeout=continue
Create Mock Session ${callback_schema}://${callback_uri}:${callback_port} #The API producer is set to NFVO according to SOL003-5.3.9
diff --git a/SOL002/VNFLifecycleManagement-API/environment/variables.txt b/SOL002/VNFLifecycleManagement-API/environment/variables.txt
index 8bf7b3c2..a7a14936 100644
--- a/SOL002/VNFLifecycleManagement-API/environment/variables.txt
+++ b/SOL002/VNFLifecycleManagement-API/environment/variables.txt
@@ -38,4 +38,5 @@ ${VnfIdentifierCreationNotification} {}
${VnfIdentifierDeletionNotification} {}
${callback_port} 9091
${callback_schema} http
-${callback_uri} localhost
\ No newline at end of file
+${callback_uri} localhost
+${MOCK_SERVER_JAR} ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
\ No newline at end of file
diff --git a/SOL002/VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot b/SOL002/VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot
index 3fa52b96..bc3c9a49 100644
--- a/SOL002/VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot
+++ b/SOL002/VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot
@@ -111,6 +111,6 @@ DELETE Performance Notification
*** Keywords ***
Create Sessions
- Start Process java -jar ../../bin/mockserver-netty-5.3.0-jar-with-dependencies.jar -serverPort ${callback_port} alias=mockInstance
+ Start Process java -jar ${MOCK_SERVER_JAR} -serverPort ${callback_port} alias=mockInstance
Wait For Process handle=mockInstance timeout=5s on_timeout=continue
Create Mock Session ${callback_uri}:${callback_port}
\ No newline at end of file
diff --git a/SOL002/VNFPerformanceManagementNotification-API/environment/variables.txt b/SOL002/VNFPerformanceManagementNotification-API/environment/variables.txt
index 12a19817..9445631a 100644
--- a/SOL002/VNFPerformanceManagementNotification-API/environment/variables.txt
+++ b/SOL002/VNFPerformanceManagementNotification-API/environment/variables.txt
@@ -4,3 +4,4 @@ ${callback_port} 9091
${callback_endpoint} /endpoint
${callback_endpoint_error} /endpoint_404
${sleep_interval} 20s
+${MOCK_SERVER_JAR} ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
diff --git a/SOL003/VNFFaultManagementNotification-API/NotificationEndpoint.robot b/SOL003/VNFFaultManagementNotification-API/NotificationEndpoint.robot
index 23568cc9..0c7f8c78 100644
--- a/SOL003/VNFFaultManagementNotification-API/NotificationEndpoint.robot
+++ b/SOL003/VNFFaultManagementNotification-API/NotificationEndpoint.robot
@@ -109,6 +109,6 @@ DELETE subscriptions - Method not implemented
*** Keywords ***
Create Sessions
- Start Process java -jar ../../bin/mockserver-netty-5.3.0-jar-with-dependencies.jar -serverPort ${callback_port} alias=mockInstance
+ Start Process java -jar ${MOCK_SERVER_JAR} -serverPort ${callback_port} alias=mockInstance
Wait For Process handle=mockInstance timeout=5s on_timeout=continue
Create Mock Session ${callback_uri}:${callback_port} #The API producer is set to NFVO according to SOL003-7.3.4
diff --git a/SOL003/VNFFaultManagementNotification-API/environment/variables.txt b/SOL003/VNFFaultManagementNotification-API/environment/variables.txt
index e2296a0c..515c4e77 100644
--- a/SOL003/VNFFaultManagementNotification-API/environment/variables.txt
+++ b/SOL003/VNFFaultManagementNotification-API/environment/variables.txt
@@ -3,3 +3,4 @@ ${callback_endpoint} /notification
${callback_uri} http://localhost
${callback_port} 9091
${sleep_interval} 20s
+${MOCK_SERVER_JAR} ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
\ No newline at end of file
diff --git a/SOL003/VNFIndicatorNotification-API/VnfIndicatorNotification.robot b/SOL003/VNFIndicatorNotification-API/VnfIndicatorNotification.robot
index 229a939b..c38bbe86 100644
--- a/SOL003/VNFIndicatorNotification-API/VnfIndicatorNotification.robot
+++ b/SOL003/VNFIndicatorNotification-API/VnfIndicatorNotification.robot
@@ -85,7 +85,7 @@ Delete VNF Indicator Notification
*** Keywords ***
Create Sessions
- Start Process java -jar ../../bin/mockserver-netty-5.3.0-jar-with-dependencies.jar -serverPort ${callback_port} alias=mockInstance
+ Start Process java -jar ${MOCK_SERVER_JAR} -serverPort ${callback_port} alias=mockInstance
Wait For Process handle=mockInstance timeout=5s on_timeout=continue
Create Mock Session ${callback_uri}:${callback_port}
\ No newline at end of file
diff --git a/SOL003/VNFIndicatorNotification-API/environment/variables.txt b/SOL003/VNFIndicatorNotification-API/environment/variables.txt
index df8e5c4a..5820ea0b 100644
--- a/SOL003/VNFIndicatorNotification-API/environment/variables.txt
+++ b/SOL003/VNFIndicatorNotification-API/environment/variables.txt
@@ -3,4 +3,5 @@ ${callback_uri} http://localhost
${callback_port} 9091
${callback_endpoint} /endpoint
${callback_endpoint_error} /endpoint_404
-${sleep_interval} 20s
\ No newline at end of file
+${sleep_interval} 20s
+${MOCK_SERVER_JAR} ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/NotificationEndpoint.robot b/SOL003/VNFLifecycleManagement-API/NotificationEndpoint.robot
index 0d2b029e..6263041f 100644
--- a/SOL003/VNFLifecycleManagement-API/NotificationEndpoint.robot
+++ b/SOL003/VNFLifecycleManagement-API/NotificationEndpoint.robot
@@ -6,6 +6,7 @@ Resource environment/variables.txt
Library MockServerLibrary
Library Process
Library OperatingSystem
+Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT} spec=SOL003-VNFLifecycleManagement-API.yaml
*** Variables ***
${sleep_interval} 20s
@@ -85,6 +86,6 @@ DELETE subscriptions - Method not implemented
*** Keywords ***
Create Sessions
- Start Process java -jar ../../bin/mockserver-netty-5.3.0-jar-with-dependencies.jar -serverPort ${callback_port} alias=mockInstance
+ Start Process java -jar ${MOCK_SERVER_JAR} -serverPort ${callback_port} alias=mockInstance
Wait For Process handle=mockInstance timeout=5s on_timeout=continue
Create Mock Session ${callback_uri}:${callback_port} #The API producer is set to NFVO according to SOL003-5.3.9
diff --git a/SOL003/VNFLifecycleManagement-API/environment/configuration.txt b/SOL003/VNFLifecycleManagement-API/environment/configuration.txt
index 9a55fb7d..b64dfa2f 100644
--- a/SOL003/VNFLifecycleManagement-API/environment/configuration.txt
+++ b/SOL003/VNFLifecycleManagement-API/environment/configuration.txt
@@ -35,4 +35,4 @@ ${SYNC_MODE} 0
${sleep_interval} 20s
${callback_uri} http://localhost
${callback_port} 9091
-${MOCK_SERVER_JAR} ../../../bin/mockserver-netty-5.3.0-jar-with-dependencies.jar
\ No newline at end of file
+${MOCK_SERVER_JAR} ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
\ No newline at end of file
diff --git a/SOL003/VNFPackageManagementNotification-API/PackageManagementNotification.robot b/SOL003/VNFPackageManagementNotification-API/PackageManagementNotification.robot
index 420c3c61..49127b6e 100644
--- a/SOL003/VNFPackageManagementNotification-API/PackageManagementNotification.robot
+++ b/SOL003/VNFPackageManagementNotification-API/PackageManagementNotification.robot
@@ -111,6 +111,6 @@ DELETE VNF Package Management Notification
*** Keywords ***
Create Sessions
- Start Process java -jar ../../bin/mockserver-netty-5.3.0-jar-with-dependencies.jar -serverPort ${callback_port} alias=mockInstance
+ Start Process java -jar ${MOCK_SERVER_JAR} -serverPort ${callback_port} alias=mockInstance
Wait For Process handle=mockInstance timeout=5s on_timeout=continue
Create Mock Session ${callback_uri}:${callback_port}
\ No newline at end of file
diff --git a/SOL003/VNFPackageManagementNotification-API/environment/variables.txt b/SOL003/VNFPackageManagementNotification-API/environment/variables.txt
index c758145e..2918a254 100644
--- a/SOL003/VNFPackageManagementNotification-API/environment/variables.txt
+++ b/SOL003/VNFPackageManagementNotification-API/environment/variables.txt
@@ -4,4 +4,6 @@ ${callback_uri} http://localhost
${callback_port} 9091
${callback_endpoint} /endpoint
${callback_endpoint_error} /endpoint_404
-${sleep_interval} 20s
\ No newline at end of file
+${sleep_interval} 20s
+
+${MOCK_SERVER_JAR} ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
\ No newline at end of file
diff --git a/SOL003/VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot b/SOL003/VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot
index fff93f0b..7f4b0a00 100644
--- a/SOL003/VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot
+++ b/SOL003/VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot
@@ -112,6 +112,6 @@ DELETE Performance Notification
*** Keywords ***
Create Sessions
- Start Process java -jar ../../bin/mockserver-netty-5.3.0-jar-with-dependencies.jar -serverPort ${callback_port} alias=mockInstance
+ Start Process java -jar ${MOCK_SERVER_JAR} -serverPort ${callback_port} alias=mockInstance
Wait For Process handle=mockInstance timeout=5s on_timeout=continue
Create Mock Session ${callback_uri}:${callback_port}
\ No newline at end of file
diff --git a/SOL003/VNFPerformanceManagementNotification-API/environment/variables.txt b/SOL003/VNFPerformanceManagementNotification-API/environment/variables.txt
index cb38e694..3d24134e 100644
--- a/SOL003/VNFPerformanceManagementNotification-API/environment/variables.txt
+++ b/SOL003/VNFPerformanceManagementNotification-API/environment/variables.txt
@@ -4,3 +4,5 @@ ${callback_port} 9091
${callback_endpoint} /endpoint
${callback_endpoint_error} /endpoint_404
${sleep_interval} 20s
+
+${MOCK_SERVER_JAR} ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
\ No newline at end of file
diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/NotificationEndpoint.robot b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/NotificationEndpoint.robot
index 9ca89be7..df45001b 100644
--- a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/NotificationEndpoint.robot
+++ b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/NotificationEndpoint.robot
@@ -60,7 +60,7 @@ DELETE subscriptions - Method not implemented
*** Keywords ***
Create Sessions
- Start Process java -jar ../../bin/mockserver-netty-5.3.0-jar-with-dependencies.jar -serverPort ${callback_port} alias=mockInstance
+ Start Process java -jar ${MOCK_SERVER_JAR} -serverPort ${callback_port} alias=mockInstance
Wait For Process handle=mockInstance timeout=5s on_timeout=continue
Create Mock Session ${callback_uri}:${callback_port} #The API producer is set to NFVO according to SOL003-5.3.9
diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/environment/variables.txt b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/environment/variables.txt
index 8725649e..37fd830e 100644
--- a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/environment/variables.txt
+++ b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/environment/variables.txt
@@ -24,4 +24,5 @@ ${apiName} vrqan
${apiVersion} v1
${VrQuotaAvailNotification} {}
+${MOCK_SERVER_JAR} ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
diff --git a/SOL005/NSDManagement-API/NSDManagementNotification.robot b/SOL005/NSDManagement-API/NSDManagementNotification.robot
index 3ce71af2..9197a43f 100644
--- a/SOL005/NSDManagement-API/NSDManagementNotification.robot
+++ b/SOL005/NSDManagement-API/NSDManagementNotification.robot
@@ -1,5 +1,6 @@
*** Setting ***
Resource environment/variables.txt
+Resource environment/generic.txt
Suite Setup Create Sessions
Suite Teardown Terminate All Processes kill=true
Library MockServerLibrary
@@ -165,6 +166,6 @@ DELETE VNF Package Management Notification
*** Keywords ***
Create Sessions
- Start Process java -jar ../../bin/mockserver-netty-5.3.0-jar-with-dependencies.jar -serverPort ${callback_port} alias=mockInstance
+ Start Process java -jar ${MOCK_SERVER_JAR} -serverPort ${callback_port} alias=mockInstance
Wait For Process handle=mockInstance timeout=5s on_timeout=continue
Create Mock Session ${callback_uri}:${callback_port}
\ No newline at end of file
diff --git a/SOL005/NSDManagement-API/environment/generic.txt b/SOL005/NSDManagement-API/environment/generic.txt
index 89c166cb..81b2ec62 100644
--- a/SOL005/NSDManagement-API/environment/generic.txt
+++ b/SOL005/NSDManagement-API/environment/generic.txt
@@ -13,3 +13,5 @@ ${apiName} nsd
${FIELD_USAGE} 1
${NFVO_AUTHENTICATION} Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9
${NFVO_AUTH_USAGE} 1
+
+${MOCK_SERVER_JAR} ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
diff --git a/SOL005/VNFPackageManagement-API/Notifications.robot b/SOL005/VNFPackageManagement-API/Notifications.robot
index 420c3c61..2a0e5a9a 100644
--- a/SOL005/VNFPackageManagement-API/Notifications.robot
+++ b/SOL005/VNFPackageManagement-API/Notifications.robot
@@ -1,5 +1,6 @@
*** Setting ***
Resource environment/variables.txt
+Resource environment/generic.txt
Suite Setup Create Sessions
Suite Teardown Terminate All Processes kill=true
Library MockServerLibrary
@@ -111,6 +112,6 @@ DELETE VNF Package Management Notification
*** Keywords ***
Create Sessions
- Start Process java -jar ../../bin/mockserver-netty-5.3.0-jar-with-dependencies.jar -serverPort ${callback_port} alias=mockInstance
+ Start Process java -jar ${MOCK_SERVER_JAR} -serverPort ${callback_port} alias=mockInstance
Wait For Process handle=mockInstance timeout=5s on_timeout=continue
Create Mock Session ${callback_uri}:${callback_port}
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/environment/generic.txt b/SOL005/VNFPackageManagement-API/environment/generic.txt
index db080ad3..60457280 100644
--- a/SOL005/VNFPackageManagement-API/environment/generic.txt
+++ b/SOL005/VNFPackageManagement-API/environment/generic.txt
@@ -18,3 +18,5 @@ ${NFVO_PLAIN} 1
${NFVO_FIELDS} 1
${vnfPackageId} 788106a2-d692-44f3-a86d-384f0ce35e42
+${MOCK_SERVER_JAR} ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
+
diff --git a/SOL005/VNFPerformanceManagement-API/Notifications.robot b/SOL005/VNFPerformanceManagement-API/Notifications.robot
index 711bca03..676cecc6 100644
--- a/SOL005/VNFPerformanceManagement-API/Notifications.robot
+++ b/SOL005/VNFPerformanceManagement-API/Notifications.robot
@@ -1,5 +1,6 @@
*** Setting ***
Resource environment/notifications.txt
+Resource environment/generic.txt
Suite Setup Create Sessions
Suite Teardown Terminate All Processes kill=true
Library MockServerLibrary
@@ -112,6 +113,6 @@ DELETE Performance Notification
*** Keywords ***
Create Sessions
- Start Process java -jar ../../bin/mockserver-netty-5.3.0-jar-with-dependencies.jar -serverPort ${callback_port} alias=mockInstance
+ Start Process java -jar ${MOCK_SERVER_JAR} -serverPort ${callback_port} alias=mockInstance
Wait For Process handle=mockInstance timeout=5s on_timeout=continue
Create Mock Session ${callback_uri}:${callback_port}
\ No newline at end of file
diff --git a/SOL005/VNFPerformanceManagement-API/environment/generic.txt b/SOL005/VNFPerformanceManagement-API/environment/generic.txt
index 66638f2f..51879755 100644
--- a/SOL005/VNFPerformanceManagement-API/environment/generic.txt
+++ b/SOL005/VNFPerformanceManagement-API/environment/generic.txt
@@ -19,3 +19,5 @@ ${VNFM_AUTH_USAGE} 1
${VNFM_DUPLICATION} 1
${NFVO_DUPLICATION} 1
+${MOCK_SERVER_JAR} ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
+
--
GitLab