Merge "pgsql-generator to generate schema before contract tests"

o-ran-sc · Oct 15, 2024 · 6c68e86 · 6c68e86
2 parents 7d8e92f + 6c3717d
commit 6c68e86
Show file tree

Hide file tree

Showing 11 changed files with 54 additions and 10 deletions.
diff --git a/pgsql-schema-generator/copySqlSchemaFromPgsqlGenerator.sh b/pgsql-schema-generator/copySqlSchemaFromPgsqlGenerator.sh
@@ -26,8 +26,8 @@ SOURCE_DIR="./target"
 TARGET_DIR="./sql_scripts"
 PLACEHOLDER1=":pguser"
 PLACEHOLDER2=":'pguser'"
-REPLACEMENT1="topology_exposure_user"
-REPLACEMENT2="'topology_exposure_user'"
+REPLACEMENT_VALUE="${1:-topology_exposure_user}"
+REPLACEMENT2="'$REPLACEMENT_VALUE'"
 
 declare -A FILES
 FILES=( ["00_init-oran-smo-teiv-data.sql"]="01_init-teiv-exposure-data.sql"
@@ -39,7 +39,7 @@ mkdir -p "$TARGET_DIR"
 for OLD_NAME in "${!FILES[@]}"; do
     NEW_NAME="${FILES[$OLD_NAME]}"
     if [ -f "$SOURCE_DIR/$OLD_NAME" ]; then
-        sed "s/$PLACEHOLDER1/$REPLACEMENT1/g; s/$PLACEHOLDER2/$REPLACEMENT2/g" "$SOURCE_DIR/$OLD_NAME" > "${SOURCE_DIR}/${OLD_NAME}.tmp" && \
+        sed "s/$PLACEHOLDER1/$REPLACEMENT_VALUE/g; s/$PLACEHOLDER2/$REPLACEMENT2/g" "$SOURCE_DIR/$OLD_NAME" > "${SOURCE_DIR}/${OLD_NAME}.tmp" && \
         cp "${SOURCE_DIR}/${OLD_NAME}.tmp" "$TARGET_DIR/$NEW_NAME" && \
         echo "Replaced pguser in $OLD_NAME, copied and renamed $OLD_NAME to $NEW_NAME in $TARGET_DIR."
     else

diff --git a/pgsql-schema-generator/src/main/resources/scripts/00_init-oran-smo-teiv-data.sql b/pgsql-schema-generator/src/main/resources/scripts/00_init-oran-smo-teiv-data.sql
@@ -34,7 +34,7 @@ ALTER SCHEMA ties_data OWNER TO :pguser;
 SET default_tablespace = '';
 SET default_table_access_method = heap;
 
-SET ROLE :'pguser';
+SET ROLE :pguser;
 
 -- Function to create CONSTRAINT only if it does not exists
 CREATE OR REPLACE FUNCTION ties_data.create_constraint_if_not_exists (

diff --git a/pgsql-schema-generator/src/main/resources/scripts/01_init-oran-smo-teiv-model.sql b/pgsql-schema-generator/src/main/resources/scripts/01_init-oran-smo-teiv-model.sql
@@ -27,7 +27,7 @@ ALTER SCHEMA ties_model OWNER TO :pguser;
 SET default_tablespace = '';
 SET default_table_access_method = heap;
 
-SET ROLE :'pguser';
+SET ROLE :pguser;
 
 CREATE TABLE IF NOT EXISTS ties_model.execution_status (
     "schema" VARCHAR(127) PRIMARY KEY,

diff --git a/pgsql-schema-generator/src/main/resources/scripts/02_init-oran-smo-teiv-consumer-data.sql b/pgsql-schema-generator/src/main/resources/scripts/02_init-oran-smo-teiv-consumer-data.sql
@@ -26,7 +26,7 @@ ALTER SCHEMA ties_consumer_data OWNER TO :pguser;
 SET default_tablespace = '';
 SET default_table_access_method = heap;
 
-SET ROLE :'pguser';
+SET ROLE :pguser;
 
 CREATE TABLE IF NOT EXISTS ties_consumer_data."module_reference" (
     "name"            TEXT PRIMARY KEY,

diff --git a/...ema-generator/src/test/resources/expected-db-schema/result_00_init-oran-smo-teiv-data.sql b/...ema-generator/src/test/resources/expected-db-schema/result_00_init-oran-smo-teiv-data.sql
@@ -34,7 +34,7 @@ ALTER SCHEMA ties_data OWNER TO :pguser;
 SET default_tablespace = '';
 SET default_table_access_method = heap;
 
-SET ROLE :'pguser';
+SET ROLE :pguser;
 
 -- Function to create CONSTRAINT only if it does not exists
 CREATE OR REPLACE FUNCTION ties_data.create_constraint_if_not_exists (

diff --git a/...ma-generator/src/test/resources/expected-db-schema/result_01_init-oran-smo-teiv-model.sql b/...ma-generator/src/test/resources/expected-db-schema/result_01_init-oran-smo-teiv-model.sql
@@ -27,7 +27,7 @@ ALTER SCHEMA ties_model OWNER TO :pguser;
 SET default_tablespace = '';
 SET default_table_access_method = heap;
 
-SET ROLE :'pguser';
+SET ROLE :pguser;
 
 CREATE TABLE IF NOT EXISTS ties_model.execution_status (
     "schema" VARCHAR(127) PRIMARY KEY,

diff --git a/...ator/src/test/resources/expected-db-schema/result_02_init-oran-smo-teiv-consumer-data.sql b/...ator/src/test/resources/expected-db-schema/result_02_init-oran-smo-teiv-consumer-data.sql
@@ -26,7 +26,7 @@ ALTER SCHEMA ties_consumer_data OWNER TO :pguser;
 SET default_tablespace = '';
 SET default_table_access_method = heap;
 
-SET ROLE :'pguser';
+SET ROLE :pguser;
 
 CREATE TABLE IF NOT EXISTS ties_consumer_data."module_reference" (
     "name"            TEXT PRIMARY KEY,

diff --git a/teiv/pom.xml b/teiv/pom.xml
@@ -641,6 +641,31 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>3.0.0</version>
+                <executions>
+                    <execution>
+                        <id>run-pgsql-generator-jar</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>java</executable>
+                            <arguments>
+                                <argument>-jar</argument>
+                                <argument>${project.parent.basedir}/pgsql-schema-generator/target/pgsql-schema-generator-1.1.0.jar</argument>
+                                <argument>--yang-model.external.source=${project.basedir}/src/main/resources/models</argument>
+                                <argument>--schema.data.output=src/test/resources/pgsqlschema/00_init-oran-smo-teiv-data-v1.sql</argument>
+                                <argument>--schema.model.output=src/test/resources/pgsqlschema/01_init-oran-smo-teiv-model-v1.sql</argument>
+                                <argument>--schema.consumer-data.output=src/test/resources/pgsqlschema/02_init-oran-smo-teiv-consumer-data-v1.sql</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/teiv/src/test/resources/pgsqlschema/00_init-oran-smo-teiv-data-v1.sql b/teiv/src/test/resources/pgsqlschema/00_init-oran-smo-teiv-data-v1.sql
@@ -25,7 +25,16 @@ CREATE EXTENSION IF NOT EXISTS postgis;
 CREATE EXTENSION IF NOT EXISTS postgis_topology;
 CREATE EXTENSION IF NOT EXISTS pg_trgm;
 
+GRANT USAGE ON SCHEMA topology to :pguser;
+GRANT SELECT ON ALL SEQUENCES IN SCHEMA topology TO :pguser;
+GRANT SELECT ON ALL TABLES IN SCHEMA topology TO :pguser;
+
 CREATE SCHEMA IF NOT EXISTS ties_data;
+ALTER SCHEMA ties_data OWNER TO :pguser;
+SET default_tablespace = '';
+SET default_table_access_method = heap;
+
+SET ROLE :pguser;
 
 -- Function to create CONSTRAINT only if it does not exists
 CREATE OR REPLACE FUNCTION ties_data.create_constraint_if_not_exists (

diff --git a/teiv/src/test/resources/pgsqlschema/01_init-oran-smo-teiv-model-v1.sql b/teiv/src/test/resources/pgsqlschema/01_init-oran-smo-teiv-model-v1.sql
diff --git a/teiv/src/test/resources/pgsqlschema/02_init-oran-smo-teiv-consumer-data-v1.sql b/teiv/src/test/resources/pgsqlschema/02_init-oran-smo-teiv-consumer-data-v1.sql
@@ -22,6 +22,11 @@
 BEGIN;
 
 CREATE SCHEMA IF NOT EXISTS ties_consumer_data;
+ALTER SCHEMA ties_consumer_data OWNER TO :pguser;
+SET default_tablespace = '';
+SET default_table_access_method = heap;
+
+SET ROLE :pguser;
 
 CREATE TABLE IF NOT EXISTS ties_consumer_data."module_reference" (
     "name"            TEXT PRIMARY KEY,