From: Martin Skorupski <martin.skorupski@highstreet-technologies.com>
Date: Sun, 15 Oct 2023 11:26:43 +0000 (+0200)
Subject: Use python file name conventions
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=9ea4e241e3ec0c9dffd3db7fd7ab5a2cf3d13e7d;p=oam.git

Use python file name conventions

- filenames (module names) using lowercase and underscore

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

diff --git a/code/network-generator/model/python/Countries.py b/code/network-generator/model/python/countries.py
similarity index 100%
rename from code/network-generator/model/python/Countries.py
rename to code/network-generator/model/python/countries.py
diff --git a/code/network-generator/model/python/GeoLocation.py b/code/network-generator/model/python/geo_location.py
similarity index 100%
rename from code/network-generator/model/python/GeoLocation.py
rename to code/network-generator/model/python/geo_location.py
diff --git a/code/network-generator/model/python/Hexagon.py b/code/network-generator/model/python/hexagon.py
similarity index 100%
rename from code/network-generator/model/python/Hexagon.py
rename to code/network-generator/model/python/hexagon.py
diff --git a/code/network-generator/model/python/o_ran_network.py b/code/network-generator/model/python/o_ran_network.py
index 9198945..0439a67 100644
--- a/code/network-generator/model/python/o_ran_network.py
+++ b/code/network-generator/model/python/o_ran_network.py
@@ -17,8 +17,8 @@
 Module for a class representing a O-RAN Network
 """
 from typing import Any, Dict, List
-from model.python.Tower import Tower
-from model.python.ORanObject import IORanObject, ORanObject
+from model.python.tower import Tower
+from model.python.o_ran_object import IORanObject, ORanObject
 import xml.etree.ElementTree as ET
 
 
diff --git a/code/network-generator/model/python/ORanNode.py b/code/network-generator/model/python/o_ran_node.py
similarity index 94%
rename from code/network-generator/model/python/ORanNode.py
rename to code/network-generator/model/python/o_ran_node.py
index f862046..2320ffa 100644
--- a/code/network-generator/model/python/ORanNode.py
+++ b/code/network-generator/model/python/o_ran_node.py
@@ -19,7 +19,7 @@ An abstract Class for O-RAN Node
 """
 from abc import abstractmethod
 from typing import Any, Dict
-from model.python.ORanObject import IORanObject, ORanObject
+from model.python.o_ran_object import IORanObject, ORanObject
 
 # Define an abstract O-RAN Node class
 class ORanNode(ORanObject):
diff --git a/code/network-generator/model/python/ORanObject.py b/code/network-generator/model/python/o_ran_object.py
similarity index 94%
rename from code/network-generator/model/python/ORanObject.py
rename to code/network-generator/model/python/o_ran_object.py
index c028419..f938954 100644
--- a/code/network-generator/model/python/ORanObject.py
+++ b/code/network-generator/model/python/o_ran_object.py
@@ -20,11 +20,11 @@ An abstract Class for O-RAN Objects
 from abc import ABC, abstractmethod
 from typing import Dict
 
-from model.python.Top import ITop, Top
-from model.python.TypeDefinitions import (
+from model.python.top import ITop, Top
+from model.python.type_definitions import (
     AddressType,
 )
-from model.python.GeoLocation import GeoLocation
+from model.python.geo_location import GeoLocation
 
 
 # Define the "IORanObject" interface
diff --git a/code/network-generator/model/python/ORanTerminationPoint.py b/code/network-generator/model/python/o_ran_termination_point.py
similarity index 95%
rename from code/network-generator/model/python/ORanTerminationPoint.py
rename to code/network-generator/model/python/o_ran_termination_point.py
index fe1c652..f198846 100644
--- a/code/network-generator/model/python/ORanTerminationPoint.py
+++ b/code/network-generator/model/python/o_ran_termination_point.py
@@ -19,7 +19,7 @@ An abstract Class for O-RAN TerminationPoint
 """
 from abc import abstractmethod
 from typing import Any, Dict
-from model.python.ORanObject import ORanObject
+from model.python.o_ran_object import ORanObject
 
 # Define an abstract O-RAN Node class
 class ORanTerminationPoint(ORanObject):
diff --git a/code/network-generator/model/python/Top.py b/code/network-generator/model/python/top.py
similarity index 97%
rename from code/network-generator/model/python/Top.py
rename to code/network-generator/model/python/top.py
index b076a62..486b023 100644
--- a/code/network-generator/model/python/Top.py
+++ b/code/network-generator/model/python/top.py
@@ -20,7 +20,7 @@ An abstract Class for all classes
 import uuid
 from abc import ABC, abstractmethod
 from typing import Optional, Dict, Union
-from model.python.TypeDefinitions import (
+from model.python.type_definitions import (
     AddressType,
     AdministrativeState,
     OperationalState,
@@ -29,7 +29,7 @@ from model.python.TypeDefinitions import (
     LifeCycleState,
     AlarmState,
 )
-from model.python.GeoLocation import GeoLocation
+from model.python.geo_location import GeoLocation
 
 
 # Define the ITop interface
diff --git a/code/network-generator/model/python/Tower.py b/code/network-generator/model/python/tower.py
similarity index 90%
rename from code/network-generator/model/python/Tower.py
rename to code/network-generator/model/python/tower.py
index 0ef93dd..2070348 100644
--- a/code/network-generator/model/python/Tower.py
+++ b/code/network-generator/model/python/tower.py
@@ -19,8 +19,8 @@ A Class representing a Tower to mount O-RAN RUx
 """
 from typing import Any, Dict
 
-from model.python.ORanObject import IORanObject
-from model.python.ORanNode import ORanNode
+from model.python.o_ran_object import IORanObject
+from model.python.o_ran_node import ORanNode
 
 
 # Define an abstract O-RAN Node class
diff --git a/code/network-generator/model/python/TypeDefinitions.py b/code/network-generator/model/python/type_definitions.py
similarity index 97%
rename from code/network-generator/model/python/TypeDefinitions.py
rename to code/network-generator/model/python/type_definitions.py
index 8cc135c..9536265 100644
--- a/code/network-generator/model/python/TypeDefinitions.py
+++ b/code/network-generator/model/python/type_definitions.py
@@ -18,7 +18,7 @@
 A collection of TypeDefinitions
 """
 from enum import Enum
-from model.python.Countries import Country
+from model.python.countries import Country
 
 # Define AdministrativeState enum
 class AdministrativeState(Enum):