5 files changed, 5 insertions, 6 deletions
diff --git a/test/csit/tests/dcae-bulkpm/testcases/BulkpmE2E.robot b/test/csit/tests/usecases/5G-bulkpm/BulkpmE2E.robot
index aa391ad8c..9098b1abe 100644
--- a/test/csit/tests/dcae-bulkpm/testcases/BulkpmE2E.robot
+++ b/test/csit/tests/usecases/5G-bulkpm/BulkpmE2E.robot
@@ -4,7 +4,7 @@ Library           RequestsLibrary
 Library           OperatingSystem
 Library           Collections
 Library           Process
-Resource          resources/ves_keywords.robot
+Resource          resources/bulkpm_keywords.robot
 
 
 *** Variables ***
@@ -12,7 +12,7 @@ ${VESC_URL}                              http://%{VESC_IP}:8080
 ${GLOBAL_APPLICATION_ID}                 robot-ves
 ${VES_ANY_EVENT_PATH}                    /eventListener/v7
 ${HEADER_STRING}                         content-type=application/json
-${EVENT_DATA_FILE}                       %{WORKSPACE}/test/csit/tests/dcae-bulkpm/testcases/assets/json_events/FileExistNotificationUpdated.json
+${EVENT_DATA_FILE}                       %{WORKSPACE}/test/csit/tests/usecases/5G-bulkpm/assets/json_events/FileExistNotificationUpdated.json
 
 ${TARGETURL_TOPICS}                      http://${DMAAP_MR_IP}:3904/topics
 ${TARGETURL_SUBSCR}                      http://${DMAAP_MR_IP}:3904/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12?timeout=1000
diff --git a/test/csit/tests/dcae-bulkpm/testcases/__init__.robot b/test/csit/tests/usecases/5G-bulkpm/__init__.robot
index 7114fd447..7114fd447 100644
--- a/test/csit/tests/dcae-bulkpm/testcases/__init__.robot
+++ b/test/csit/tests/usecases/5G-bulkpm/__init__.robot
diff --git a/test/csit/tests/dcae-bulkpm/testcases/assets/json_events/FileExistNotification.json b/test/csit/tests/usecases/5G-bulkpm/assets/json_events/FileExistNotification.json
index 4064ea312..4064ea312 100644
--- a/test/csit/tests/dcae-bulkpm/testcases/assets/json_events/FileExistNotification.json
+++ b/test/csit/tests/usecases/5G-bulkpm/assets/json_events/FileExistNotification.json
diff --git a/test/csit/tests/dcae-bulkpm/testcases/resources/ves_keywords.robot b/test/csit/tests/usecases/5G-bulkpm/resources/bulkpm_keywords.robot
index 76bc33f47..6859ea0df 100644
--- a/test/csit/tests/dcae-bulkpm/testcases/resources/ves_keywords.robot
+++ b/test/csit/tests/usecases/5G-bulkpm/resources/bulkpm_keywords.robot
@@ -1,7 +1,7 @@
  *** Settings ***
 Documentation     The main interface for interacting with VES. It handles low level stuff like managing the http request library and VES required fields
 Library 	      RequestsLibrary
-Library	          ../resources/VesLibrary.py 
+Library	          ../resources/xNFLibrary.py
 Library           OperatingSystem
 Library           Collections
 Library           requests
@@ -36,4 +36,3 @@ GetCall
     [Arguments]     ${url}
     ${resp}=    	Evaluate    requests.get('${url}')    requests
     [Return]    	${resp}
-    
-\ No newline at end of file
diff --git a/test/csit/tests/dcae-bulkpm/testcases/resources/VesLibrary.py b/test/csit/tests/usecases/5G-bulkpm/resources/xNFLibrary.py
index d1ec9811d..01574f778 100644
--- a/test/csit/tests/dcae-bulkpm/testcases/resources/VesLibrary.py
+++ b/test/csit/tests/usecases/5G-bulkpm/resources/xNFLibrary.py
@@ -7,7 +7,7 @@ from robot.api import logger
 from Queue import Queue
 import uuid, time, json, threading,os, platform, subprocess,paramiko
 
-class VesLibrary(object):
+class xNFLibrary(object):
 
     def __init__(self):
         pass
@@ -21,5 +21,5 @@ class VesLibrary(object):
         return uuid.uuid4()
 
 if __name__ == '__main__':
-    lib = VesLibrary()
+    lib = xNFLibrary()
     time.sleep(100000)
 \ No newline at end of file