From 57bfda9d2608fc875fd1fc24761ef081d8314d42 Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Fri, 17 Feb 2023 10:33:38 +0000
Subject: [PATCH] Tools - Load Scenario:
- updated according to new common load scenario tools
---
src/tests/tools/load_scenario/__main__.py | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/tests/tools/load_scenario/__main__.py b/src/tests/tools/load_scenario/__main__.py
index 3559f778d..df1d5d8bf 100644
--- a/src/tests/tools/load_scenario/__main__.py
+++ b/src/tests/tools/load_scenario/__main__.py
@@ -13,7 +13,7 @@
# limitations under the License.
import logging, sys
-from common.tests.LoadScenario import load_scenario_from_descriptor
+from common.tools.descriptor.Loader import DescriptorLoader, check_descriptor_load_results
from context.client.ContextClient import ContextClient
from device.client.DeviceClient import DeviceClient
from service.client.ServiceClient import ServiceClient
@@ -29,7 +29,12 @@ def main():
slice_client = SliceClient()
LOGGER.info('Loading scenario...')
- load_scenario_from_descriptor(sys.argv[1], context_client, device_client, service_client, slice_client)
+ descriptor_loader = DescriptorLoader(
+ descriptors_file=sys.argv[1], context_client=context_client, device_client=device_client,
+ service_client=service_client, slice_client=slice_client)
+ results = descriptor_loader.process()
+ check_descriptor_load_results(results, descriptor_loader)
+ descriptor_loader.validate()
LOGGER.info('Done!')
return 0
--
GitLab