From 8fd9619bdee903acd80f17166241b770be75e795 Mon Sep 17 00:00:00 2001
From: Elian Kraja <e.kraja@nextworks.it>
Date: Tue, 29 Jan 2019 11:41:33 +0100
Subject: [PATCH] Refactoring variables file

---
 .../{generic.txt => variables.txt}            |  0
 .../environment/variables.txt                 | 31 ++++++++++++-------
 .../{generic.txt => variables.txt}            |  0
 .../{generic.txt => variables.txt}            |  0
 .../{generic.txt => variables.txt}            |  0
 5 files changed, 20 insertions(+), 11 deletions(-)
 rename SOL003/VNFIndicator-API/environment/{generic.txt => variables.txt} (100%)
 rename SOL003/VNFPackageManagement-API/environment/{generic.txt => variables.txt} (100%)
 rename SOL003/VNFPerformanceManagement-API/environment/{generic.txt => variables.txt} (100%)
 rename SOL003/VNFPerformanceManagementNotification-API/environment/{generic.txt => variables.txt} (100%)

diff --git a/SOL003/VNFIndicator-API/environment/generic.txt b/SOL003/VNFIndicator-API/environment/variables.txt
similarity index 100%
rename from SOL003/VNFIndicator-API/environment/generic.txt
rename to SOL003/VNFIndicator-API/environment/variables.txt
diff --git a/SOL003/VNFLifecycleManagement-API/environment/variables.txt b/SOL003/VNFLifecycleManagement-API/environment/variables.txt
index 69f6a422..6de36689 100644
--- a/SOL003/VNFLifecycleManagement-API/environment/variables.txt
+++ b/SOL003/VNFLifecycleManagement-API/environment/variables.txt
@@ -1,16 +1,13 @@
 *** Variables ***
 ${vnfInstanceId}       6fc3539c-e602-4afa-8e13-962fb5a7d81f
-${vnfInstanceName}    Test-VnfInstance
-${vnfInstanceDescription}    description vnf
-${vnfInstanceDescription_Update}    Updated description vnf 
-${vnfPkgId_processing}    007c111c-38a1-42c0-a666-7475ecb1567c
-${vnfLcmOpOccId}    6fc3539c-e602-4afa-8e13-962fb5a7d81d
-${sub_filter}    filter
-${sub_filter_invalid}    filter_invalid
 ${subscriptionId}    6fc3539c-e602-4afa-8e13-962fb5a7d81f
-${notification_ep}    /notification
-${notification_ep_fwd}    /notification/check
-${notification_port}    9091
+${vnfLcmOpOccId}    6fc3539c-e602-4afa-8e13-962fb5a7d81d
+${callback_endpoint}    /notification
+${callback_endpoint_fwd}    /notification/check
+${callback_port}    9091
+${callback_uri}    http://localhost
+
+
 ${VnfLcmOperationOccurrenceNotification}    {}
 ${VnfIdentifierCreationNotification}    {}
 ${VnfIdentifierDeletionNotification}    {}
@@ -18,4 +15,16 @@ ${response}    {}
 ${notification_request}    []
 ${notification_response}    []
 ${json}    {}
-${requestedFlavour}    test
\ No newline at end of file
+${requestedFlavour}    test
+
+${sub_filter}    filter
+${sub_filter_invalid}    filter_invalid
+
+
+
+
+
+${vnfInstanceName}    Test-VnfInstance
+${vnfInstanceDescription}    description vnf
+${vnfInstanceDescription_Update}    Updated description vnf 
+${vnfPkgId_processing}    007c111c-38a1-42c0-a666-7475ecb1567c
diff --git a/SOL003/VNFPackageManagement-API/environment/generic.txt b/SOL003/VNFPackageManagement-API/environment/variables.txt
similarity index 100%
rename from SOL003/VNFPackageManagement-API/environment/generic.txt
rename to SOL003/VNFPackageManagement-API/environment/variables.txt
diff --git a/SOL003/VNFPerformanceManagement-API/environment/generic.txt b/SOL003/VNFPerformanceManagement-API/environment/variables.txt
similarity index 100%
rename from SOL003/VNFPerformanceManagement-API/environment/generic.txt
rename to SOL003/VNFPerformanceManagement-API/environment/variables.txt
diff --git a/SOL003/VNFPerformanceManagementNotification-API/environment/generic.txt b/SOL003/VNFPerformanceManagementNotification-API/environment/variables.txt
similarity index 100%
rename from SOL003/VNFPerformanceManagementNotification-API/environment/generic.txt
rename to SOL003/VNFPerformanceManagementNotification-API/environment/variables.txt
-- 
GitLab