Merge "Fixed names to follow reqs for helm based packages"

5 files changed, 11 insertions, 45 deletions

diff --git a/doc/files/A1-PE-CNF.postman_environment.json b/doc/files/A1-PE-CNF.postman_environment.json
index e12afc4..7a9560f 100644
--- a/doc/files/A1-PE-CNF.postman_environment.json
+++ b/doc/files/A1-PE-CNF.postman_environment.json
@@ -8,6 +8,11 @@
       "enabled": true
     },
     {
+      "key": "managed_k8s",
+      "value": "",
+      "enabled": true
+    },
+    {
       "key": "catalogdb-port",
       "value": "",
       "enabled": true
diff --git a/operations/a1-pe-sim-packages/csar-resource.xml b/operations/a1-pe-sim-packages/csar-resource.xml
index 352145d..d32e345 100644
--- a/operations/a1-pe-sim-packages/csar-resource.xml
+++ b/operations/a1-pe-sim-packages/csar-resource.xml
@@ -31,9 +31,9 @@
   </fileSets>
   <files>
     <file>
-      <source>target/oran-sim-helm.tar.gz</source>
+      <source>target/simulator.tar.gz</source>
       <outputDirectory>/</outputDirectory>
-      <destName>o-ran-simulator_cloudtech_k8s_charts.tgz</destName>
+      <destName>helm_simulator.tgz</destName>
     </file>
     <file>
       <source>target/oran-sim-cba.zip</source>
diff --git a/operations/a1-pe-sim-packages/pom.xml b/operations/a1-pe-sim-packages/pom.xml
index 8d12b8b..b575f34 100644
--- a/operations/a1-pe-sim-packages/pom.xml
+++ b/operations/a1-pe-sim-packages/pom.xml
@@ -45,7 +45,7 @@
                             <goal>single</goal>
                         </goals>
                         <configuration>
-                            <finalName>oran-sim-helm</finalName>
+                            <finalName>simulator</finalName>
                             <appendAssemblyId>false</appendAssemblyId>
                             <descriptors>
                                 <descriptor>helm-resource.xml</descriptor>
diff --git a/operations/a1-pe-sim-packages/resources/oran-sim-csar/MANIFEST.json b/operations/a1-pe-sim-packages/resources/oran-sim-csar/MANIFEST.json
index 2ab6a85..0159023 100644
--- a/operations/a1-pe-sim-packages/resources/oran-sim-csar/MANIFEST.json
+++ b/operations/a1-pe-sim-packages/resources/oran-sim-csar/MANIFEST.json
@@ -7,13 +7,9 @@
       "type": "CONTROLLER_BLUEPRINT_ARCHIVE"
     },
     {
-      "file": "o-ran-simulator.yml",
-      "type": "HEAT",
-      "isBase": "true"
-    },
-    {
-      "file": "o-ran-simulator_cloudtech_k8s_charts.tgz",
-      "type": "CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT"
+      "file": "helm_simulator.tgz",
+      "isBase": true,
+      "type": "HELM"
     }
   ]
 }
diff --git a/operations/a1-pe-sim-packages/resources/oran-sim-csar/o-ran-simulator.yml b/operations/a1-pe-sim-packages/resources/oran-sim-csar/o-ran-simulator.yml
deleted file mode 100644
index 93bbcfa..0000000
--- a/operations/a1-pe-sim-packages/resources/oran-sim-csar/o-ran-simulator.yml
+++ /dev/null
@@ -1,35 +0,0 @@
----
-heat_template_version: 2017-02-24
-description: "O-RAN Simulator Dummy Heat"
-parameters:
-  vnf_name:
-    type: string
-    description: VNF Name (provided by ONAP)
-  vnf_id:
-    type: string
-    description: VNF ID (provided by ONAP)
-  vf_module_id:
-    type: string
-    description: VF Module ID (provided by ONAP)
-  skip_post_instantiation_configuration:
-    type: boolean
-    default: false
-  sdnc_model_name:
-    type: string
-    default: a1_pe_simulator
-  sdnc_model_version:
-    type: string
-    default: 1.3.2
-  sdnc_artifact_name:
-    type: string
-    default: vnf
-  controller_actor:
-    type: string
-    default: CDS
-resources:
-  dummy_node:
-    type: OS::Nova::Server
-    properties:
-      name: dummy
-      image: dummy
-      flavor: dummy