Cleanup rApp sample package

Cleanup rapp-all package.

Issue-ID: NONRTRIC-930
Change-Id: I8c206b8385f1eb22a0a70edcd677465810cde035
Signed-off-by: aravind.est <aravindhan.a@est.tech>

diff --git a/rapp-manager-acm/src/test/resources/valid-rapp-package.csar b/rapp-manager-acm/src/test/resources/valid-rapp-package.csar
index 398a516..a0aa3b2 100755 (executable)
Binary files a/rapp-manager-acm/src/test/resources/valid-rapp-package.csar and b/rapp-manager-acm/src/test/resources/valid-rapp-package.csar differ

diff --git a/rapp-manager-application/src/test/resources/invalid-rapp-package.csar b/rapp-manager-application/src/test/resources/invalid-rapp-package.csar
index c9150f0..dc18b5b 100755 (executable)
Binary files a/rapp-manager-application/src/test/resources/invalid-rapp-package.csar and b/rapp-manager-application/src/test/resources/invalid-rapp-package.csar differ

diff --git a/rapp-manager-application/src/test/resources/valid-rapp-package.csar b/rapp-manager-application/src/test/resources/valid-rapp-package.csar
index b8b36e3..2bbc2ef 100755 (executable)
Binary files a/rapp-manager-application/src/test/resources/valid-rapp-package.csar and b/rapp-manager-application/src/test/resources/valid-rapp-package.csar differ

diff --git a/rapp-manager-dme/src/test/resources/valid-rapp-package-new-info-type.csar b/rapp-manager-dme/src/test/resources/valid-rapp-package-new-info-type.csar
index d858a67..1ab8ff9 100755 (executable)
Binary files a/rapp-manager-dme/src/test/resources/valid-rapp-package-new-info-type.csar and b/rapp-manager-dme/src/test/resources/valid-rapp-package-new-info-type.csar differ

diff --git a/rapp-manager-dme/src/test/resources/valid-rapp-package.csar b/rapp-manager-dme/src/test/resources/valid-rapp-package.csar
index 7400891..1b96b0b 100755 (executable)
Binary files a/rapp-manager-dme/src/test/resources/valid-rapp-package.csar and b/rapp-manager-dme/src/test/resources/valid-rapp-package.csar differ

diff --git a/rapp-manager-models/src/test/resources/invalid-rapp-package.csar b/rapp-manager-models/src/test/resources/invalid-rapp-package.csar
index c9150f0..c48da0f 100755 (executable)
Binary files a/rapp-manager-models/src/test/resources/invalid-rapp-package.csar and b/rapp-manager-models/src/test/resources/invalid-rapp-package.csar differ

diff --git a/rapp-manager-models/src/test/resources/valid-rapp-package.csar b/rapp-manager-models/src/test/resources/valid-rapp-package.csar
index 7400891..1b96b0b 100755 (executable)
Binary files a/rapp-manager-models/src/test/resources/valid-rapp-package.csar and b/rapp-manager-models/src/test/resources/valid-rapp-package.csar differ

diff --git a/rapp-manager-sme/src/test/resources/valid-rapp-package.csar b/rapp-manager-sme/src/test/resources/valid-rapp-package.csar
index b8b36e3..2bbc2ef 100755 (executable)
Binary files a/rapp-manager-sme/src/test/resources/valid-rapp-package.csar and b/rapp-manager-sme/src/test/resources/valid-rapp-package.csar differ

diff --git a/sample-rapp-generator/rapp-all/Files/ChangeLog.txt b/sample-rapp-generator/rapp-all/Files/ChangeLog.txt
deleted file mode 100755 (executable)
index bdcfb02..0000000
--- a/sample-rapp-generator/rapp-all/Files/ChangeLog.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is the first version of My ASD node.
\ No newline at end of file

diff --git a/sample-rapp-generator/rapp-all/Files/Events/MyASD_v1.yaml b/sample-rapp-generator/rapp-all/Files/Events/MyASD_v1.yaml
deleted file mode 100755 (executable)
index 90144cf..0000000
--- a/sample-rapp-generator/rapp-all/Files/Events/MyASD_v1.yaml
+++ /dev/null
@@ -1,213 +0,0 @@
----
-event:
-    presence: required
-    structure:
-        commonEventHeader:
-            presence: required
-            structure:
-                domain: {presence: required, value: notification}
-                eventName: {presence: required, value: Noti_MyPnf-Acme_FileReady}
-                priority: {presence: required, value: Normal}
-                eventId: {presence: required}
-                reportingEntityId: {presence: required}
-                reportingEntityName: {presence: required}
-                sequence: {presence: required, value: 0}
-                sourceId: {presence: required}
-                sourceName: {presence: required}
-                version: {presence: required, value: 4.0.1}
-                vesEventListenerVersion: {presence: required, value: 7.0.1}
-                startEpochMicrosec: {presence: required}
-                lastEpochMicrosec: {presence: required}
-        notificationFields:
-            presence: required
-            structure:
-                changeIdentifier: {presence: required, value: PM_MEAS_FILES}
-                changeType: {presence: required, value: fileReady}
-                notificationFieldsVersion: {presence: required, value: 2.0}
-                arrayOfNamedHashMap:
-                    presence: required
-                    array:
-                        - name: {presence: required}
-                          hashMap: {presence: required, structure: {
-                              keyValuePair: {presence: required, structure: {key: {presence: required, value: location}, value: {presence: required}}},
-                              keyValuePair: {presence: required, structure: {key: {presence: required, value: compression}, value: {presence: required, value: gzip}}},
-                              keyValuePair: {presence: required, structure: {key: {presence: required, value: fileFormatType}, value: {presence: required, value: org.3GPP.32.435}}},
-                              keyValuePair: {presence: required, structure: {key: {presence: required, value: fileFormatVersion}, value: {presence: required, value: V10}}}}
-                          }
-...
----
-event:
-    presence: required
-    structure:
-        commonEventHeader:
-            presence: required
-            structure:
-                domain: {presence: required, value: pnfRegistration}
-                eventId: {presence: required}
-                eventName: {presence: required, value: PnfReg_MyPnf-Acme_pnfRegistration}
-                lastEpochMicrosec: {presence: required}
-                priority: {presence: required, value: Normal}
-                reportingEntityName: {presence: required}
-                sequence: {presence: required, value: 0}
-                sourceName: {presence: required}
-                startEpochMicrosec: {presence: required}
-                timeZoneOffset: {presence: required}
-                version: {presence: required, value: 4.0.1}
-                vesEventListenerVersion: {presence: required, value: 7.0.1}
-        pnfRegistrationFields:
-            presence: required
-            structure:
-                modelNumber: {presence: required}
-                oamV4IpAddress: {presence: optional}
-                oamV6IpAddress: {presence: optional}
-                pnfRegistrationFieldsVersion: {presence: required, value: 2.0}
-                serialNumber: {presence: required}
-                softwareVersion: {presence: required}
-                unitFamily: {presence: required, value: BBU}
-                unitType: {presence: required}
-                vendorName: {presence: required, value: Acme}
-...
----
-event:
-    presence: required
-    action: [ any, any, null, null, null ]
-    comment: "
-        ALARM NAME: CertMAutomaticEnrollmentFailed,
-        ALARM DESCRIPTION: ‘See alarm OPI x/1111-ABC 123 4567/1 Uen’,
-        ALARM EFFECT: 'See alarm OPI x/2222-ABC 123 4567/1 Uen',
-        MANAGED OBJECT CLASSES: NodeCredential,
-        EVENT TYPE: 'PROCESSINGERRORALARM',
-        PROBABLE CAUSE: 'ConfigurationOrCustomizationError',
-        PROPOSED REPAIR ACTIONS: 'See alarm OPI x/3333-ABC 123 4567/1 Uen',
-        CLEARING TYPE: Automatic
-    "
-    structure:
-        commonEventHeader:
-            presence: required
-            structure:
-                version: {presence: required, value: 4.0.1}
-                vesEventListenerVersion: {presence: required, value: 7.0.1}
-                domain: {presence: required, value: fault}
-                eventName: {presence: required, value: Fault_MyPnf-Acme_CertMAutomaticEnrollmentFailed}
-                eventId: {presence: required}
-                sequence: {presence: required}
-                priority: {presence: required, value: Normal}
-                reportingEntityName: {presence: required}
-                sourceName: {presence: required}
-                nfVendorName: {presence: required, value: Acme}
-                startEpochMicrosec: {presence: required}
-                lastEpochMicrosec: {presence: required}
-                timeZoneOffset: {presence: required}
-        faultFields:
-            presence: required
-            structure:
-                faultFieldsVersion: {presence: required, value: 4.0}
-                alarmCondition: {presence: required, value: 'CertMAutomaticEnrollmentFailed'}
-                eventCategory: {presence: required, value: 'PROCESSINGERRORALARM'}
-                eventSourceType: {presence: required}
-                specificProblem: {presence: required, value: 'Certificate Management Automatic Enrollment Failed'}
-                eventSeverity: {presence: required}
-                vfStatus: {presence: required, value: Active}
-                alarmAdditionalInformation: {presence: required, structure: {
-                    keyValuePair: {presence: required, structure: {key: {presence: required, value: source}, value: {presence: required}}},
-                    keyValuePair: {presence: required, structure: {key: {presence: required, value: probableCause}, value: {presence: required, value: 'ConfigurationOrCustomizationError'}}},
-                    keyValuePair: {presence: required, structure: {key: {presence: required, value: additionalText}, value: {presence: optional}}},
-                    keyValuePair: {presence: required, structure: {key: {presence: required, value: additionalInfo}, value: {presence: optional}}}}
-                }
-...
----
-event:
-    presence: required
-    action: [ any, any, null, null, null ]
-    comment: "
-        ALARM NAME: PowerLoss,
-        ALARM DESCRIPTION: 'PNF is losing power',
-        ALARM EFFECT: 'PNF will shutdown if battery is drained',
-        MANAGED OBJECT CLASSES: 'BatteryBackup;BatteryUnit',
-        EVENT TYPE: 'EQUIPMENTALARM',
-        PROBABLE CAUSE: 'Power Supply Failure',
-        PROPOSED REPAIR ACTIONS: 'Repair Power Supply',
-        CLEARING TYPE: Automatic
-    "
-    structure:
-        commonEventHeader:
-            presence: required
-            structure:
-                version: {presence: required, value: 4.0.1}
-                vesEventListenerVersion: {presence: required, value: 7.0.1}
-                domain: {presence: required, value: fault}
-                eventName: {presence: required, value: Fault_MyPnf-Acme_PowerLoss}
-                eventId: {presence: required}
-                sequence: {presence: required}
-                priority: {presence: required, value: Normal}
-                reportingEntityName: {presence: required}
-                sourceName: {presence: required}
-                nfVendorName: {presence: required, value: Acme}
-                startEpochMicrosec: {presence: required}
-                lastEpochMicrosec: {presence: required}
-                timeZoneOffset: {presence: required}
-        faultFields:
-            presence: required
-            structure:
-                faultFieldsVersion: {presence: required, value: 4.0}
-                alarmCondition: {presence: required, value: 'PowerLoss'}
-                eventCategory: {presence: required, value: 'EQUIPMENTALARM'}
-                eventSourceType: {presence: required}
-                specificProblem: {presence: required, value: 'Power Supply Failure'}
-                eventSeverity: {presence: required}
-                vfStatus: {presence: required, value: Active}
-                alarmAdditionalInformation: {presence: required, structure: {
-                    keyValuePair: {presence: required, structure: {key: {presence: required, value: source}, value: {presence: required}}},
-                    keyValuePair: {presence: required, structure: {key: {presence: required, value: probableCause}, value: {presence: required, value: 'Power Supply Failure'}}},
-                    keyValuePair: {presence: required, structure: {key: {presence: required, value: additionalText}, value: {presence: optional}}},
-                    keyValuePair: {presence: required, structure: {key: {presence: required, value: additionalInfo}, value: {presence: optional}}}}
-                }
-...
----
-event:
-    presence: required
-    action: [ any, any, null, null, null ]
-    comment: "
-        ALARM NAME: LogHasReachedFullCapacity,
-        ALARM DESCRIPTION: 'Log Has Reached Full Capacity',
-        ALARM EFFECT: 'See alarm OPI x/2223-ABC 123 4567/1 Uen',
-        MANAGED OBJECT CLASSES: Log,
-        EVENT TYPE: 'PROCESSINGERRORALARM',
-        PROBABLE CAUSE: 'FileError',
-        PROPOSED REPAIR ACTIONS: 'See alarm OPI x/3334-ABC 123 4567/1 Uen',
-        CLEARING TYPE: Automatic
-    "
-    structure:
-        commonEventHeader:
-            presence: required
-            structure:
-                version: {presence: required, value: 4.0.1}
-                vesEventListenerVersion: {presence: required, value: 7.0.1}
-                domain: {presence: required, value: fault}
-                eventName: {presence: required, value: Fault_MyPnf-Acme_LogHasReachedFullCapacity}
-                eventId: {presence: required}
-                sequence: {presence: required}
-                priority: {presence: required, value: Normal}
-                reportingEntityName: {presence: required}
-                sourceName: {presence: required}
-                nfVendorName: {presence: required, value: Acme}
-                startEpochMicrosec: {presence: required}
-                lastEpochMicrosec: {presence: required}
-                timeZoneOffset: {presence: required}
-        faultFields:
-            presence: required
-            structure:
-                faultFieldsVersion: {presence: required, value: 4.0}
-                alarmCondition: {presence: required, value: 'LogHasReachedFullCapacity'}
-                eventCategory: {presence: required, value: 'PROCESSINGERRORALARM'}
-                eventSourceType: {presence: required}
-                specificProblem: {presence: required, value: 'Log Has Reached Full Capacity'}
-                eventSeverity: {presence: required}
-                vfStatus: {presence: required, value: Active}
-                alarmAdditionalInformation: {presence: required, structure: {
-                    keyValuePair: {presence: required, structure: {key: {presence: required, value: source},value: {presence: required}}},
-                    keyValuePair: {presence: required, structure: {key: {presence: required, value: probableCause},value: {presence: required, value: 'FileError'}}},
-                    keyValuePair: {presence: required, structure: {key: {presence: required, value: additionalText},value: {presence: optional}}},
-                    keyValuePair: {presence: required, structure: {key: {presence: required, value: additionalInfo},value: {presence: optional}}}}
-                }
-...
\ No newline at end of file

diff --git a/sample-rapp-generator/rapp-all/Files/Measurements/PM_Dictionary.yaml b/sample-rapp-generator/rapp-all/Files/Measurements/PM_Dictionary.yaml
deleted file mode 100755 (executable)
index 858951f..0000000
--- a/sample-rapp-generator/rapp-all/Files/Measurements/PM_Dictionary.yaml
+++ /dev/null
@@ -1,186 +0,0 @@
-pmDictionary:
-    presence: required
-    structure:
-        pmDictionaryHeader:
-            presence: required
-            structure:
-                pmDefVsn: { presence: required, comment: "Version of the PM Dictionary. Version is vendor defined."}
-                pmDefSchemaVsn: { presence: required, comment: "Version of the PM Dictionary Schema used for this PM Dictionary. Schema versions are specified in the VES Specifications."}
-                nfType: { presence: required, comment: "NF type to whom this PM Dictionary applies. nfType is vendor defined and should match the string used in eventName."}
-                vendor: { presence: required, value: Acme, comment: "Vendor of the NF type to whom this PM Dictionary applies."}
-        pmDictionaryMeasurements:
-            presence: required
-            array:
-                - measType: { presence: required, comment: "Measurement name used in PM file, in 3GPP format where specified, else vendor defined. Names for 3GPP-defined 4G measurements are specified in 3GPP TS 32.425 item e). Names for 3GPP-defined 5G measurements are specified in 3GPP TS 28.552 item e). Vendor defined names are preceded with VS."}
-                  measDescription: { presence: required, comment: "Text description of the purpose of the measurement, what information does the measurement provide. Descriptions for 3GPP-defined 4G measurements are specified in 3GPP TS 32.425 item a). Descriptions for 3GPP-defined 5G measurements are specified in 3GPP TS 28.552 item a). Vendors are free to augment or modify the 3GPP-provided descriptions to more accurately describe their measurements as needed."}
-                  measCondition: { presence: required, comment: "Text description of the condition that causes the measurement to be updated. Conditions for 3GPP-defined 4G measurements are specified in 3GPP TS 32.425 item c). Conditions for 3GPP-defined 5G measurements are specified in 3GPP TS 28.552 item c). Vendors are free to augment or modify the 3GPP-provided conditions to more accurately describe their measurements as needed."}
-                  measResultType: { presence: required, value: [integer], comment: "Data type of the measurement result. Result data types for 3GPP-defined 4G measurements are specified in 3GPP TS 32.425 item d). Result data types for 3GPP-defined 5G measurements are specified in 3GPP TS 28.552 item d). The measResultType values supported by a vendor are specified in the PM Dictionary YAML using the 'value' attribute and may include vendor-defined data types not specified by 3GPP; for example boolean."}
-                  measResultRange: { presence: optional, comment: "Range for the measurement result. The range is specified as a comma separated list of discrete values or a range of values specified as minimum value-maximum value with no spaces. Result ranges for 3GPP-defined 4G measurements are specified in 3GPP TS 32.425 item d) if applicable. Result ranges for 3GPP-defined 5G measurements are specified in 3GPP TS 28.552 item d) if applicable. "}
-                  measResultUnits: { presence: required, value: [seconds, minutes, nanoseconds, microseconds, kbps], comment: "Unit of measure for the result; e.g. milliseconds, bytes, kilobytes, packets, number. Unit of measure for 3GPP-defined 4G measurements are specified in 3GPP TS 32.425 item d) if applicable. Unit of measure for 3GPP-defined 5G measurements are specified in 3GPP TS 28.552 item d) if applicable. The measResultsUnits values supported by a vendor are specified in the PM Dictionary YAML using the 'value' attribute and may include vendor-defined units of measure not specified by 3GPP; for example ethernet frames."}
-                  measObjClass: { presence: required, value: [NRCellCU, NRCellDU, NRBTS, IPNO, ETHIF], comment: "Measurement Object Class. Object classes for 3GPP-defined 4G measurements are specified in 3GPP TS 32.425 item f). Object classes for 3GPP-defined 5G measurements are specified in 3GPP TS 28.552 item f). The measObjClass values supported by a vendor are specified in the PM Dictionary YAML using the “value” attribute and may include vendor-defined objects not specified by 3GPP; for example IPSEC."}
-                  measCollectionMethod: { presence: required, value: [CC, GUAGE, DER, SI], comment: "Collection Method for the measurement. 3GPP-defined collection methods are CC, SI, DER and Gauge. Collection Methods for 3GPP-defined 4G measurements are specified in 3GPP TS 32.425 item b). Collection Methods for 3GPP-defined 5G measurements are specified in 3GPP TS 28.552 item c). The measCollectionMethod values supported by a vendor are specified in the PM Dictionary YAML using the 'value' attribute and may include vendor-defined collection methods not specified by 3GPP; for example Average."}
-                  measLastChange: { presence: required, comment: "PM Dictionary version the last time this measurement was changed, added or deleted."}
-                  measChangeType: { presence: required, value: [added, modified, deleted], comment: "For the measLastChange, indicates the type of change made for this measurement. Valid values are added, modified or deleted. Deleted measurements may be kept in the PM Dictionary for one release or more or permanently for historical purposes, if desired."}
-                  measInfoId: { presence: required, comment: "Name for a group of related measurements, in 3GPP format where specified, else vendor defined. Family names for 3GPP-defined 4G measurements are specified in 3GPP TS 32.425 Section 3.1. Family names for 3GPP-defined 5G measurements are specified in 3GPP TS 28.552 Section 3.4."}
-                  measFamily: { presence: required, comment: "Abbreviation for a family of measurements, in 3GPP format where specified, else vendor defined. Family name abbreviations for 3GPP-defined 4G measurements are specified in 3GPP TS 32.425 Section 3.1. Family name abbreviations for 3GPP-defined 5G measurements are specified in 3GPP TS 28.552 Section 3.4. "}
-                  measAdditionalFields: { presence: required, comment: "Hashmap of vendor specific PM Dictionary fields in key value pair format.", structure: {
-                      keyValuePair: { presence: required, structure: { key: { presence: required, value: measurementStatus, comment: "Contains the status of the measurement."}, value: { presence: required, value: [USED, DEPRECATED, OBSOLETE, PRELIMINARY] }}},
-                      keyValuePair: { presence: required, structure: { key: { presence: required, value: initialValue, comment: "The initial value to which the Measurement Type is set at the beginning of a new granularity period."}, value: { presence: required }}},
-                      keyValuePair: { presence: required, structure: { key: { presence: required, value: acmeParameter1, comment: "Extra vendor specific parameter 1."}, value: { presence: required }}},
-                      keyValuePair: { presence: optional, structure: { key: { presence: required, value: acmeParameter2, comment: "Extra vendor specific parameter 2."}, value: { presence: required, value: [true, false] }}},
-                      keyValuePair: { presence: optional, structure: { key: { presence: required, value: acmeParameter3, comment: "Extra vendor specific parameter 3."}, value: { presence: required }}}}
-                  }
----
-pmDictionary:
-    pmDictionaryHeader:
-        pmDefVsn: AcmeNumber.1.0
-        pmDefSchemaVsn: 1.0
-        nfType: myPnf
-        vendor: Acme
-    pmDictionaryMeasurements:
-
-    -   measType: DRB.UEThpDl
-        measDescription: Average DL UE throughput in gNB
-        measCondition: See 3GPP TS 28.552
-        measResultType: integer
-        measResultRange: 0-4294967295
-        measResultUnits: kbps
-        measObjClass: NRCellDU
-        measCollectionMethod: DER
-        measLastChange: 1.0
-        measChangeType: added
-        measInfoId: "Data Radio Bearer"
-        measFamily: DRB
-        measAdditionalFields: {
-            "measurementStatus": "USED",
-            "initialValue": 0,
-            "acmeParameter1": 0,
-            "acmeParameter2": true,
-            "acmeParameter3": "acmeParameterValue3"}
-            
-    -   measType: VS.ifInDiscards    
-        measDescription: The number of inbound packets which were chosen to be discarded
-        measCondition: The number of inbound packets which were chosen to be
-            discarded even though no errors had been detected to prevent
-            their being deliverable to a higher-layer protocol.  One
-            possible reason for discarding such a packet could be to
-            free up buffer space.
-            Discontinuities in the value of this counter can occur at
-            re-initialization of the management system, and at other
-            times as indicated by the value of
-            ifCounterDiscontinuityTime.
-        measResultType: integer
-        measResultRange: 0-4294967295
-        measResultUnits: number
-        measObjClass: EthernetPort
-        measCollectionMethod: CC
-        measLastChange: 1.0
-        measChangeType: added
-        measInfoId: "IP Management"
-        measFamily: IP
-        measAdditionalFields: {
-            "measurementStatus": "USED",
-            "initialValue": 0,
-            "acmeParameter1": 0,
-            "acmeParameter2": true,
-            "acmeParameter3": "acmeParameterValue3"}
-
-    -   measType: VS.ifInErrors
-        measDescription: Number of inbound packets that contained errors
-        measCondition: For packet-oriented interfaces, the number of inbound
-            packets that contained errors preventing them from being
-            deliverable to a higher-layer protocol.  For character-
-            oriented or fixed-length interfaces, the number of inbound
-            transmission units that contained errors preventing them
-            from being deliverable to a higher-layer protocol.
-        measResultType: integer
-        measResultRange: 0-4294967295
-        measResultUnits: number
-        measObjClass: EthernetPort
-        measCollectionMethod: Gauge
-        measLastChange: 1.0
-        measChangeType: added
-        measInfoId: "IP Management"
-        measFamily: IP
-        measAdditionalFields: {
-            "measurementStatus": "USED",
-            "initialValue": 0,
-            "acmeParameter1": 0,
-            "acmeParameter3": "acmeParameterValue3"}
-
-    -   measType: VS.ifInUnknownProtos
-        measDescription: Number of inbound packets received via an unknown or usupported protocol
-        measCondition: For packet-oriented interfaces, the number of packets
-            received via the interface which were discarded because of
-            an unknown or unsupported protocol.  For character-oriented
-            or fixed-length interfaces that support protocol
-            multiplexing the number of transmission units received via
-            the interface which were discarded because of an unknown or
-            unsupported protocol.  For any interface that does not
-            support protocol multiplexing, this counter will always be
-            0.
-        measResultType: integer
-        measResultRange: 0-4294967295
-        measResultUnits: number
-        measObjClass: EthernetPort
-        measCollectionMethod: CC
-        measLastChange: 1.0
-        measChangeType: added
-        measInfoId: "IP Management"
-        measFamily: IP
-        measAdditionalFields: {
-            "measurementStatus": "USED",
-            "initialValue": 0,
-            "acmeParameter1": 0,
-            "acmeParameter2": true}
-
-    -   measType: VS.ifHCInBroadcastPkts
-        measDescription: Number of the broadcasted inbound packets delivered to the higher (sub-)layer
-        measCondition: The number of packets, delivered by this sub-layer to a
-            higher (sub-)layer, which were addressed to a broadcast
-            address at this sub-layer. This object is a 64-bit version
-            of ifInBroadcastPkts.
-            Discontinuities in the value of this counter can occur at
-            re-initialization of the management system, and at other
-            times as indicated by the value of
-            ifCounterDiscontinuityTime.
-        measResultType: integer
-        measResultRange: 0-4294967295
-        measResultUnits: number
-        measObjClass: EthernetPort
-        measCollectionMethod: CC
-        measLastChange: 1.0
-        measChangeType: added
-        measInfoId: "IP Management"
-        measFamily: IP
-        measAdditionalFields: {
-            "measurementStatus": "USED",
-            "initialValue": 0,
-            "acmeParameter1": 0}
-
-    -   measType: VS.ifHCOutBroadcastPkts
-        measDescription: Number of the broadcasted outsbound packets delivered to the higher (sub-)layer
-        measCondition: The total number of packets that higher-level protocols
-            requested be transmitted, and which were addressed to a
-            broadcast address at this sub-layer, including those that
-            were discarded or not sent.  This object is a 64-bit version
-            of ifOutBroadcastPkts.
-            Discontinuities in the value of this counter can occur at
-            re-initialization of the management system, and at other
-            times as indicated by the value of
-            ifCounterDiscontinuityTime.
-        measResultType: integer
-        measResultRange: 0-4294967295
-        measResultUnits: number
-        measObjClass: EthernetPort
-        measCollectionMethod: CC
-        measLastChange: 1.0
-        measChangeType: added
-        measInfoId: "IP Management"
-        measFamily: IP
-        measAdditionalFields: {
-            "measurementStatus": "USED",
-            "initialValue": 0,
-            "acmeParameter1": 0,
-            "acmeParameter2": true,
-            "acmeParameter3": "acmeParameterValue3"}

diff --git a/sample-rapp-generator/rapp-all/Files/Scripts/my_script.sh b/sample-rapp-generator/rapp-all/Files/Scripts/my_script.sh
deleted file mode 100755 (executable)
index 79b3155..0000000
--- a/sample-rapp-generator/rapp-all/Files/Scripts/my_script.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-echo "I'm simply an example script file in the package that doesn't do anything!"
\ No newline at end of file

diff --git a/sample-rapp-generator/rapp-all/Files/Yang_module/mynetconf.yang b/sample-rapp-generator/rapp-all/Files/Yang_module/mynetconf.yang
deleted file mode 100755 (executable)
index 56501e8..0000000
--- a/sample-rapp-generator/rapp-all/Files/Yang_module/mynetconf.yang
+++ /dev/null
@@ -1,26 +0,0 @@
-module mynetconf {
-  yang-version 1.1;
-  namespace "urn:mynetconf:test";
-
-  prefix nft;
-
-  organization "mynetconf";
-  contact "my netconf address";
-  description "yang model for mynetconf";
-  revision "2019-03-01"{
-    description "initial version";
-  }
-
-  container netconflist{
-    list netconf{
-      key netconf-id;
-      leaf netconf-id{
-        type uint16;
-      }
-      leaf netconf-param {
-        type uint32;
-      }
-    }
-
-  }
-}

diff --git a/sample-rapp-generator/rapp-all/Files/rapp1/rapp.zip b/sample-rapp-generator/rapp-all/Files/rapp1/rapp.zip
deleted file mode 100755 (executable)
index 6409765..0000000
Binary files a/sample-rapp-generator/rapp-all/Files/rapp1/rapp.zip and /dev/null differ

diff --git a/sample-rapp-generator/rapp-all/HELM/free5gc-1.1.3.tgz b/sample-rapp-generator/rapp-all/HELM/free5gc-1.1.3.tgz
deleted file mode 100755 (executable)
index df0a584..0000000
Binary files a/sample-rapp-generator/rapp-all/HELM/free5gc-1.1.3.tgz and /dev/null differ

diff --git a/sample-rapp-generator/rapp-all/HELM/ueransim-2.0.14.tgz b/sample-rapp-generator/rapp-all/HELM/ueransim-2.0.14.tgz
deleted file mode 100755 (executable)
index bc9dec2..0000000
Binary files a/sample-rapp-generator/rapp-all/HELM/ueransim-2.0.14.tgz and /dev/null differ

diff --git a/sample-rapp-generator/rapp-all/TOSCA-Metadata/TOSCA.meta b/sample-rapp-generator/rapp-all/TOSCA-Metadata/TOSCA.meta
index 3325e34..ed2919e 100755 (executable)
--- a/sample-rapp-generator/rapp-all/TOSCA-Metadata/TOSCA.meta
+++ b/sample-rapp-generator/rapp-all/TOSCA-Metadata/TOSCA.meta
@@ -1,5 +1,5 @@
 TOSCA-Meta-File-Version: 1.0\r
 CSAR-Version: 1.0\r
 TOSCA-Meta-File-Version: 1.0\r
 CSAR-Version: 1.0\r

-Created-By: Ericsson (Zu Qiang 2021-10-21)\r
+Created-By: EST\r

 Entry-Definitions: Definitions/asd.yaml\r
 ETSI-Entry-Manifest: asd.mf
\ No newline at end of file
 Entry-Definitions: Definitions/asd.yaml\r
 ETSI-Entry-Manifest: asd.mf
\ No newline at end of file

diff --git a/sample-rapp-generator/rapp-all/asd.mf b/sample-rapp-generator/rapp-all/asd.mf
index 09818fc..a63de54 100755 (executable)
--- a/sample-rapp-generator/rapp-all/asd.mf
+++ b/sample-rapp-generator/rapp-all/asd.mf
@@ -1,22 +1,14 @@
 metadata:\r
 metadata:\r

-  application_name: Free5gc-APP\r
-  application_provider: MyCompany\r
-  release_date_time: 2021-10-21T11:30:00+05:00\r
+  application_name: rapp-all\r
+  application_provider: EST\r
+  release_date_time: 2024-01-12T11:30:00+00:00\r

   entry_definition_type: asd\r
 \r
 Source: asd.mf\r
 Source: Definitions/asd.yaml\r
 Source: Definitions/asd_types.yaml\r
   entry_definition_type: asd\r
 \r
 Source: asd.mf\r
 Source: Definitions/asd.yaml\r
 Source: Definitions/asd_types.yaml\r

-Source: Files/ChangeLog.txt\r
-Source: Files/Events/MyASD_v1.yaml\r

 Source: Files/Guides/user_guide.txt\r
 Source: Files/Guides/user_guide.txt\r

-Source: Files/Measurements/PM_Dictionary.yaml\r
-Source: Files/Scripts/my_script.sh\r
-Source: Files/Yang_module/mynetconf.yang\r

 Source: TOSCA-Metadata/TOSCA.meta\r
 Source: TOSCA-Metadata/TOSCA.meta\r

-Source: Artifacts/Deployment/HELM/free5gc-1.1.3.tgz\r
-Source: Artifacts/Deployment/HELM/ueransim-2.0.14.tgz\r
-Source: Files/rapp1/rapp.zip\r

 Source: Files/Acm/definition/compositions.json\r
 Source: Files/Acm/instances/a1pms-instance.json\r
 Source: Files/Acm/instances/k8s-instance.json\r
 Source: Files/Acm/definition/compositions.json\r
 Source: Files/Acm/instances/a1pms-instance.json\r
 Source: Files/Acm/instances/k8s-instance.json\r


@@ -37,16 +29,5 @@ Source: Files/Sme/serviceapis/api-set-1.json
 Source: Files/Sme/serviceapis/api-set-2.json\r
 \r
 non_mano_artifact_sets:\r
 Source: Files/Sme/serviceapis/api-set-2.json\r
 \r
 non_mano_artifact_sets:\r

-    onap_ves_events:\r
-        Source: Files/Events/MyASD_v1.yaml\r
-    onap_pm_dictionary:\r
-        Source: Files/Measurements/PM_Dictionary.yaml\r
-    onap_yang_modules:\r
-        Source: Files/Yang_module/mynetconf.yang\r

     onap_others:\r
         Source: Files/Guides/user_guide.txt\r
     onap_others:\r
         Source: Files/Guides/user_guide.txt\r

-    onap_vendor_artifacts:\r
-        vendor_name: Ericsson\r
-        artifact_type: rApp_name1\r
-        source:Files/rapp1/rapp.zip\r
-\r