Merge 'base' and 'controller/network_generator'

- controller/network_generator is replaced by base

Issue-ID: OAM-386
Change-Id: I613ed1c635e771654dd9b64ef1e79832c55702cc
Signed-off-by: Martin Skorupski <martin.skorupski@highstreet-technologies.com>

diff --git a/code/network-generator/network_generation/base.py b/code/network-generator/network_generation/base.py
index 44927f3..2261295 100644 (file)
--- a/code/network-generator/network_generation/base.py
+++ b/code/network-generator/network_generation/base.py
@@ -20,5 +20,35 @@ network_generation base module.
 This is the principal module of the network_generation project.
 """
 
+from network_generation.model.python.o_ran_network import ORanNetwork
+
 # example constant variable
 NAME = "network_generation"
+
+class NetworkGenerator:
+    """
+    Class containing all methods to generate a network.
+    The generation process is influenced by a configuration in json format.
+    """
+
+    __configuration: dict = {}
+
+    # constructor
+    def __init__(self, configuration: dict):
+        self.__configuration = configuration
+
+    # getters
+    def configuration(self) -> dict:
+        """
+        Getter returning the object configuration
+        :return A NetworkGenerator configuration
+        """
+        return self.__configuration
+
+    # returns a JSON serializable object
+    def generate(self) -> ORanNetwork:
+        """
+        Method to start the generation process.
+        :return The ORanNetwork object.
+        """
+        return ORanNetwork(self.configuration())

diff --git a/code/network-generator/network_generation/cli.py b/code/network-generator/network_generation/cli.py
index 8067273..53c844b 100644 (file)
--- a/code/network-generator/network_generation/cli.py
+++ b/code/network-generator/network_generation/cli.py
@@ -33,8 +33,8 @@ import os
 import sys
 
 from network_generation.view.network_viewer import NetworkViewer
-from network_generation.controller.network_generator import NetworkGenerator
-from network_generation.controller.parameter_validator import ParameterValidator
+from network_generation.base import NetworkGenerator
+from network_generation.parameter_validator import ParameterValidator
 
 def main():  # pragma: no cover
     """
@@ -43,7 +43,6 @@ def main():  # pragma: no cover
 
     """
     validator: ParameterValidator = ParameterValidator(sys.argv)
-    print("I'm in", sys.argv)
 
     if validator.is_valid():
         configuration = validator.configuration()

diff --git a/code/network-generator/network_generation/controller/network_generator.py b/code/network-generator/network_generation/controller/network_generator.py
deleted file mode 100644 (file)
index 6c5759b..0000000
--- a/code/network-generator/network_generation/controller/network_generator.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2023 highstreet technologies GmbH
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#!/usr/bin/python
-"""
-Module containing the Generator class.
-"""
-
-from network_generation.model.python.o_ran_network import ORanNetwork
-
-
-class NetworkGenerator:
-    """
-    Class containing all methods to generate a network.
-    The generation process is influenced by a configuration in json format.
-    """
-
-    __configuration: dict = {}
-
-    # constructor
-    def __init__(self, configuration: dict):
-        self.__configuration = configuration
-
-    # getters
-    def configuration(self) -> dict:
-        """
-        Getter returning the object configuration
-        :return A NetworkGenerator configuration
-        """
-        return self.__configuration
-
-    # returns a JSON serializable object
-    def generate(self) -> ORanNetwork:
-        """
-        Method to start the generation process.
-        :return The ORanNetwork object.
-        """
-        return ORanNetwork(self.configuration())

diff --git a/code/network-generator/network_generation/controller/parameter_validator.py b/code/network-generator/network_generation/parameter_validator.py
similarity index 98%
rename from code/network-generator/network_generation/controller/parameter_validator.py
rename to code/network-generator/network_generation/parameter_validator.py
index 365a5f8..2d035a3 100644 (file)
--- a/code/network-generator/network_generation/controller/parameter_validator.py
+++ b/code/network-generator/network_generation/parameter_validator.py
@@ -31,7 +31,7 @@ class ParameterValidator:
     __configuration: dict = {}
     __configuration_schema_file: str = (
         os.path.dirname(os.path.realpath(__file__))
-        + "/../model/jsonSchema/configuration.schema.json"
+        + "/model/jsonSchema/configuration.schema.json"
     )
     __config_schema: dict = {}
     __error_message: str = ""