X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=sample-rapp-generator%2Frapp-all%2FDefinitions%2Fasd.yaml;h=e369010b67c30a874a5e3ba0904a111491863f99;hb=509ba7b8570f02caefb8212a2254302ba33e5add;hp=39ce4ed5fad5c60aef3a799209a183c45fc67546;hpb=c8d173152d53450283b8a0f77f4644d315e57a91;p=nonrtric%2Fplt%2Frappmanager.git

diff --git a/sample-rapp-generator/rapp-all/Definitions/asd.yaml b/sample-rapp-generator/rapp-all/Definitions/asd.yaml
index 39ce4ed..e369010 100755
--- a/sample-rapp-generator/rapp-all/Definitions/asd.yaml
+++ b/sample-rapp-generator/rapp-all/Definitions/asd.yaml
@@ -1,6 +1,6 @@
 tosca_definitions_version: tosca_simple_yaml_1_2
 
-description: First drop of free5gc and ueransim ASD
+description: rApp all
 
 imports:
   - asd_types.yaml
@@ -9,104 +9,26 @@ topology_template:
   node_templates:
    applicationServiceDescriptor:
       type: tosca.nodes.asd
-      description: "Free5gc"
+      description: "rapp-all"
       properties:
         descriptor_id: 123e4567-e89b-12d3-a456-426614174000
         descriptor_invariant_id: 123e4yyy-e89b-12d3-a456-426614174abc
         descriptor_version: 1.0
         schema_version: 2.0
-        function_description: free5gc description
+        function_description: rApp description
         provider: EST
-        application_name: free5gc-app
-        application_version: 2.3
-        ext_cpds:
-          - id: 1
-            description: webpage-service
-            virtual_link_requirement: endUser
-            network_interface_realization_requirements:
-              trunk_mode: false
-              ipam: orchestrated
-              interface_type: direct.userdriver
-              interface_option:
-                - virtio
-                - memif
-              interface_redundancy: actPassBond
-              nic_options:
-                - nic id1
-                - nic id2
-            input_param_mappings:
-              loadbalancer_IP: 1.2.3.4
-              external_IPs:
-                - 5.6.7.8
-                - 10.11.12.13
-              nad_names:
-                - nad name 1
-                - nad name 2
-              nad_namespace: myNamespace
-            resource_mapping: my resource manifest
-          - id: 2
-            description: transactionAPI
-            virtual_link_requirement: backhaul
-            network_interface_realization_requirements:
-              trunk_mode: true
-              ipam: orchestrated
-              interface_type: direct.userdriver
-              interface_option:
-                - virtio
-              interface_redundancy: actPassBond
-              nic_options:
-                - nic id3
-                - nic id4
-            input_param_mappings:
-              loadbalancer_IP: 192.168.1.0
-              external_IPs:
-                - 192.168.1.1
-                - 192.168.1.2
-              nad_names:
-                - nad name 3
-                - nad name 4
-              nad_namespace: myNamespace2
-            resource_mapping: my resource manifest
-        enhanced_cluster_capabilities:
-          min_kernel_version: 1.2.3
-          required_kernel_modules:
-            - ip6_tables
-            - cryptd
-          conflicting_kernel_modules:
-            - nf_nat
-          required_custom_resources:
-            - kind: myKind
-              api_version: myVersion
-            - kind: mySecondKind
-              api_version: mySecondVersion
-          cluster_labels:
-            - label 1
-            - label 2
-          required_plugin:
-            - name: plugin1Name
-              version: 1.2.3
-            - name: plugin2Name
-              version: 4.5.6
+        application_name: rapp-all
+        application_version: 1.0
       artifacts:
-        free5gc:
+        ransliceassurance:
           type: tosca.artifacts.asd.deploymentItem
-          file: "Artifacts/Deployment/HELM/free5gc-1.1.3.tgz"
+          file: "Artifacts/Deployment/HELM/ransliceassurance-1.0.0.tgz"
           properties:
             artifact_type: "helm_chart"
             itemId: 1
-            deployment_order: 1
-            lifecycle_parameters:
-              - ".Values.global.n2network.masterIf"
-              - ".Values.global.n3network.masterIf"
-              - ".Values.global.n4network.masterIf"
-              - ".Values.global.n6network.masterIf"
-        ueransim-free5gc:
+        oru-app:
           type: tosca.artifacts.asd.deploymentItem
-          file: "Artifacts/Deployment/HELM/ueransim-2.0.14.tgz"
+          file: "Artifacts/Deployment/HELM/orufhrecovery-1.0.0.tgz"
           properties:
             artifact_type: "helm_chart"
             itemId: 2
-            deployment_order: 2
-            lifecycle_parameters:
-              - ".Values.global.n2network.masterIf"
-              - ".Values.global.n3network.masterIf"