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

2 files changed, 3 insertions, 42 deletions

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