TEIV: Small Fixes

- add cloud modules to YangModelLoader - update script - update yang to use correct extension Issue-ID: SMO-172 Change-Id: I8f1f484c0d42b03693d7a16aeee9ecce7df4f323 Signed-off-by: JvD_Ericsson <[email protected]>
o-ran-sc · Jan 16, 2025 · 28ad638 · 28ad638
1 parent a66cc5b
commit 28ad638
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 27 deletions.
diff --git a/pgsql-schema-generator/copySqlSchemaFromPgsqlGenerator.sh b/pgsql-schema-generator/copySqlSchemaFromPgsqlGenerator.sh
@@ -32,7 +32,8 @@ REPLACEMENT2="'$REPLACEMENT_VALUE'"
 declare -A FILES
 FILES=( ["00_init-oran-smo-teiv-data.sql"]="01_init-teiv-exposure-data.sql"
         ["01_init-oran-smo-teiv-model.sql"]="00_init-teiv-exposure-model.sql"
-        ["02_init-oran-smo-teiv-consumer-data.sql"]="02_init-teiv-exposure-consumer-data.sql")
+        ["02_init-oran-smo-teiv-consumer-data.sql"]="02_init-teiv-exposure-consumer-data.sql"
+        ["03_init-oran-smo-teiv-groups.sql"]="03_init-teiv-exposure-groups.sql")
 
 mkdir -p "$TARGET_DIR"
 

diff --git a/teiv/src/main/java/org/oran/smo/teiv/utils/yangparser/YangModelLoader.java b/teiv/src/main/java/org/oran/smo/teiv/utils/yangparser/YangModelLoader.java
@@ -50,7 +50,8 @@ public abstract class YangModelLoader {
 
     private static final Set<String> MODULES_TO_IMPLEMENT = Set.of("o-ran-smo-teiv-common-yang-extensions",
             "o-ran-smo-teiv-common-yang-types", "o-ran-smo-teiv-equipment", "o-ran-smo-teiv-oam", "o-ran-smo-teiv-ran",
-            "o-ran-smo-teiv-rel-equipment-ran", "o-ran-smo-teiv-rel-oam-ran");
+            "o-ran-smo-teiv-rel-equipment-ran", "o-ran-smo-teiv-rel-oam-ran", "o-ran-smo-teiv-cloud",
+            "o-ran-smo-teiv-rel-cloud-ran");
 
     public static ParserExecutionContext createParserExecutionContext(List<StatementClassSupplier> extensions,
             List<CustomProcessor> customProcessors, Set<FindingFilterPredicate> filterPredicates) {

diff --git a/teiv/src/main/resources/models/o-ran-smo-teiv-ran.yang b/teiv/src/main/resources/models/o-ran-smo-teiv-ran.yang
@@ -462,7 +462,7 @@ module o-ran-smo-teiv-ran {
             ";
 
         uses or-teiv-types:Top_Grp_Type;
-        uses or-teiv-types:Origin_Entity_Mapping_Grp;
+        uses or-teiv-types:Origin_Relationship_Mapping_Grp;
         key id;
 
         leaf-list provided-nrCellDu {
@@ -490,7 +490,7 @@ module o-ran-smo-teiv-ran {
             ";
 
         uses or-teiv-types:Top_Grp_Type;
-        uses or-teiv-types:Origin_Entity_Mapping_Grp;
+        uses or-teiv-types:Origin_Relationship_Mapping_Grp;
         key id;
 
         leaf-list provided-nrSectorCarrier {
@@ -518,7 +518,7 @@ module o-ran-smo-teiv-ran {
             ";
 
         uses or-teiv-types:Top_Grp_Type;
-        uses or-teiv-types:Origin_Entity_Mapping_Grp;
+        uses or-teiv-types:Origin_Relationship_Mapping_Grp;
         key id;
 
         leaf-list provided-nrCellCu {
@@ -546,7 +546,7 @@ module o-ran-smo-teiv-ran {
             ";
 
         uses or-teiv-types:Top_Grp_Type;
-        uses or-teiv-types:Origin_Entity_Mapping_Grp;
+        uses or-teiv-types:Origin_Relationship_Mapping_Grp;
         key id;
 
         leaf-list used-nrSectorCarrier {
@@ -573,7 +573,7 @@ module o-ran-smo-teiv-ran {
             ";
 
         uses or-teiv-types:Top_Grp_Type;
-        uses or-teiv-types:Origin_Entity_Mapping_Grp;
+        uses or-teiv-types:Origin_Relationship_Mapping_Grp;
         key id;
 
         leaf used-antennaCapability {
@@ -600,7 +600,7 @@ module o-ran-smo-teiv-ran {
             ";
 
         uses or-teiv-types:Top_Grp_Type;
-        uses or-teiv-types:Origin_Entity_Mapping_Grp;
+        uses or-teiv-types:Origin_Relationship_Mapping_Grp;
         key id;
 
         leaf-list grouped-nrCellDu {

diff --git a/teiv/src/main/resources/models/o-ran-smo-teiv-rel-equipment-ran.yang b/teiv/src/main/resources/models/o-ran-smo-teiv-rel-equipment-ran.yang
@@ -66,7 +66,7 @@ module o-ran-smo-teiv-rel-equipment-ran {
             ";
 
         uses or-teiv-types:Top_Grp_Type;
-        uses or-teiv-types:Origin_Entity_Mapping_Grp;
+        uses or-teiv-types:Origin_Relationship_Mapping_Grp;
         key id;
 
         leaf-list serviced-antennaCapability {

diff --git a/teiv/src/main/resources/models/o-ran-smo-teiv-rel-oam-ran.yang b/teiv/src/main/resources/models/o-ran-smo-teiv-rel-oam-ran.yang
@@ -63,7 +63,7 @@ module o-ran-smo-teiv-rel-oam-ran {
             ";
 
         uses or-teiv-types:Top_Grp_Type;
-        uses or-teiv-types:Origin_Entity_Mapping_Grp;
+        uses or-teiv-types:Origin_Relationship_Mapping_Grp;
         key id;
 
         leaf-list managed-oduFunction {
@@ -91,7 +91,7 @@ module o-ran-smo-teiv-rel-oam-ran {
             ";
 
         uses or-teiv-types:Top_Grp_Type;
-        uses or-teiv-types:Origin_Entity_Mapping_Grp;
+        uses or-teiv-types:Origin_Relationship_Mapping_Grp;
         key id;
 
         leaf-list managed-ocucpFunction {
@@ -119,7 +119,7 @@ module o-ran-smo-teiv-rel-oam-ran {
             ";
 
         uses or-teiv-types:Top_Grp_Type;
-        uses or-teiv-types:Origin_Entity_Mapping_Grp;
+        uses or-teiv-types:Origin_Relationship_Mapping_Grp;
         key id;
 
         leaf-list managed-ocuupFunction {
@@ -147,7 +147,7 @@ module o-ran-smo-teiv-rel-oam-ran {
             ";
 
         uses or-teiv-types:Top_Grp_Type;
-        uses or-teiv-types:Origin_Entity_Mapping_Grp;
+        uses or-teiv-types:Origin_Relationship_Mapping_Grp;
         key id;
 
         leaf-list managed-oruFunction {
@@ -175,7 +175,7 @@ module o-ran-smo-teiv-rel-oam-ran {
             ";
 
         uses or-teiv-types:Top_Grp_Type;
-        uses or-teiv-types:Origin_Entity_Mapping_Grp;
+        uses or-teiv-types:Origin_Relationship_Mapping_Grp;
         key id;
 
         leaf-list managed-nearRTRICFunction {

diff --git a/teiv/src/test/resources/contracts/exposure/schemas/01_getSchemaContent.groovy b/teiv/src/test/resources/contracts/exposure/schemas/01_getSchemaContent.groovy
@@ -96,7 +96,7 @@ import org.springframework.cloud.contract.spec.Contract
                     "            \";\n" +
                     "\n" +
                     "        uses or-teiv-types:Top_Grp_Type;\n" +
-                    "        uses or-teiv-types:Origin_Entity_Mapping_Grp;\n" +
+                    "        uses or-teiv-types:Origin_Relationship_Mapping_Grp;\n" +
                     "        key id;\n" +
                     "\n" +
                     "        leaf-list managed-oduFunction {\n" +
@@ -124,7 +124,7 @@ import org.springframework.cloud.contract.spec.Contract
                     "            \";\n" +
                     "\n" +
                     "        uses or-teiv-types:Top_Grp_Type;\n" +
-                    "        uses or-teiv-types:Origin_Entity_Mapping_Grp;\n" +
+                    "        uses or-teiv-types:Origin_Relationship_Mapping_Grp;\n" +
                     "        key id;\n" +
                     "\n" +
                     "        leaf-list managed-ocucpFunction {\n" +
@@ -152,7 +152,7 @@ import org.springframework.cloud.contract.spec.Contract
                     "            \";\n" +
                     "\n" +
                     "        uses or-teiv-types:Top_Grp_Type;\n" +
-                    "        uses or-teiv-types:Origin_Entity_Mapping_Grp;\n" +
+                    "        uses or-teiv-types:Origin_Relationship_Mapping_Grp;\n" +
                     "        key id;\n" +
                     "\n" +
                     "        leaf-list managed-ocuupFunction {\n" +
@@ -180,7 +180,7 @@ import org.springframework.cloud.contract.spec.Contract
                     "            \";\n" +
                     "\n" +
                     "        uses or-teiv-types:Top_Grp_Type;\n" +
-                    "        uses or-teiv-types:Origin_Entity_Mapping_Grp;\n" +
+                    "        uses or-teiv-types:Origin_Relationship_Mapping_Grp;\n" +
                     "        key id;\n" +
                     "\n" +
                     "        leaf-list managed-oruFunction {\n" +
@@ -208,7 +208,7 @@ import org.springframework.cloud.contract.spec.Contract
                     "            \";\n" +
                     "\n" +
                     "        uses or-teiv-types:Top_Grp_Type;\n" +
-                    "        uses or-teiv-types:Origin_Entity_Mapping_Grp;\n" +
+                    "        uses or-teiv-types:Origin_Relationship_Mapping_Grp;\n" +
                     "        key id;\n" +
                     "\n" +
                     "        leaf-list managed-nearRTRICFunction {\n" +

diff --git a/teiv/src/test/resources/contracts/schemas/01_getSchemaContent.groovy b/teiv/src/test/resources/contracts/schemas/01_getSchemaContent.groovy
@@ -96,7 +96,7 @@ import org.springframework.cloud.contract.spec.Contract
                     "            \";\n" +
                     "\n" +
                     "        uses or-teiv-types:Top_Grp_Type;\n" +
-                    "        uses or-teiv-types:Origin_Entity_Mapping_Grp;\n" +
+                    "        uses or-teiv-types:Origin_Relationship_Mapping_Grp;\n" +
                     "        key id;\n" +
                     "\n" +
                     "        leaf-list managed-oduFunction {\n" +
@@ -124,7 +124,7 @@ import org.springframework.cloud.contract.spec.Contract
                     "            \";\n" +
                     "\n" +
                     "        uses or-teiv-types:Top_Grp_Type;\n" +
-                    "        uses or-teiv-types:Origin_Entity_Mapping_Grp;\n" +
+                    "        uses or-teiv-types:Origin_Relationship_Mapping_Grp;\n" +
                     "        key id;\n" +
                     "\n" +
                     "        leaf-list managed-ocucpFunction {\n" +
@@ -152,7 +152,7 @@ import org.springframework.cloud.contract.spec.Contract
                     "            \";\n" +
                     "\n" +
                     "        uses or-teiv-types:Top_Grp_Type;\n" +
-                    "        uses or-teiv-types:Origin_Entity_Mapping_Grp;\n" +
+                    "        uses or-teiv-types:Origin_Relationship_Mapping_Grp;\n" +
                     "        key id;\n" +
                     "\n" +
                     "        leaf-list managed-ocuupFunction {\n" +
@@ -180,7 +180,7 @@ import org.springframework.cloud.contract.spec.Contract
                     "            \";\n" +
                     "\n" +
                     "        uses or-teiv-types:Top_Grp_Type;\n" +
-                    "        uses or-teiv-types:Origin_Entity_Mapping_Grp;\n" +
+                    "        uses or-teiv-types:Origin_Relationship_Mapping_Grp;\n" +
                     "        key id;\n" +
                     "\n" +
                     "        leaf-list managed-oruFunction {\n" +
@@ -208,7 +208,7 @@ import org.springframework.cloud.contract.spec.Contract
                     "            \";\n" +
                     "\n" +
                     "        uses or-teiv-types:Top_Grp_Type;\n" +
-                    "        uses or-teiv-types:Origin_Entity_Mapping_Grp;\n" +
+                    "        uses or-teiv-types:Origin_Relationship_Mapping_Grp;\n" +
                     "        key id;\n" +
                     "\n" +
                     "        leaf-list managed-nearRTRICFunction {\n" +

diff --git a/teiv/src/test/resources/pgsqlschema/01_init-oran-smo-teiv-model.sql b/teiv/src/test/resources/pgsqlschema/01_init-oran-smo-teiv-model.sql