Merge "Update docs OAM architecture diagram"
authorMartin Skorupski <martin.skorupski@highstreet-technologies.com>
Sat, 17 Apr 2021 06:32:30 +0000 (06:32 +0000)
committerGerrit Code Review <gerrit@o-ran-sc.org>
Sat, 17 Apr 2021 06:32:30 +0000 (06:32 +0000)
217 files changed:
.gitignore
distribution/README.md [deleted file]
distribution/nonrtric-o1-controller-frankfurt/pom.xml [deleted file]
distribution/nonrtric-o1-controller-frankfurt/src/main/docker/Dockerfile [deleted file]
distribution/nonrtric-o1-controller-frankfurt/src/main/scripts/TagVersion.groovy [deleted file]
distribution/nonrtric-o1-controller/pom.xml [deleted file]
distribution/nonrtric-o1-controller/src/main/docker/Dockerfile [deleted file]
distribution/nonrtric-o1-controller/src/main/scripts/TagVersion.groovy [deleted file]
distribution/nonrtric-o1-controller/src/main/yaml/.env [deleted file]
distribution/nonrtric-o1-controller/src/main/yaml/docker-compose.yml [deleted file]
distribution/pom.xml [deleted file]
features/.gitignore [deleted file]
features/README.md [deleted file]
features/devicemanager/g-ran/ru-fh/feature/pom.xml [deleted file]
features/devicemanager/g-ran/ru-fh/installer/pom.xml [deleted file]
features/devicemanager/g-ran/ru-fh/installer/src/assembly/assemble_mvnrepo_zip.xml [deleted file]
features/devicemanager/g-ran/ru-fh/model/pom.xml [deleted file]
features/devicemanager/g-ran/ru-fh/pom.xml [deleted file]
features/devicemanager/g-ran/ru-fh/provider/copyright [deleted file]
features/devicemanager/g-ran/ru-fh/provider/pom.xml [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/top/rev180731/$YangModelBindingProvider.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/top/rev180731/$YangModuleInfoImpl.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/top/rev180731/TopGrp.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/$YangModelBindingProvider.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/$YangModuleInfoImpl.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/AMFIdentifier.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/BwpContext.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/DataSetId.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/DefaultNotificationSubscription.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/DnnUpfInfoItem.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/Guami.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/IdentityRange.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/InterfaceUpfInfoItem.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/IpEndPoint.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/Ipv4AddressRange.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/Ipv6PrefixRange.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/IsInitialBwp.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/N1MessageClass.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/N2InformationClass.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/NFServiceVersion.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/NFStatus.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/NFType.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/NotificationEventType.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/NotificationType.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/PLMNId.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/QOffsetRange.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/RRMPolicyRatio2.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/SnssaiUpfInfoItem.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/SupiRange.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/SupportedFeatures.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TAMFPointer.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TAMFRegionId.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TAMFSetId.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TAdministrativeState.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TAvailabilityStatus.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TCellState.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TCyclicPrefix.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TDistinguishedName.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TDnn.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TLoad.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TMcc.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TMnc.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TNCI.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TNCIBuilder.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TNRPCI.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TNsiId.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TOperationalState.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TQuotaType.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TResourceSharingLevel.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TSNSSAI.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TSNSSAIBuilder.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TSST.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TSubcarrierSpacing.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TTAC.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TTACBuilder.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TTransportProtocol.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TUEMobilityLevel.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/Tai.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TxDirection.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/UPInterfaceType.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/guami/AmfId.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/guami/PlmnId.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/Address.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/EndpointFqdn.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/Ipv4Address.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/Ipv6Address.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/Ipv6Prefix.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/Address.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/address/Ipv4Address.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/address/Ipv6Address.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/address/Ipv6Prefix.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/snssaiupfinfoitem/DnnUpfInfo.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/snssaiupfinfoitem/DnnUpfInfoKey.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/tai/PlmnId.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/gran/GRanNetworkElement.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/gran/GRanNetworkElementFactory.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/gran/impl/DeviceManagerGRanImpl.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/main/resources/version.properties [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/gran/test/TestDeviceManagerGRanImpl.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/gran/test/TestGRanNetworkElement.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/gran/test/TestGRanNetworkElementFactory.java [deleted file]
features/devicemanager/g-ran/ru-fh/provider/src/test/resources/simplelogger.properties [deleted file]
features/devicemanager/o-ran/ru-fh/feature/pom.xml [deleted file]
features/devicemanager/o-ran/ru-fh/installer/pom.xml [deleted file]
features/devicemanager/o-ran/ru-fh/installer/src/assembly/assemble_mvnrepo_zip.xml [deleted file]
features/devicemanager/o-ran/ru-fh/model/pom.xml [deleted file]
features/devicemanager/o-ran/ru-fh/model/src/main/yang/devicemanager-oran.yang [deleted file]
features/devicemanager/o-ran/ru-fh/pom.xml [deleted file]
features/devicemanager/o-ran/ru-fh/provider/copyright [deleted file]
features/devicemanager/o-ran/ru-fh/provider/pom.xml [deleted file]
features/devicemanager/o-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/alarms/rev190911/OperatorStateBuilder.java [deleted file]
features/devicemanager/o-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/alarms/rev190911/ResourceBuilder.java [deleted file]
features/devicemanager/o-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/alarms/rev190911/ResourceMatchBuilder.java [deleted file]
features/devicemanager/o-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/alarms/rev190911/SeverityWithClearBuilder.java [deleted file]
features/devicemanager/o-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/alarms/rev190911/alarms/ControlMaxAlarmStatusChangesBuilder.java [deleted file]
features/devicemanager/o-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/oran/impl/DeviceManagerORanImpl.java [deleted file]
features/devicemanager/o-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/oran/impl/ORanChangeNotificationListener.java [deleted file]
features/devicemanager/o-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/oran/impl/ORanFaultNotificationListener.java [deleted file]
features/devicemanager/o-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/oran/impl/ORanNetworkElement.java [deleted file]
features/devicemanager/o-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/oran/impl/ORanNetworkElementFactory.java [deleted file]
features/devicemanager/o-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/oran/impl/ORanToInternalDataModel.java [deleted file]
features/devicemanager/o-ran/ru-fh/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml [deleted file]
features/devicemanager/o-ran/ru-fh/provider/src/main/resources/version.properties [deleted file]
features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/TestDeviceManagerORanImpl.java [deleted file]
features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/TestHardwareClass.java [deleted file]
features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/TestORanChangeNotificationListener.java [deleted file]
features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/TestORanFaultNotificationListener.java [deleted file]
features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/TestORanNetworkElement.java [deleted file]
features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/TestORanNetworkElementFactory.java [deleted file]
features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/TestORanToInternalDataModel.java [deleted file]
features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/mock/NetconfAccessorMock.java [deleted file]
features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/mock/TransactionUtilsMock.java [deleted file]
features/devicemanager/o-ran/ru-fh/provider/src/test/resources/simplelogger.properties [deleted file]
features/devicemanager/x-ran/ru-fh/feature/pom.xml [deleted file]
features/devicemanager/x-ran/ru-fh/installer/pom.xml [deleted file]
features/devicemanager/x-ran/ru-fh/installer/src/assembly/assemble_mvnrepo_zip.xml [deleted file]
features/devicemanager/x-ran/ru-fh/model/pom.xml [deleted file]
features/devicemanager/x-ran/ru-fh/model/src/main/yang/devicemanager-xran.yang [deleted file]
features/devicemanager/x-ran/ru-fh/pom.xml [deleted file]
features/devicemanager/x-ran/ru-fh/provider/copyright [deleted file]
features/devicemanager/x-ran/ru-fh/provider/pom.xml [deleted file]
features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/alarms/rev190911/OperatorStateBuilder.java [deleted file]
features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/alarms/rev190911/ResourceBuilder.java [deleted file]
features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/alarms/rev190911/ResourceMatchBuilder.java [deleted file]
features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/alarms/rev190911/SeverityWithClearBuilder.java [deleted file]
features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/alarms/rev190911/alarms/ControlMaxAlarmStatusChangesBuilder.java [deleted file]
features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/xran/dhcp/_1/_0/rev180720/NetconfClientIdBuilder.java [deleted file]
features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/xran/impl/DeviceManagerXRanImpl.java [deleted file]
features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/xran/impl/NullableHelper.java [deleted file]
features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/xran/impl/XRanChangeNotificationListener.java [deleted file]
features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/xran/impl/XRanFaultNotificationListener.java [deleted file]
features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/xran/impl/XRanNetworkElement.java [deleted file]
features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/xran/impl/XRanNetworkElementFactory.java [deleted file]
features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/xran/impl/XRanToInternalDataModel.java [deleted file]
features/devicemanager/x-ran/ru-fh/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml [deleted file]
features/devicemanager/x-ran/ru-fh/provider/src/main/resources/version.properties [deleted file]
features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/TestDeviceManagerXRanImpl.java [deleted file]
features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/TestHardwareClass.java [deleted file]
features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/TestXORanNetworkElementFactory.java [deleted file]
features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/TestXRanChangeNotificationListener.java [deleted file]
features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/TestXRanFaultNotificationListener.java [deleted file]
features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/TestXRanNetworkElement.java [deleted file]
features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/TestXRanToInternalDataModel.java [deleted file]
features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/mock/NetconfAccessorMock.java [deleted file]
features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/mock/TransactionUtilsMock.java [deleted file]
features/devicemanager/x-ran/ru-fh/provider/src/test/resources/simplelogger.properties [deleted file]
features/pom.xml [deleted file]
parent/.gitignore [deleted file]
parent/README.md [deleted file]
parent/binding-parent/pom.xml [deleted file]
parent/dependencies-odl-bom/pom.xml [deleted file]
parent/installed-odl-bom/pom.xml [deleted file]
parent/odlparent-lite/pom.xml [deleted file]
parent/pom.xml [deleted file]
parent/single-feature-parent/pom.xml [deleted file]
solution/dev/ves-test-collector/.env
solution/dev/ves-test-collector/README.md
solution/dev/ves-test-collector/client-scripts-ves-v7/README.md
solution/dev/ves-test-collector/client-scripts-ves-v7/READMEpy.md [new file with mode: 0644]
solution/dev/ves-test-collector/client-scripts-ves-v7/config
solution/dev/ves-test-collector/client-scripts-ves-v7/config.yml [new file with mode: 0644]
solution/dev/ves-test-collector/client-scripts-ves-v7/globalVesEventEmitter.py [new file with mode: 0644]
solution/dev/ves-test-collector/client-scripts-ves-v7/json/schema/CommonEventFormat_30.2.1_ONAP.json [moved from solution/integration/smo/resources/CommonEventFormat_30.1_ONAP.json with 80% similarity]
solution/dev/ves-test-collector/client-scripts-ves-v7/json/templates/event-list.json
solution/dev/ves-test-collector/client-scripts-ves-v7/json/templates/fault.json
solution/dev/ves-test-collector/client-scripts-ves-v7/json/templates/heartbeat.json
solution/dev/ves-test-collector/client-scripts-ves-v7/json/templates/measurement.json
solution/dev/ves-test-collector/client-scripts-ves-v7/json/templates/notification.json [new file with mode: 0644]
solution/dev/ves-test-collector/client-scripts-ves-v7/json/templates/pnfRegistration.json
solution/dev/ves-test-collector/client-scripts-ves-v7/json/templates/stateChange.json [new file with mode: 0644]
solution/dev/ves-test-collector/client-scripts-ves-v7/json/templates/thresholdCrossingAlert.json
solution/dev/ves-test-collector/client-scripts-ves-v7/sendVesHeartbeat.py [new file with mode: 0644]
solution/dev/ves-test-collector/client-scripts-ves-v7/sendVesNotification.py [new file with mode: 0644]
solution/dev/ves-test-collector/client-scripts-ves-v7/sendVesStateChange.py [new file with mode: 0644]
solution/dev/ves-test-collector/resources/CommonEventFormat_30.2.1_ONAP.json [new file with mode: 0644]
solution/integration/smo/.env
solution/integration/smo/README.md
solution/integration/smo/dmaap/MsgRtrApi.properties [new file with mode: 0644]
solution/integration/smo/dmaap/cadi.properties [new file with mode: 0644]
solution/integration/smo/dmaap/logback.xml [new file with mode: 0644]
solution/integration/smo/docker-compose.yml
solution/integration/smo/kafka/zk_client_jaas.conf [new file with mode: 0755]
solution/integration/smo/ntshome/clean.sh [deleted file]
solution/integration/smo/ntshome/configuration.json [deleted file]
solution/integration/smo/ntshome/docker_stats.sh [deleted file]
solution/integration/smo/resources/CommonEventFormat_28.4.1.json [deleted file]
solution/integration/smo/resources/CommonEventFormat_30.0.1.json [deleted file]
solution/integration/smo/resources/devicemanager.properties [deleted file]
solution/integration/smo/resources/go-collector.sh [deleted file]
solution/integration/smo/resources/org.ops4j.pax.logging.cfg [deleted file]
solution/integration/smo/resources/startODL.oom.sh [deleted file]
solution/integration/smo/sdnr/certs/certs.properties [new file with mode: 0644]
solution/integration/smo/sdnr/certs/keys0.zip [new file with mode: 0644]
solution/integration/smo/sdnr/mountpoint-registrar.properties [new file with mode: 0644]
solution/integration/smo/vescollector/collector.properties [new file with mode: 0644]
solution/integration/smo/zk/zk_server_jaas.conf [new file with mode: 0644]

index 803ce49..6295a65 100644 (file)
@@ -49,9 +49,11 @@ release.properties
 
 # VES related
 */**/json/examples
+*/**/__pycache__
 *.log
 
 # documentation
+
 .tox
 docs/_build/
 ci-management/
diff --git a/distribution/README.md b/distribution/README.md
deleted file mode 100644 (file)
index 8e6348e..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-# Distribution
-
-This directory contains OAM related software artifacts realted to the packaging and distributing code.
diff --git a/distribution/nonrtric-o1-controller-frankfurt/pom.xml b/distribution/nonrtric-o1-controller-frankfurt/pom.xml
deleted file mode 100644 (file)
index 91b359d..0000000
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.o-ran-sc.oam.features.parent</groupId>
-    <artifactId>odlparent-lite</artifactId>
-    <version>1.5.2-SNAPSHOT</version>
-    <relativePath />
-  </parent>
-
-  <groupId>org.o-ran-sc.oam.distribution</groupId>
-  <artifactId>nonrtric-o1-controller</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
-
-  <name>sdnc-distribution :: o-ran-sc :: nonrtric-o1-controller</name>
-
-  <description>nonrtric-o1-controller based on ONAP SDNC</description>
-
-  <organization>
-    <name>O-RAN-SC/OAM</name>
-  </organization>
-
-  <properties>
-    <base.image.repo>nexus3.onap.org:10001/onap/sdnc-image:1.8.0-STAGING-latest</base.image.repo>
-    <image.name>o-ran-sc/${project.artifactId}</image.name>
-    <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
-    <o-ran-sc.project.version>${project.version}</o-ran-sc.project.version>
-    <o-ran-sc.features.version>0.7.1-SNAPSHOT</o-ran-sc.features.version>
-    <repo-oran>mvn:org.o-ran-sc.oam.features.devicemanager/devicemanager-oran-ru-fh-feature/${o-ran-sc.features.version}/xml/features</repo-oran>
-    <repo-xran>mvn:org.o-ran-sc.oam.features.devicemanager/devicemanager-xran-ru-fh-feature/${o-ran-sc.features.version}/xml/features</repo-xran>
-    <features.repo>${repo-oran},${repo-xran}</features.repo>
-    <features.boot>sdnr-wt-feature-aggregator,devicemanager-oran-ru-fh-feature,devicemanager-xran-ru-fh-feature</features.boot>
-    <platform-logic-installer.version>${project.version}</platform-logic-installer.version>
-    <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
-    <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
-    <opendaylight.root>opt/opendaylight</opendaylight.root>
-    <docker.push.phase>deploy</docker.push.phase>
-    <docker.verbose>true</docker.verbose>
-
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.o-ran-sc.oam.features.devicemanager</groupId>
-      <artifactId>devicemanager-oran-ru-fh-installer</artifactId>
-      <version>${o-ran-sc.features.version}</version>
-      <type>zip</type>
-      <classifier>repo</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.o-ran-sc.oam.features.devicemanager</groupId>
-      <artifactId>devicemanager-xran-ru-fh-installer</artifactId>
-      <version>${o-ran-sc.features.version}</version>
-      <type>zip</type>
-      <classifier>repo</classifier>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.groovy.maven</groupId>
-        <artifactId>gmaven-plugin</artifactId>
-        <version>1.0</version>
-        <executions>
-          <execution>
-            <phase>validate</phase>
-            <goals>
-              <goal>execute</goal>
-            </goals>
-            <configuration>
-              <source>${basedir}/src/main/scripts/TagVersion.groovy</source>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-resources-plugin</artifactId>
-        <version>2.6</version>
-        <executions>
-          <execution>
-            <id>copy-dockerfile</id>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>            <!-- here the phase you need -->
-            <phase>validate</phase>
-            <configuration>
-              <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
-              <resources>
-                <resource>
-                  <directory>src/main/docker</directory>
-                  <includes>
-                    <include>Dockerfile</include>
-                  </includes>
-                  <filtering>true</filtering>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>unpack features</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>unpack-dependencies</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
-              <excludeTransitive>true</excludeTransitive>
-              <overWriteReleases>false</overWriteReleases>
-              <overWriteSnapshots>true</overWriteSnapshots>
-              <overWriteIfNewer>true</overWriteIfNewer>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>io.fabric8</groupId>
-        <artifactId>docker-maven-plugin</artifactId>
-        <version>0.28.0</version>
-        <inherited>false</inherited>
-        <configuration>
-          <pushRegistry>${env.CONTAINER_PUSH_REGISTRY}</pushRegistry>
-          <images>
-            <image>
-              <name>${image.name}</name>
-              <build>
-                <cleanup>try</cleanup>
-                <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
-                <tags>
-                  <tag>${project.docker.latestminortag.version}</tag>
-                  <tag>${project.docker.latestfulltag.version}</tag>
-                  <tag>${project.docker.latesttagtimestamp.version}</tag>
-                </tags>
-              </build>
-            </image>
-          </images>
-        </configuration>
-        <executions>
-          <execution>
-            <id>generate-images</id>
-            <phase>package</phase>
-            <goals>
-              <goal>build</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>push-images</id>
-            <phase>${docker.push.phase}</phase>
-            <goals>
-              <goal>build</goal>
-              <goal>push</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-    <extensions>
-      <extension><!-- this extension is required by wagon in order to pass the proxy -->
-        <groupId>org.apache.maven.wagon</groupId>
-        <artifactId>wagon-http-lightweight</artifactId>
-        <version>2.2</version>
-      </extension>
-    </extensions>
-  </build>
-</project>
diff --git a/distribution/nonrtric-o1-controller-frankfurt/src/main/docker/Dockerfile b/distribution/nonrtric-o1-controller-frankfurt/src/main/docker/Dockerfile
deleted file mode 100644 (file)
index 79bafef..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-# Base odl alpine with added packages needed for
-FROM ${base.image.repo}
-
-# Image info
-ENV IMAGEPATH ${IMAGEPATH}//${image.name}
-ENV IMAGENAMES ${IMAGENAMES}//"ORAN nonrtric"
-
-# Adjust repo und feature boot info for karaf
-RUN sed -i -e "\|featuresRepositories|s|$|,${features.repo}|"  $ODL_HOME/etc/org.apache.karaf.features.cfg
-ENV SDNRWT_BOOTFEATURES ${features.boot}
-
-USER root
-# copy CCSDK mvn artifacts to ODL repository
-COPY system /tmp/system
-RUN rsync -a /tmp/system $ODL_HOME && rm -rf /tmp/system
-RUN chown -R odl:odl $ODL_HOME
-
-# Set user for ODL startup
-USER odl
diff --git a/distribution/nonrtric-o1-controller-frankfurt/src/main/scripts/TagVersion.groovy b/distribution/nonrtric-o1-controller-frankfurt/src/main/scripts/TagVersion.groovy
deleted file mode 100644 (file)
index e2c317d..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CCSDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.oransc.oam.distribution
-
-
-def versionArray;
-if ( project.properties['o-ran-sc.project.version'] != null ) {
-       versionArray = project.properties['o-ran-sc.project.version'].split('\\.');
-}
-
-if ( project.properties['o-ran-sc.project.version'].endsWith("-SNAPSHOT") ) {
-       patchArray = versionArray[2].split('-');
-       project.properties['project.docker.latestminortag.version']=versionArray[0] + '.' + versionArray[1] + "-SNAPSHOT-latest";
-       project.properties['project.docker.latestfulltag.version']=versionArray[0] + '.' + versionArray[1] + '.' + patchArray[0] + "-SNAPSHOT-latest";
-       project.properties['project.docker.latesttagtimestamp.version']=versionArray[0] + '.' + versionArray[1] + '.' + patchArray[0] + "-SNAPSHOT-"+project.properties['ccsdk.build.timestamp'];
-} else {
-       project.properties['project.docker.latestminortag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
-       project.properties['project.docker.latestfulltag.version']=versionArray[0] + '.' + versionArray[1] + '.' + versionArray[2] + "-STAGING-latest";
-       project.properties['project.docker.latesttagtimestamp.version']=versionArray[0] + '.' + versionArray[1] + '.' + versionArray[2] + "-STAGING-"+project.properties['ccsdk.build.timestamp'];
-}
diff --git a/distribution/nonrtric-o1-controller/pom.xml b/distribution/nonrtric-o1-controller/pom.xml
deleted file mode 100644 (file)
index 428f80f..0000000
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.onap.ccsdk.parent</groupId>
-    <artifactId>odlparent-lite</artifactId>
-    <version>1.4.3</version>
-    <relativePath />
-  </parent>
-
-  <groupId>org.o-ran-sc.oam.distribution</groupId>
-  <artifactId>nonrtric-o1-controller</artifactId>
-  <version>0.6.3-SNAPSHOT</version>
-  <packaging>pom</packaging>
-
-  <name>sdnc-distribution :: sdnc :: nonrtric-o1-controller</name>
-  <description>Creates nonrtric-o1-controller from ONAP SDNC</description>
-  <organization>
-    <name>O-RAN-SC/OAM</name>
-  </organization>
-
-  <properties>
-    <image.version>1.7.5-STAGING-latest</image.version>
-    <!-- <base.image.repo>nexus3.onap.org:10001/onap/sdnc-image:${image.version}</base.image.repo> -->
-    <base.image.repo>nexus3.onap.org:10001/onap/sdnc-image:${image.version}</base.image.repo>
-    <image.name>o-ran-sc/nonrtric-o1-controller</image.name>
-    <ccsdk.project.version>${project.version}</ccsdk.project.version>
-    <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
-    <ccsdk.features.version>${project.version}</ccsdk.features.version>
-    <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
-    <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
-    <opendaylight.root>opt/opendaylight</opendaylight.root>
-    <docker.push.phase>deploy</docker.push.phase>
-    <docker.verbose>true</docker.verbose>
-    <ansible.gpg.key>93C4A3FD7BB9C367</ansible.gpg.key>
-
-    <!-- odl.repolist.features and odl.boot.features.all are used by dockerfile. Contains all repos and features to start -->
-    <sdnr.wt.repo>mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator/${project.version}/xml/features</sdnr.wt.repo>
-    <odl.repolist.features>${sdnr.wt.repo}</odl.repolist.features>
-
-    <odl.boot.features.odl>odl-mdsal-all,odl-mdsal-apidocs,odl-daexim-all</odl.boot.features.odl>
-    <ccsdk.odl.features>odl-netconf-topology,odl-netconf-connector,sdnr-wt-feature-aggregator</ccsdk.odl.features>
-    <odl.boot.features.all>${odl.boot.features.odl}</odl.boot.features.all>
-  </properties>
-
-  <build>
-    <extensions>
-      <extension>
-            <!-- this extension is required by wagon in order to pass the proxy -->
-        <groupId>org.apache.maven.wagon</groupId>
-        <artifactId>wagon-http-lightweight</artifactId>
-        <version>2.2</version>
-      </extension>
-    </extensions>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.groovy.maven</groupId>
-        <artifactId>gmaven-plugin</artifactId>
-        <version>1.0</version>
-        <executions>
-          <execution>
-            <phase>validate</phase>
-            <goals>
-              <goal>execute</goal>
-            </goals>
-            <configuration>
-              <source>${basedir}/src/main/scripts/TagVersion.groovy</source>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-resources-plugin</artifactId>
-        <version>2.6</version>
-        <executions>
-          <execution>
-            <id>copy-dockerfile</id>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals><!-- here the phase you need -->
-            <phase>validate</phase>
-            <configuration>
-              <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
-              <resources>
-                <resource>
-                  <directory>src/main/docker</directory>
-                  <includes>
-                    <include>Dockerfile</include>
-                  </includes>
-                  <filtering>true</filtering>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-          <execution>
-            <id>copy-scripts</id>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals><!-- here the phase you need -->
-            <phase>validate</phase>
-            <configuration>
-              <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/bin</outputDirectory>
-              <resources>
-                <resource>
-                  <directory>src/main/scripts</directory>
-                  <includes>
-                    <include>*.sh</include>
-                  </includes>
-                  <filtering>true</filtering>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>unpack features</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>unpack-dependencies</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
-              <excludeTransitive>true</excludeTransitive>
-              <overWriteReleases>false</overWriteReleases>
-              <overWriteSnapshots>true</overWriteSnapshots>
-              <overWriteIfNewer>true</overWriteIfNewer>
-            </configuration>
-          </execution>
-<!--           <execution> -->
-<!--                   <id>unpack dgs</id> -->
-<!--                   <phase>generate-sources</phase> -->
-<!--                   <goals> -->
-<!--                           <goal>unpack</goal> -->
-<!--                   </goals> -->
-<!--                   <configuration> -->
-<!--                           <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk</outputDirectory> -->
-<!--                           <artifactItems> -->
-<!--                                   <artifactItem> -->
-<!--                                           <groupId>${project.groupId}</groupId> -->
-<!--                                           <artifactId>platform-logic-installer</artifactId> -->
-<!--                                           <version>${project.version}</version> -->
-<!--                                           <type>zip</type> -->
-<!--                                   </artifactItem> -->
-<!--                           </artifactItems> -->
-<!--                   </configuration> -->
-<!--           </execution> -->
-        </executions>
-      </plugin>
-
-          <plugin>
-            <groupId>io.fabric8</groupId>
-            <artifactId>docker-maven-plugin</artifactId>
-            <version>0.31.0</version>
-            <inherited>false</inherited>
-            <configuration>
-              <images>
-                <image>
-                  <name>${image.name}</name>
-                  <build>
-                    <cleanup>try</cleanup>
-                    <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
-<!--                    <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile> -->
-                    <tags>
-                      <tag>${project.docker.latestminortag.version}</tag>
-                      <tag>${project.docker.latestfulltag.version}</tag>
-                      <tag>${project.docker.latesttagtimestamp.version}</tag>
-                             <tag>${image.version}</tag>
-                    </tags>
-                  </build>
-                </image>
-              </images>
-            </configuration>
-            <executions>
-              <execution>
-                <id>generate-images</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>build</goal>
-                </goals>
-              </execution>
-
-              <execution>
-                <id>push-images</id>
-                <phase>${docker.push.phase}</phase>
-                <goals>
-                  <goal>build</goal>
-                  <goal>push</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-    </plugins>
-  </build>
- </project>
diff --git a/distribution/nonrtric-o1-controller/src/main/docker/Dockerfile b/distribution/nonrtric-o1-controller/src/main/docker/Dockerfile
deleted file mode 100644 (file)
index a25d578..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-################################################################################
-# Copyright 2019 highstreet technologies and others
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-FROM ${base.image.repo}
-
-ENV ODL_HOME /opt/opendaylight
-ENV FEATURES_SDNR system/org/onap/ccsdk/features/sdnr
-ENV SDNRWT=true
-
-# root user actions
-USER root
-RUN rm $ODL_HOME/data/idmlight.db.mv.db
-#back to user odl
-USER odl
-
diff --git a/distribution/nonrtric-o1-controller/src/main/scripts/TagVersion.groovy b/distribution/nonrtric-o1-controller/src/main/scripts/TagVersion.groovy
deleted file mode 100644 (file)
index 68a8b78..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CCSDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.ccsdk.distribution
-
-
-def versionArray;
-if ( project.properties['ccsdk.project.version'] != null ) {
-       versionArray = project.properties['ccsdk.project.version'].split('\\.');
-}
-
-if ( project.properties['ccsdk.project.version'].endsWith("-SNAPSHOT") ) {
-       patchArray = versionArray[2].split('-');
-       project.properties['project.docker.latestminortag.version']=versionArray[0] + '.' + versionArray[1] + "-SNAPSHOT-latest";
-       project.properties['project.docker.latestfulltag.version']=versionArray[0] + '.' + versionArray[1] + '.' + patchArray[0] + "-SNAPSHOT-latest";
-       project.properties['project.docker.latesttagtimestamp.version']=versionArray[0] + '.' + versionArray[1] + '.' + patchArray[0] + "-SNAPSHOT-"+project.properties['ccsdk.build.timestamp'];
-} else {
-       project.properties['project.docker.latestminortag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
-       project.properties['project.docker.latestfulltag.version']=versionArray[0] + '.' + versionArray[1] + '.' + versionArray[2] + "-STAGING-latest";
-       project.properties['project.docker.latesttagtimestamp.version']=versionArray[0] + '.' + versionArray[1] + '.' + versionArray[2] + "-STAGING-"+project.properties['ccsdk.build.timestamp'];
-}
diff --git a/distribution/nonrtric-o1-controller/src/main/yaml/.env b/distribution/nonrtric-o1-controller/src/main/yaml/.env
deleted file mode 100644 (file)
index f141094..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-################################################################################
-# Copyright 2019 highstreet technologies and others
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-NEXUS_DOCKER_REPO=nexus3.o-ran-sc.org:10001/
-DOCKER_IMAGE_NAME=o-ran-sc/nonrtric-o1-controller
-DOCKER_IMAGE_TAG=1.7.5-STAGING-latest
-PORTPREFIX=
-ENABLE_ODL_CLUSTER=false
-REPLICAS=0
-ODL_HOME=/opt/opendaylight
-LOCAL_NONRTRIC_MOUNT=/var/tmp/
diff --git a/distribution/nonrtric-o1-controller/src/main/yaml/docker-compose.yml b/distribution/nonrtric-o1-controller/src/main/yaml/docker-compose.yml
deleted file mode 100644 (file)
index c0de8ad..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-################################################################################
-# Copyright 2019 highstreet technologies and others
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-version: "3.3"
-
-services:
-  nonrt-o1:
-    image: ${NEXUS_DOCKER_REPO}${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG}
-    depends_on:
-      - sdnctldb01
-    container_name: nonrt_o1_controller
-    ports:
-      - "${PORTPREFIX}8181:8181"
-    links:
-      - sdnctldb01:dbhost
-    environment:
-      - SDNC_CONFIG_DIR=/opt/onap/ccsdk/data/properties
-      - ENABLE_ODL_CLUSTER=${ENABLE_ODL_CLUSTER}
-      - CCSDK_REPLICAS=${REPLICAS}
-      - DOMAIN=""
-    volumes:
-     - ${LOCAL_NONRTRIC_MOUNT}/nrtric-o1/logs:${ODL_HOME}/data/log
-    logging:
-      driver:   "json-file"
-      options:
-        max-size: "30m"
-        max-file: "5"
-  
-  sdnctldb01:
-    image: mysql/mysql-server:5.6
-    container_name: nonrt_o1_db
-    ports:
-      - "3306"
-    environment:
-      - MYSQL_ROOT_PASSWORD=openECOMP1.0
-      - MYSQL_ROOT_HOST=%
-    logging:       
-      driver:   "json-file"
-      options:  
-        max-size: "30m"
-        max-file: "5"
-        
\ No newline at end of file
diff --git a/distribution/pom.xml b/distribution/pom.xml
deleted file mode 100644 (file)
index c8970c0..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-################################################################################
-# Copyright 2020 highstreet technologies and others
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.o-ran-sc.oam.distribution</groupId>
-  <artifactId>distribution-top</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
-
-  <name>o-ran-sc distribution top</name>
-
-  <modules>
-    <module>nonrtric-o1-controller-frankfurt</module>
-  </modules>
-
-</project>
diff --git a/features/.gitignore b/features/.gitignore
deleted file mode 100644 (file)
index 94227c1..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-target/
-target-ide/
-yang-gen-sal/
-.checkstyle
-.classpath
-.project
-.settings
-.factorypath
-.metadata
-*.swp
-dist/
-*/**/bin/
-etc/
-node_modules/
-.fbExcludeFilterFile
-*.md.html
diff --git a/features/README.md b/features/README.md
deleted file mode 100644 (file)
index fc38fea..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# Features
-
-This directory contains code artifacts as [OSGi bundles](https://en.wikipedia.org/wiki/OSGi) to be integrated into [Apache Karaf](https://karaf.apache.org). 
-
-## devicemanagers
-
-### 3gpp
-
-### o-ran
-
-### x-ran
diff --git a/features/devicemanager/g-ran/ru-fh/feature/pom.xml b/features/devicemanager/g-ran/ru-fh/feature/pom.xml
deleted file mode 100644 (file)
index ba9cd0b..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ ============LICENSE_START=======================================================
-  ~ O-RAN-SC : features
-  ~ ================================================================================
-  ~ Copyright (C) 2020 highstreet technologies GmbH Intellectual Property.
-  ~ All rights reserved.
-  ~ ================================================================================
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~ ============LICENSE_END=======================================================
-  ~
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.o-ran-sc.oam.features.parent</groupId>
-        <artifactId>single-feature-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.o-ran-sc.oam.features.devicemanager</groupId>
-    <artifactId>devicemanager-gran-ru-fh-feature</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
-
-    <name>o-ran-sc-features :: ${project.artifactId}</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>devicemanager-gran-ru-fh-provider</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-    
-      <repositories>
-    <repository>
-      <id>onap-public</id>
-      <url>https://nexus.onap.org/content/groups/public/</url>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-        <updatePolicy>always</updatePolicy>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>onap-staging</id>
-      <url>https://nexus.onap.org/content/groups/staging/</url>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-        <updatePolicy>always</updatePolicy>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>ecomp-release</id>
-      <name>onap-repository-releases</name>
-      <url>https://nexus.onap.org/content/repositories/releases/</url>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>ecomp-snapshot</id>
-      <name>onap-repository-snapshots</name>
-      <url>https://nexus.onap.org/content/repositories/snapshots/</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-  
-</project>
diff --git a/features/devicemanager/g-ran/ru-fh/installer/pom.xml b/features/devicemanager/g-ran/ru-fh/installer/pom.xml
deleted file mode 100755 (executable)
index 9280a69..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ ============LICENSE_START=======================================================
-  ~ ONAP : ccsdk features
-  ~ ================================================================================
-  ~ Copyright (C) 2018 highstreet technologies GmbH Intellectual Property.
-  ~ All rights reserved.
-  ~ ================================================================================
-  ~ Update Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
-  ~ ================================================================================
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~ ============LICENSE_END=======================================================
-  ~
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.o-ran-sc.oam.features.parent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.o-ran-sc.oam.features.devicemanager</groupId>
-    <artifactId>devicemanager-gran-ru-fh-installer</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <name>o-ran-sc-features :: ${project.artifactId}</name>
-
-    <properties>
-        <application.name>devicemanager-gran-ru-fh</application.name>
-        <include.transitive.dependencies>false</include.transitive.dependencies>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>${application.name}-feature</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>${application.name}-provider</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>maven-repo-zip</id>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <phase>package</phase>
-                        <configuration>
-                            <attach>true</attach>
-                            <finalName>stage/${application.name}-${project.version}</finalName>
-                            <descriptors>
-                                <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
-                            </descriptors>
-                            <appendAssemblyId>true</appendAssemblyId>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-nested-dependencies</id>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <phase>prepare-package</phase>
-                        <configuration>
-                            <transitive>true</transitive>
-                            <outputDirectory>${project.build.directory}/assembly/system</outputDirectory>
-                            <overWriteReleases>false</overWriteReleases>
-                            <overWriteSnapshots>true</overWriteSnapshots>
-                            <overWriteIfNewer>true</overWriteIfNewer>
-                            <useRepositoryLayout>true</useRepositoryLayout>
-                            <addParentPoms>false</addParentPoms>
-                            <copyPom>false</copyPom>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/features/devicemanager/g-ran/ru-fh/installer/src/assembly/assemble_mvnrepo_zip.xml b/features/devicemanager/g-ran/ru-fh/installer/src/assembly/assemble_mvnrepo_zip.xml
deleted file mode 100644 (file)
index dfe5060..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-  ~ ============LICENSE_START=======================================================
-  ~ ONAP : ccsdk features
-  ~ ================================================================================
-  ~ Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
-  ~ ================================================================================
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~ ============LICENSE_END=======================================================
-  ~
-  -->
-
-<!-- Defines how we build the .zip file which is our distribution. -->
-
-<assembly
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-    <id>repo</id>
-    <formats>
-        <format>zip</format>
-    </formats>
-
-    <!--  we want "system" and related files right at the root level
-          as this file is suppose to be unzip on top of a karaf
-          distro. -->
-    <includeBaseDirectory>false</includeBaseDirectory>
-
-    <fileSets>
-        <fileSet>
-            <directory>target/assembly/</directory>
-            <outputDirectory>.</outputDirectory>
-            <excludes>
-            </excludes>
-        </fileSet>
-    </fileSets>
-
-</assembly>
diff --git a/features/devicemanager/g-ran/ru-fh/model/pom.xml b/features/devicemanager/g-ran/ru-fh/model/pom.xml
deleted file mode 100644 (file)
index c5286ae..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ ============LICENSE_START=======================================================
-  ~ O-RAN-SC : features
-  ~ ================================================================================
-  ~ Copyright (C) 2020 highstreet technologies GmbH Intellectual Property.
-  ~ All rights reserved.
-  ~ ================================================================================
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~ ============LICENSE_END=======================================================
-  ~
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.o-ran-sc.oam.features.parent</groupId>
-        <artifactId>binding-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.o-ran-sc.oam.features.devicemanager</groupId>
-    <artifactId>devicemanager-gran-ru-fh-model</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-
-    <name>o-ran-sc-features :: ${project.artifactId}</name>
-    <licenses>
-        <license>
-            <name>Apache License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
-        </license>
-    </licenses>
-
-    <properties>
-        <maven.javadoc.skip>true</maven.javadoc.skip>
-    </properties>
-
-    <dependencies>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>**/gen/**</exclude>
-                        <exclude>**/generated-sources/**</exclude>
-                        <exclude>**/yang-gen-sal/**</exclude>
-                        <exclude>**/pax/**</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    
-      <repositories>
-    <repository>
-      <id>onap-public</id>
-      <url>https://nexus.onap.org/content/groups/public/</url>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-        <updatePolicy>always</updatePolicy>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>onap-staging</id>
-      <url>https://nexus.onap.org/content/groups/staging/</url>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-        <updatePolicy>always</updatePolicy>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>ecomp-release</id>
-      <name>onap-repository-releases</name>
-      <url>https://nexus.onap.org/content/repositories/releases/</url>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>ecomp-snapshot</id>
-      <name>onap-repository-snapshots</name>
-      <url>https://nexus.onap.org/content/repositories/snapshots/</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-    
-</project>
diff --git a/features/devicemanager/g-ran/ru-fh/pom.xml b/features/devicemanager/g-ran/ru-fh/pom.xml
deleted file mode 100755 (executable)
index 6eb97c1..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ ============LICENSE_START=======================================================
-  ~ ONAP : ccsdk features
-  ~ ================================================================================
-  ~ Copyright (C) 2018 highstreet technologies GmbH Intellectual Property.
-  ~ All rights reserved.
-  ~ ================================================================================
-  ~ Update Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
-  ~ ================================================================================
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~ ============LICENSE_END=======================================================
-  ~
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.o-ran-sc.oam.features.parent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.o-ran-sc.oam.features.devicemanager</groupId>
-    <artifactId>devicemanager-gran-ru-fh-top</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <name>o-ran-sc-features :: ${project.artifactId}</name>
-
-    <modules>
-        <module>model</module>
-        <module>provider</module>
-        <module>feature</module>
-        <module>installer</module>
-    </modules>
-
-    <properties>
-        <feature-name>devicemanager-gran-ru-fh</feature-name>
-    </properties>
-</project>
diff --git a/features/devicemanager/g-ran/ru-fh/provider/copyright b/features/devicemanager/g-ran/ru-fh/provider/copyright
deleted file mode 100644 (file)
index 754b621..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- * ============LICENSE_END==========================================================================
- */
diff --git a/features/devicemanager/g-ran/ru-fh/provider/pom.xml b/features/devicemanager/g-ran/ru-fh/provider/pom.xml
deleted file mode 100644 (file)
index 61c13a6..0000000
+++ /dev/null
@@ -1,185 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ ============LICENSE_START=======================================================
-  ~ O-RAN-SC : features
-  ~ ================================================================================
-  ~ Copyright (C) 2020 highstreet technologies GmbH Intellectual Property.
-  ~ All rights reserved.
-  ~ ================================================================================
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~ ============LICENSE_END=======================================================
-  ~
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.o-ran-sc.oam.features.parent</groupId>
-        <artifactId>binding-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.o-ran-sc.oam.features.devicemanager</groupId>
-    <artifactId>devicemanager-gran-ru-fh-provider</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-
-    <name>o-ran-sc-features :: ${project.artifactId}</name>
-    <licenses>
-        <license>
-            <name>Apache License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
-        </license>
-    </licenses>
-
-    <properties>
-        <checkstyle.skip>true</checkstyle.skip> <!-- POM configuration -->
-        <maven.javadoc.skip>true</maven.javadoc.skip>
-        <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
-        <buildtime>${maven.build.timestamp} UTC</buildtime>
-    </properties>
-
-    <dependencies>
-        <!-- begin for testing -->
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <!-- end for testing -->
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>devicemanager-gran-ru-fh-model</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-            <artifactId>sdnr-wt-netconfnode-state-service-model</artifactId>
-            <version>${project.version}</version><!--$NO-MVN-MAN-VER$-->
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-            <artifactId>sdnr-wt-devicemanager-model</artifactId>
-            <version>${project.version}</version><!--$NO-MVN-MAN-VER$-->
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-            <artifactId>sdnr-wt-common</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>sal-netconf-connector</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc6991-ietf-yang-types</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>yang-binding</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-singleton-common-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>**/gen/**</exclude>
-                        <exclude>**/generated-sources/**</exclude>
-                        <exclude>**/yang-gen-sal/**</exclude>
-                        <exclude>**/pax/**</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    
-    <repositories>
-    <repository>
-      <id>onap-public</id>
-      <url>https://nexus.onap.org/content/groups/public/</url>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-        <updatePolicy>always</updatePolicy>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>onap-staging</id>
-      <url>https://nexus.onap.org/content/groups/staging/</url>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-        <updatePolicy>always</updatePolicy>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>ecomp-release</id>
-      <name>onap-repository-releases</name>
-      <url>https://nexus.onap.org/content/repositories/releases/</url>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>ecomp-snapshot</id>
-      <name>onap-repository-snapshots</name>
-      <url>https://nexus.onap.org/content/repositories/snapshots/</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-  
-</project>
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/top/rev180731/$YangModelBindingProvider.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/top/rev180731/$YangModelBindingProvider.java
deleted file mode 100644 (file)
index 925890b..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.top.rev180731;
-
-public final class $YangModelBindingProvider implements org.opendaylight.yangtools.yang.binding.YangModelBindingProvider {
-    @java.lang.Override
-    public org.opendaylight.yangtools.yang.binding.YangModuleInfo getModuleInfo() {
-        return $YangModuleInfoImpl.getInstance();
-    }
-}
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/top/rev180731/$YangModuleInfoImpl.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/top/rev180731/$YangModuleInfoImpl.java
deleted file mode 100644 (file)
index 7b43064..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.top.rev180731;
-
-import org.opendaylight.yangtools.yang.binding.ResourceYangModuleInfo;
-import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.binding.YangModuleInfo;
-import java.util.Set;
-import java.util.HashSet;
-import com.google.common.collect.ImmutableSet;
-
-public final class $YangModuleInfoImpl extends ResourceYangModuleInfo {
-    private static final QName NAME = QName.create("urn:3gpp:tsg:sa5:nrm:Top", "2018-07-31", "_3gpp-common-top").intern();
-    private static final YangModuleInfo INSTANCE = new $YangModuleInfoImpl();
-
-    private final Set<YangModuleInfo> importedModules;
-
-    public static YangModuleInfo getInstance() {
-        return INSTANCE;
-    }
-
-    public static QName qnameOf(final java.lang.String localName) {
-        return QName.create(NAME, localName).intern();
-    }
-
-    private $YangModuleInfoImpl() {
-        Set<YangModuleInfo> set = new HashSet<>();
-        set.add(org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.$YangModuleInfoImpl.getInstance());
-        importedModules = ImmutableSet.copyOf(set);
-    }
-
-    @java.lang.Override
-    public QName getName() {
-        return NAME;
-    }
-
-    @java.lang.Override
-    protected java.lang.String resourceName() {
-        return "/META-INF/yang/_3gpp-common-top@2018-07-31.yang";
-    }
-
-    @java.lang.Override
-    public Set<YangModuleInfo> getImportedModules() {
-        return importedModules;
-    }
-
-
-}
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/top/rev180731/TopGrp.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/top/rev180731/TopGrp.java
deleted file mode 100644 (file)
index 5216512..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.top.rev180731;
-import java.lang.String;
-import org.eclipse.jdt.annotation.Nullable;
-import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.TDistinguishedName;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.common.QName;
-
-/**
- *
- * <p>
- * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-top</b>
- * <pre>
- * grouping TopGrp {
- *   leaf objectClass {
- *     type string;
- *   }
- *   leaf id {
- *     type nrm-type:t_DistinguishedName;
- *   }
- * }
- * </pre>The schema path to identify an instance is
- * <i>_3gpp-common-top/TopGrp</i>
- *
- */
-public interface TopGrp
-    extends
-    DataObject
-{
-
-
-
-    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("TopGrp");
-
-    /**
-     * @return <code>java.lang.String</code> <code>objectClass</code>, or <code>null</code> if not present
-     */
-    @Nullable String getObjectClass();
-    
-    /**
-     * @return <code>org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.TDistinguishedName</code> <code>id</code>, or <code>null</code> if not present
-     */
-    @Nullable TDistinguishedName getId();
-
-}
-
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/$YangModelBindingProvider.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/$YangModelBindingProvider.java
deleted file mode 100644 (file)
index 9bfd8cb..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-
-public final class $YangModelBindingProvider implements org.opendaylight.yangtools.yang.binding.YangModelBindingProvider {
-    @java.lang.Override
-    public org.opendaylight.yangtools.yang.binding.YangModuleInfo getModuleInfo() {
-        return $YangModuleInfoImpl.getInstance();
-    }
-}
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/$YangModuleInfoImpl.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/$YangModuleInfoImpl.java
deleted file mode 100644 (file)
index 7ad939a..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-
-import org.opendaylight.yangtools.yang.binding.ResourceYangModuleInfo;
-import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.binding.YangModuleInfo;
-import java.util.Set;
-import java.util.HashSet;
-import com.google.common.collect.ImmutableSet;
-
-public final class $YangModuleInfoImpl extends ResourceYangModuleInfo {
-    private static final QName NAME = QName.create("urn:3gpp:tsg:sa5:nrm:types", "2018-07-31", "_3gpp-common-yang-types").intern();
-    private static final YangModuleInfo INSTANCE = new $YangModuleInfoImpl();
-
-    private final Set<YangModuleInfo> importedModules;
-
-    public static YangModuleInfo getInstance() {
-        return INSTANCE;
-    }
-
-    public static QName qnameOf(final java.lang.String localName) {
-        return QName.create(NAME, localName).intern();
-    }
-
-    private $YangModuleInfoImpl() {
-        Set<YangModuleInfo> set = new HashSet<>();
-        set.add(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.$YangModuleInfoImpl.getInstance());
-        set.add(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.$YangModuleInfoImpl.getInstance());
-        importedModules = ImmutableSet.copyOf(set);
-    }
-    
-    @java.lang.Override
-    public QName getName() {
-        return NAME;
-    }
-    
-    @java.lang.Override
-    protected java.lang.String resourceName() {
-        return "/META-INF/yang/_3gpp-common-yang-types@2018-07-31.yang";
-    }
-    
-    @java.lang.Override
-    public Set<YangModuleInfo> getImportedModules() {
-        return importedModules;
-    }
-    
-    
-}
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/AMFIdentifier.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/AMFIdentifier.java
deleted file mode 100644 (file)
index 6068ed2..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import org.eclipse.jdt.annotation.Nullable;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.common.QName;
-
-/**
- *
- * <p>
- * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
- * <pre>
- * grouping aMFIdentifier {
- *   leaf AMF-Region-id {
- *     type t_aMF-Region-id;
- *   }
- *   leaf AMF-Set-id {
- *     type t_aMF-Set-id;
- *   }
- *   leaf AMF-Pointer {
- *     type t_aMF-Pointer;
- *   }
- * }
- * </pre>The schema path to identify an instance is
- * <i>_3gpp-common-yang-types/aMFIdentifier</i>
- *
- */
-public interface AMFIdentifier
-    extends
-    DataObject
-{
-
-
-
-    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("aMFIdentifier");
-
-    /**
-     * @return <code>org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.TAMFRegionId</code> <code>aMFRegionId</code>, or <code>null</code> if not present
-     */
-    @Nullable TAMFRegionId getAMFRegionId();
-    
-    /**
-     * @return <code>org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.TAMFSetId</code> <code>aMFSetId</code>, or <code>null</code> if not present
-     */
-    @Nullable TAMFSetId getAMFSetId();
-    
-    /**
-     * @return <code>org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.TAMFPointer</code> <code>aMFPointer</code>, or <code>null</code> if not present
-     */
-    @Nullable TAMFPointer getAMFPointer();
-
-}
-
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/BwpContext.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/BwpContext.java
deleted file mode 100644 (file)
index c9e052b..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableMap.Builder;
-import java.lang.Integer;
-import java.lang.Override;
-import java.lang.String;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import org.opendaylight.yangtools.yang.binding.Enumeration;
-
-public enum BwpContext implements Enumeration {
-    DL(0, "DL"),
-    
-    UL(1, "UL"),
-    
-    SUL(2, "SUL")
-    ;
-
-    private static final Map<String, BwpContext> NAME_MAP;
-    private static final Map<Integer, BwpContext> VALUE_MAP;
-
-    static {
-        final Builder<String, BwpContext> nb = ImmutableMap.builder();
-        final Builder<Integer, BwpContext> vb = ImmutableMap.builder();
-        for (BwpContext enumItem : BwpContext.values()) {
-            vb.put(enumItem.value, enumItem);
-            nb.put(enumItem.name, enumItem);
-        }
-
-        NAME_MAP = nb.build();
-        VALUE_MAP = vb.build();
-    }
-
-    private final String name;
-    private final int value;
-
-    private BwpContext(int value, String name) {
-        this.value = value;
-        this.name = name;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public int getIntValue() {
-        return value;
-    }
-
-    /**
-     * Return the enumeration member whose {@link #getName()} matches specified value.
-     *
-     * @param name YANG assigned name
-     * @return corresponding BwpContext item, if present
-     * @throws NullPointerException if name is null
-     */
-    public static Optional<BwpContext> forName(String name) {
-        return Optional.ofNullable(NAME_MAP.get(Objects.requireNonNull(name)));
-    }
-
-    /**
-     * Return the enumeration member whose {@link #getIntValue()} matches specified value.
-     *
-     * @param intValue integer value
-     * @return corresponding BwpContext item, or null if no such item exists
-     */
-    public static BwpContext forValue(int intValue) {
-        return VALUE_MAP.get(intValue);
-    }
-}
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/DataSetId.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/DataSetId.java
deleted file mode 100644 (file)
index 3585bfb..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableMap.Builder;
-import java.lang.Integer;
-import java.lang.Override;
-import java.lang.String;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import org.opendaylight.yangtools.yang.binding.Enumeration;
-
-public enum DataSetId implements Enumeration {
-    SUBSCRIPTION(0, "SUBSCRIPTION"),
-    
-    POLICY(1, "POLICY"),
-    
-    EXPOSURE(2, "EXPOSURE"),
-    
-    APPLICATION(3, "APPLICATION")
-    ;
-
-    private static final Map<String, DataSetId> NAME_MAP;
-    private static final Map<Integer, DataSetId> VALUE_MAP;
-
-    static {
-        final Builder<String, DataSetId> nb = ImmutableMap.builder();
-        final Builder<Integer, DataSetId> vb = ImmutableMap.builder();
-        for (DataSetId enumItem : DataSetId.values()) {
-            vb.put(enumItem.value, enumItem);
-            nb.put(enumItem.name, enumItem);
-        }
-
-        NAME_MAP = nb.build();
-        VALUE_MAP = vb.build();
-    }
-
-    private final String name;
-    private final int value;
-
-    private DataSetId(int value, String name) {
-        this.value = value;
-        this.name = name;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public int getIntValue() {
-        return value;
-    }
-
-    /**
-     * Return the enumeration member whose {@link #getName()} matches specified value.
-     *
-     * @param name YANG assigned name
-     * @return corresponding DataSetId item, if present
-     * @throws NullPointerException if name is null
-     */
-    public static Optional<DataSetId> forName(String name) {
-        return Optional.ofNullable(NAME_MAP.get(Objects.requireNonNull(name)));
-    }
-
-    /**
-     * Return the enumeration member whose {@link #getIntValue()} matches specified value.
-     *
-     * @param intValue integer value
-     * @return corresponding DataSetId item, or null if no such item exists
-     */
-    public static DataSetId forValue(int intValue) {
-        return VALUE_MAP.get(intValue);
-    }
-}
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/DefaultNotificationSubscription.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/DefaultNotificationSubscription.java
deleted file mode 100644 (file)
index 969d5cb..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import org.eclipse.jdt.annotation.Nullable;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.common.QName;
-
-/**
- *
- * <p>
- * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
- * <pre>
- * grouping defaultNotificationSubscription {
- *   leaf notificationType {
- *     type NotificationType;
- *   }
- *   leaf callbackUri {
- *     type inet:uri;
- *   }
- *   leaf n1MessageClass {
- *     type N1MessageClass;
- *   }
- *   leaf n2InformationClass {
- *     type N2InformationClass;
- *   }
- * }
- * </pre>The schema path to identify an instance is
- * <i>_3gpp-common-yang-types/defaultNotificationSubscription</i>
- *
- */
-public interface DefaultNotificationSubscription
-    extends
-    DataObject
-{
-
-
-
-    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("defaultNotificationSubscription");
-
-    /**
-     * @return <code>org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.NotificationType</code> <code>notificationType</code>, or <code>null</code> if not present
-     */
-    @Nullable NotificationType getNotificationType();
-    
-    /**
-     * @return <code>org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri</code> <code>callbackUri</code>, or <code>null</code> if not present
-     */
-    @Nullable Uri getCallbackUri();
-    
-    /**
-     * @return <code>org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.N1MessageClass</code> <code>n1MessageClass</code>, or <code>null</code> if not present
-     */
-    @Nullable N1MessageClass getN1MessageClass();
-    
-    /**
-     * @return <code>org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.N2InformationClass</code> <code>n2InformationClass</code>, or <code>null</code> if not present
-     */
-    @Nullable N2InformationClass getN2InformationClass();
-
-}
-
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/DnnUpfInfoItem.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/DnnUpfInfoItem.java
deleted file mode 100644 (file)
index a21ffc1..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import org.eclipse.jdt.annotation.Nullable;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.common.QName;
-
-/**
- *
- * <p>
- * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
- * <pre>
- * grouping DnnUpfInfoItem {
- *   leaf dnn {
- *     type t_Dnn;
- *   }
- * }
- * </pre>The schema path to identify an instance is
- * <i>_3gpp-common-yang-types/DnnUpfInfoItem</i>
- *
- */
-public interface DnnUpfInfoItem
-    extends
-    DataObject
-{
-
-
-
-    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("DnnUpfInfoItem");
-
-    /**
-     * @return <code>org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.TDnn</code> <code>dnn</code>, or <code>null</code> if not present
-     */
-    @Nullable TDnn getDnn();
-
-}
-
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/Guami.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/Guami.java
deleted file mode 100644 (file)
index 94a4ca1..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import org.eclipse.jdt.annotation.Nullable;
-import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.guami.AmfId;
-import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.guami.PlmnId;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.common.QName;
-
-/**
- *
- * <p>
- * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
- * <pre>
- * grouping Guami {
- *   container plmnId {
- *     uses pLMNId;
- *   }
- *   container amfId {
- *     uses aMFIdentifier;
- *   }
- * }
- * </pre>The schema path to identify an instance is
- * <i>_3gpp-common-yang-types/Guami</i>
- *
- */
-public interface Guami
-    extends
-    DataObject
-{
-
-
-
-    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("Guami");
-
-    /**
-     * @return <code>org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.guami.PlmnId</code> <code>plmnId</code>, or <code>null</code> if not present
-     */
-    @Nullable PlmnId getPlmnId();
-    
-    /**
-     * @return <code>org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.guami.AmfId</code> <code>amfId</code>, or <code>null</code> if not present
-     */
-    @Nullable AmfId getAmfId();
-
-}
-
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/IdentityRange.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/IdentityRange.java
deleted file mode 100644 (file)
index 4146a26..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import java.lang.String;
-import org.eclipse.jdt.annotation.Nullable;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.common.QName;
-
-/**
- *
- * <p>
- * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
- * <pre>
- * grouping IdentityRange {
- *   leaf start {
- *     type string;
- *   }
- *   leaf end {
- *     type string;
- *   }
- *   leaf pattern {
- *     type string;
- *   }
- * }
- * </pre>The schema path to identify an instance is
- * <i>_3gpp-common-yang-types/IdentityRange</i>
- *
- */
-public interface IdentityRange
-    extends
-    DataObject
-{
-
-
-
-    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("IdentityRange");
-
-    /**
-     * @return <code>java.lang.String</code> <code>start</code>, or <code>null</code> if not present
-     */
-    @Nullable String getStart();
-    
-    /**
-     * @return <code>java.lang.String</code> <code>end</code>, or <code>null</code> if not present
-     */
-    @Nullable String getEnd();
-    
-    /**
-     * @return <code>java.lang.String</code> <code>pattern</code>, or <code>null</code> if not present
-     */
-    @Nullable String getPattern();
-
-}
-
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/InterfaceUpfInfoItem.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/InterfaceUpfInfoItem.java
deleted file mode 100644 (file)
index a3a32e2..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import java.lang.String;
-import org.eclipse.jdt.annotation.Nullable;
-import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.interfaceupfinfoitem.Address;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.common.QName;
-
-/**
- *
- * <p>
- * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
- * <pre>
- * grouping InterfaceUpfInfoItem {
- *   leaf interfaceType {
- *     type UPInterfaceType;
- *   }
- *   choice address {
- *     case ipv4Address {
- *       leaf ipv4Address {
- *         type inet:ipv4-address;
- *       }
- *     }
- *     case ipv6Address {
- *       leaf ipv6Address {
- *         type inet:ipv6-address;
- *       }
- *     }
- *     case ipv6Prefix {
- *       leaf ipv6Prefix {
- *         type inet:ipv6-prefix;
- *       }
- *     }
- *     case endpointFqdn {
- *       leaf endpointFqdn {
- *         type inet:domain-name;
- *       }
- *     }
- *   }
- *   leaf networkInstance {
- *     type string;
- *   }
- * }
- * </pre>The schema path to identify an instance is
- * <i>_3gpp-common-yang-types/InterfaceUpfInfoItem</i>
- *
- */
-public interface InterfaceUpfInfoItem
-    extends
-    DataObject
-{
-
-
-
-    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("InterfaceUpfInfoItem");
-
-    /**
-     * @return <code>org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.UPInterfaceType</code> <code>interfaceType</code>, or <code>null</code> if not present
-     */
-    @Nullable UPInterfaceType getInterfaceType();
-    
-    /**
-     * @return <code>org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.interfaceupfinfoitem.Address</code> <code>address</code>, or <code>null</code> if not present
-     */
-    @Nullable Address getAddress();
-    
-    /**
-     * @return <code>java.lang.String</code> <code>networkInstance</code>, or <code>null</code> if not present
-     */
-    @Nullable String getNetworkInstance();
-
-}
-
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/IpEndPoint.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/IpEndPoint.java
deleted file mode 100644 (file)
index 4853cc3..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import java.lang.Integer;
-import org.eclipse.jdt.annotation.Nullable;
-import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.ipendpoint.Address;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.common.QName;
-
-/**
- *
- * <p>
- * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
- * <pre>
- * grouping ipEndPoint {
- *   choice address {
- *     case ipv4Address {
- *       leaf ipv4Address {
- *         type inet:ipv4-address;
- *       }
- *     }
- *     case ipv6Address {
- *       leaf ipv6Address {
- *         type inet:ipv6-address;
- *       }
- *     }
- *     case ipv6Prefix {
- *       leaf ipv6Prefix {
- *         type inet:ipv6-prefix;
- *       }
- *     }
- *   }
- *   leaf transport {
- *     type t_TransportProtocol;
- *   }
- *   leaf port {
- *     type uint16;
- *   }
- * }
- * </pre>The schema path to identify an instance is
- * <i>_3gpp-common-yang-types/ipEndPoint</i>
- *
- */
-public interface IpEndPoint
-    extends
-    DataObject
-{
-
-
-
-    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("ipEndPoint");
-
-    /**
-     * @return <code>org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.ipendpoint.Address</code> <code>address</code>, or <code>null</code> if not present
-     */
-    @Nullable Address getAddress();
-    
-    /**
-     * @return <code>org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.TTransportProtocol</code> <code>transport</code>, or <code>null</code> if not present
-     */
-    @Nullable TTransportProtocol getTransport();
-    
-    /**
-     * @return <code>java.lang.Integer</code> <code>port</code>, or <code>null</code> if not present
-     */
-    @Nullable Integer getPort();
-
-}
-
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/Ipv4AddressRange.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/Ipv4AddressRange.java
deleted file mode 100644 (file)
index 1684893..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import org.eclipse.jdt.annotation.Nullable;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.common.QName;
-
-/**
- *
- * <p>
- * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
- * <pre>
- * grouping Ipv4AddressRange {
- *   leaf start {
- *     type inet:ipv4-address;
- *   }
- *   leaf end {
- *     type inet:ipv4-address;
- *   }
- * }
- * </pre>The schema path to identify an instance is
- * <i>_3gpp-common-yang-types/Ipv4AddressRange</i>
- *
- */
-public interface Ipv4AddressRange
-    extends
-    DataObject
-{
-
-
-
-    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("Ipv4AddressRange");
-
-    /**
-     * @return <code>org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address</code> <code>start</code>, or <code>null</code> if not present
-     */
-    @Nullable Ipv4Address getStart();
-    
-    /**
-     * @return <code>org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address</code> <code>end</code>, or <code>null</code> if not present
-     */
-    @Nullable Ipv4Address getEnd();
-
-}
-
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/Ipv6PrefixRange.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/Ipv6PrefixRange.java
deleted file mode 100644 (file)
index 60bb7db..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import org.eclipse.jdt.annotation.Nullable;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.common.QName;
-
-/**
- *
- * <p>
- * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
- * <pre>
- * grouping Ipv6PrefixRange {
- *   leaf start {
- *     type inet:ipv6-prefix;
- *   }
- *   leaf end {
- *     type inet:ipv6-prefix;
- *   }
- * }
- * </pre>The schema path to identify an instance is
- * <i>_3gpp-common-yang-types/Ipv6PrefixRange</i>
- *
- */
-public interface Ipv6PrefixRange
-    extends
-    DataObject
-{
-
-
-
-    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("Ipv6PrefixRange");
-
-    /**
-     * @return <code>org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix</code> <code>start</code>, or <code>null</code> if not present
-     */
-    @Nullable Ipv6Prefix getStart();
-    
-    /**
-     * @return <code>org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix</code> <code>end</code>, or <code>null</code> if not present
-     */
-    @Nullable Ipv6Prefix getEnd();
-
-}
-
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/IsInitialBwp.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/IsInitialBwp.java
deleted file mode 100644 (file)
index 7073ca5..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableMap.Builder;
-import java.lang.Integer;
-import java.lang.Override;
-import java.lang.String;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import org.opendaylight.yangtools.yang.binding.Enumeration;
-
-public enum IsInitialBwp implements Enumeration {
-    INITIAL(0, "INITIAL"),
-    
-    OTHER(1, "OTHER")
-    ;
-
-    private static final Map<String, IsInitialBwp> NAME_MAP;
-    private static final Map<Integer, IsInitialBwp> VALUE_MAP;
-
-    static {
-        final Builder<String, IsInitialBwp> nb = ImmutableMap.builder();
-        final Builder<Integer, IsInitialBwp> vb = ImmutableMap.builder();
-        for (IsInitialBwp enumItem : IsInitialBwp.values()) {
-            vb.put(enumItem.value, enumItem);
-            nb.put(enumItem.name, enumItem);
-        }
-
-        NAME_MAP = nb.build();
-        VALUE_MAP = vb.build();
-    }
-
-    private final String name;
-    private final int value;
-
-    private IsInitialBwp(int value, String name) {
-        this.value = value;
-        this.name = name;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public int getIntValue() {
-        return value;
-    }
-
-    /**
-     * Return the enumeration member whose {@link #getName()} matches specified value.
-     *
-     * @param name YANG assigned name
-     * @return corresponding IsInitialBwp item, if present
-     * @throws NullPointerException if name is null
-     */
-    public static Optional<IsInitialBwp> forName(String name) {
-        return Optional.ofNullable(NAME_MAP.get(Objects.requireNonNull(name)));
-    }
-
-    /**
-     * Return the enumeration member whose {@link #getIntValue()} matches specified value.
-     *
-     * @param intValue integer value
-     * @return corresponding IsInitialBwp item, or null if no such item exists
-     */
-    public static IsInitialBwp forValue(int intValue) {
-        return VALUE_MAP.get(intValue);
-    }
-}
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/N1MessageClass.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/N1MessageClass.java
deleted file mode 100644 (file)
index f08c101..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableMap.Builder;
-import java.lang.Integer;
-import java.lang.Override;
-import java.lang.String;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import org.opendaylight.yangtools.yang.binding.Enumeration;
-
-public enum N1MessageClass implements Enumeration {
-    _5GMM(0, "5GMM"),
-    
-    SM(1, "SM"),
-    
-    LPP(2, "LPP"),
-    
-    SMS(3, "SMS")
-    ;
-
-    private static final Map<String, N1MessageClass> NAME_MAP;
-    private static final Map<Integer, N1MessageClass> VALUE_MAP;
-
-    static {
-        final Builder<String, N1MessageClass> nb = ImmutableMap.builder();
-        final Builder<Integer, N1MessageClass> vb = ImmutableMap.builder();
-        for (N1MessageClass enumItem : N1MessageClass.values()) {
-            vb.put(enumItem.value, enumItem);
-            nb.put(enumItem.name, enumItem);
-        }
-
-        NAME_MAP = nb.build();
-        VALUE_MAP = vb.build();
-    }
-
-    private final String name;
-    private final int value;
-
-    private N1MessageClass(int value, String name) {
-        this.value = value;
-        this.name = name;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public int getIntValue() {
-        return value;
-    }
-
-    /**
-     * Return the enumeration member whose {@link #getName()} matches specified value.
-     *
-     * @param name YANG assigned name
-     * @return corresponding N1MessageClass item, if present
-     * @throws NullPointerException if name is null
-     */
-    public static Optional<N1MessageClass> forName(String name) {
-        return Optional.ofNullable(NAME_MAP.get(Objects.requireNonNull(name)));
-    }
-
-    /**
-     * Return the enumeration member whose {@link #getIntValue()} matches specified value.
-     *
-     * @param intValue integer value
-     * @return corresponding N1MessageClass item, or null if no such item exists
-     */
-    public static N1MessageClass forValue(int intValue) {
-        return VALUE_MAP.get(intValue);
-    }
-}
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/N2InformationClass.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/N2InformationClass.java
deleted file mode 100644 (file)
index 8353780..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableMap.Builder;
-import java.lang.Integer;
-import java.lang.Override;
-import java.lang.String;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import org.opendaylight.yangtools.yang.binding.Enumeration;
-
-public enum N2InformationClass implements Enumeration {
-    SM(0, "SM"),
-    
-    NRPPa(1, "NRPPa"),
-    
-    PWS(2, "PWS"),
-    
-    PWSBCAL(3, "PWS-BCAL"),
-    
-    PWSRF(4, "PWS-RF")
-    ;
-
-    private static final Map<String, N2InformationClass> NAME_MAP;
-    private static final Map<Integer, N2InformationClass> VALUE_MAP;
-
-    static {
-        final Builder<String, N2InformationClass> nb = ImmutableMap.builder();
-        final Builder<Integer, N2InformationClass> vb = ImmutableMap.builder();
-        for (N2InformationClass enumItem : N2InformationClass.values()) {
-            vb.put(enumItem.value, enumItem);
-            nb.put(enumItem.name, enumItem);
-        }
-
-        NAME_MAP = nb.build();
-        VALUE_MAP = vb.build();
-    }
-
-    private final String name;
-    private final int value;
-
-    private N2InformationClass(int value, String name) {
-        this.value = value;
-        this.name = name;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public int getIntValue() {
-        return value;
-    }
-
-    /**
-     * Return the enumeration member whose {@link #getName()} matches specified value.
-     *
-     * @param name YANG assigned name
-     * @return corresponding N2InformationClass item, if present
-     * @throws NullPointerException if name is null
-     */
-    public static Optional<N2InformationClass> forName(String name) {
-        return Optional.ofNullable(NAME_MAP.get(Objects.requireNonNull(name)));
-    }
-
-    /**
-     * Return the enumeration member whose {@link #getIntValue()} matches specified value.
-     *
-     * @param intValue integer value
-     * @return corresponding N2InformationClass item, or null if no such item exists
-     */
-    public static N2InformationClass forValue(int intValue) {
-        return VALUE_MAP.get(intValue);
-    }
-}
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/NFServiceVersion.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/NFServiceVersion.java
deleted file mode 100644 (file)
index 983cc5b..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import java.lang.String;
-import org.eclipse.jdt.annotation.Nullable;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.common.QName;
-
-/**
- *
- * <p>
- * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
- * <pre>
- * grouping NFServiceVersion {
- *   leaf apiVersionInUri {
- *     type string;
- *   }
- *   leaf apiFullVersion {
- *     type string;
- *   }
- *   leaf expiry {
- *     type yang:date-and-time;
- *   }
- * }
- * </pre>The schema path to identify an instance is
- * <i>_3gpp-common-yang-types/NFServiceVersion</i>
- *
- */
-public interface NFServiceVersion
-    extends
-    DataObject
-{
-
-
-
-    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("NFServiceVersion");
-
-    /**
-     * @return <code>java.lang.String</code> <code>apiVersionInUri</code>, or <code>null</code> if not present
-     */
-    @Nullable String getApiVersionInUri();
-    
-    /**
-     * @return <code>java.lang.String</code> <code>apiFullVersion</code>, or <code>null</code> if not present
-     */
-    @Nullable String getApiFullVersion();
-    
-    /**
-     * @return <code>org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime</code> <code>expiry</code>, or <code>null</code> if not present
-     */
-    @Nullable DateAndTime getExpiry();
-
-}
-
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/NFStatus.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/NFStatus.java
deleted file mode 100644 (file)
index aa11f71..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableMap.Builder;
-import java.lang.Integer;
-import java.lang.Override;
-import java.lang.String;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import org.opendaylight.yangtools.yang.binding.Enumeration;
-
-public enum NFStatus implements Enumeration {
-    REGISTERED(0, "REGISTERED"),
-    
-    SUSPENDED(1, "SUSPENDED")
-    ;
-
-    private static final Map<String, NFStatus> NAME_MAP;
-    private static final Map<Integer, NFStatus> VALUE_MAP;
-
-    static {
-        final Builder<String, NFStatus> nb = ImmutableMap.builder();
-        final Builder<Integer, NFStatus> vb = ImmutableMap.builder();
-        for (NFStatus enumItem : NFStatus.values()) {
-            vb.put(enumItem.value, enumItem);
-            nb.put(enumItem.name, enumItem);
-        }
-
-        NAME_MAP = nb.build();
-        VALUE_MAP = vb.build();
-    }
-
-    private final String name;
-    private final int value;
-
-    private NFStatus(int value, String name) {
-        this.value = value;
-        this.name = name;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public int getIntValue() {
-        return value;
-    }
-
-    /**
-     * Return the enumeration member whose {@link #getName()} matches specified value.
-     *
-     * @param name YANG assigned name
-     * @return corresponding NFStatus item, if present
-     * @throws NullPointerException if name is null
-     */
-    public static Optional<NFStatus> forName(String name) {
-        return Optional.ofNullable(NAME_MAP.get(Objects.requireNonNull(name)));
-    }
-
-    /**
-     * Return the enumeration member whose {@link #getIntValue()} matches specified value.
-     *
-     * @param intValue integer value
-     * @return corresponding NFStatus item, or null if no such item exists
-     */
-    public static NFStatus forValue(int intValue) {
-        return VALUE_MAP.get(intValue);
-    }
-}
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/NFType.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/NFType.java
deleted file mode 100644 (file)
index 8789e43..0000000
+++ /dev/null
@@ -1,107 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableMap.Builder;
-import java.lang.Integer;
-import java.lang.Override;
-import java.lang.String;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import org.opendaylight.yangtools.yang.binding.Enumeration;
-
-public enum NFType implements Enumeration {
-    NRF(0, "NRF"),
-    
-    UDM(1, "UDM"),
-    
-    AMF(2, "AMF"),
-    
-    SMF(3, "SMF"),
-    
-    AUSF(4, "AUSF"),
-    
-    NEF(5, "NEF"),
-    
-    PCF(6, "PCF"),
-    
-    SMSF(7, "SMSF"),
-    
-    NSSF(8, "NSSF"),
-    
-    UDR(9, "UDR"),
-    
-    LMF(10, "LMF"),
-    
-    GMLC(11, "GMLC"),
-    
-    _5GEIR(12, "5G_EIR"),
-    
-    SEPP(13, "SEPP"),
-    
-    UPF(14, "UPF"),
-    
-    N3IWF(15, "N3IWF"),
-    
-    AF(16, "AF"),
-    
-    UDSF(17, "UDSF"),
-    
-    BSF(18, "BSF"),
-    
-    CHF(19, "CHF")
-    ;
-
-    private static final Map<String, NFType> NAME_MAP;
-    private static final Map<Integer, NFType> VALUE_MAP;
-
-    static {
-        final Builder<String, NFType> nb = ImmutableMap.builder();
-        final Builder<Integer, NFType> vb = ImmutableMap.builder();
-        for (NFType enumItem : NFType.values()) {
-            vb.put(enumItem.value, enumItem);
-            nb.put(enumItem.name, enumItem);
-        }
-
-        NAME_MAP = nb.build();
-        VALUE_MAP = vb.build();
-    }
-
-    private final String name;
-    private final int value;
-
-    private NFType(int value, String name) {
-        this.value = value;
-        this.name = name;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public int getIntValue() {
-        return value;
-    }
-
-    /**
-     * Return the enumeration member whose {@link #getName()} matches specified value.
-     *
-     * @param name YANG assigned name
-     * @return corresponding NFType item, if present
-     * @throws NullPointerException if name is null
-     */
-    public static Optional<NFType> forName(String name) {
-        return Optional.ofNullable(NAME_MAP.get(Objects.requireNonNull(name)));
-    }
-
-    /**
-     * Return the enumeration member whose {@link #getIntValue()} matches specified value.
-     *
-     * @param intValue integer value
-     * @return corresponding NFType item, or null if no such item exists
-     */
-    public static NFType forValue(int intValue) {
-        return VALUE_MAP.get(intValue);
-    }
-}
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/NotificationEventType.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/NotificationEventType.java
deleted file mode 100644 (file)
index e0857a8..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableMap.Builder;
-import java.lang.Integer;
-import java.lang.Override;
-import java.lang.String;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import org.opendaylight.yangtools.yang.binding.Enumeration;
-
-public enum NotificationEventType implements Enumeration {
-    NFREGISTERED(0, "NF_REGISTERED"),
-    
-    NFDEREGISTERED(1, "NF_DEREGISTERED"),
-    
-    NFPROFILECHANGED(2, "NF_PROFILE_CHANGED")
-    ;
-
-    private static final Map<String, NotificationEventType> NAME_MAP;
-    private static final Map<Integer, NotificationEventType> VALUE_MAP;
-
-    static {
-        final Builder<String, NotificationEventType> nb = ImmutableMap.builder();
-        final Builder<Integer, NotificationEventType> vb = ImmutableMap.builder();
-        for (NotificationEventType enumItem : NotificationEventType.values()) {
-            vb.put(enumItem.value, enumItem);
-            nb.put(enumItem.name, enumItem);
-        }
-
-        NAME_MAP = nb.build();
-        VALUE_MAP = vb.build();
-    }
-
-    private final String name;
-    private final int value;
-
-    private NotificationEventType(int value, String name) {
-        this.value = value;
-        this.name = name;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public int getIntValue() {
-        return value;
-    }
-
-    /**
-     * Return the enumeration member whose {@link #getName()} matches specified value.
-     *
-     * @param name YANG assigned name
-     * @return corresponding NotificationEventType item, if present
-     * @throws NullPointerException if name is null
-     */
-    public static Optional<NotificationEventType> forName(String name) {
-        return Optional.ofNullable(NAME_MAP.get(Objects.requireNonNull(name)));
-    }
-
-    /**
-     * Return the enumeration member whose {@link #getIntValue()} matches specified value.
-     *
-     * @param intValue integer value
-     * @return corresponding NotificationEventType item, or null if no such item exists
-     */
-    public static NotificationEventType forValue(int intValue) {
-        return VALUE_MAP.get(intValue);
-    }
-}
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/NotificationType.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/NotificationType.java
deleted file mode 100644 (file)
index e78ba7b..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableMap.Builder;
-import java.lang.Integer;
-import java.lang.Override;
-import java.lang.String;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import org.opendaylight.yangtools.yang.binding.Enumeration;
-
-public enum NotificationType implements Enumeration {
-    N1MESSAGES(0, "N1_MESSAGES"),
-    
-    N2INFORMATION(1, "N2_INFORMATION"),
-    
-    LOCATIONNOTIFICATION(2, "LOCATION_NOTIFICATION")
-    ;
-
-    private static final Map<String, NotificationType> NAME_MAP;
-    private static final Map<Integer, NotificationType> VALUE_MAP;
-
-    static {
-        final Builder<String, NotificationType> nb = ImmutableMap.builder();
-        final Builder<Integer, NotificationType> vb = ImmutableMap.builder();
-        for (NotificationType enumItem : NotificationType.values()) {
-            vb.put(enumItem.value, enumItem);
-            nb.put(enumItem.name, enumItem);
-        }
-
-        NAME_MAP = nb.build();
-        VALUE_MAP = vb.build();
-    }
-
-    private final String name;
-    private final int value;
-
-    private NotificationType(int value, String name) {
-        this.value = value;
-        this.name = name;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public int getIntValue() {
-        return value;
-    }
-
-    /**
-     * Return the enumeration member whose {@link #getName()} matches specified value.
-     *
-     * @param name YANG assigned name
-     * @return corresponding NotificationType item, if present
-     * @throws NullPointerException if name is null
-     */
-    public static Optional<NotificationType> forName(String name) {
-        return Optional.ofNullable(NAME_MAP.get(Objects.requireNonNull(name)));
-    }
-
-    /**
-     * Return the enumeration member whose {@link #getIntValue()} matches specified value.
-     *
-     * @param intValue integer value
-     * @return corresponding NotificationType item, or null if no such item exists
-     */
-    public static NotificationType forValue(int intValue) {
-        return VALUE_MAP.get(intValue);
-    }
-}
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/PLMNId.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/PLMNId.java
deleted file mode 100644 (file)
index 24bb8d6..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import org.eclipse.jdt.annotation.Nullable;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.common.QName;
-
-/**
- * A Public Land Mobile Network is uniquely identified by its PLMN identifier. 
- * PLMN-Id consists of Mobile Country Code (MCC) and Mobile Network Code (MNC).
- *
- * <p>
- * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
- * <pre>
- * grouping pLMNId {
- *   leaf MCC {
- *     type t_mcc;
- *   }
- *   leaf MNC {
- *     type t_mnc;
- *   }
- * }
- * </pre>The schema path to identify an instance is
- * <i>_3gpp-common-yang-types/pLMNId</i>
- *
- */
-public interface PLMNId
-    extends
-    DataObject
-{
-
-
-
-    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("pLMNId");
-
-    /**
-     * Mobile Country Code (MCC), consisting of three decimal digits.The MCC identifies
-     * uniquely the country of domicile of the mobile subscription.
-     *
-     *
-     *
-     * @return <code>org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.TMcc</code> <code>mCC</code>, or <code>null</code> if not present
-     */
-    @Nullable TMcc getMCC();
-    
-    /**
-     * Mobile Network Code (MNC), consisting of two or three decimal digits.The MNC 
-     * identifies the home PLMN of the mobile subscription.
-     *
-     *
-     *
-     * @return <code>org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.TMnc</code> <code>mNC</code>, or <code>null</code> if not present
-     */
-    @Nullable TMnc getMNC();
-
-}
-
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/QOffsetRange.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/QOffsetRange.java
deleted file mode 100644 (file)
index 5854ab5..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import com.google.common.base.MoreObjects;
-import java.beans.ConstructorProperties;
-import java.io.Serializable;
-import java.lang.Override;
-import java.lang.Short;
-import java.lang.String;
-import java.util.Objects;
-import org.opendaylight.yangtools.yang.binding.CodeHelpers;
-import org.opendaylight.yangtools.yang.binding.TypeObject;
-
-public class QOffsetRange
- implements TypeObject, Serializable {
-    private static final long serialVersionUID = 6398961204554971940L;
-    private final Short _value;
-
-    private static void check_valueRange(final short value) {
-        if (value >= (short)0 && value <= (short)255) {
-            return;
-        }
-        CodeHelpers.throwInvalidRange("[[0..255]]", value);
-    }
-
-    @ConstructorProperties("value")
-    public QOffsetRange(Short _value) {
-        if (_value != null) {
-            check_valueRange(_value);
-        }
-    
-        Objects.requireNonNull(_value, "Supplied value may not be null");
-    
-        this._value = _value;
-    }
-    
-    /**
-     * Creates a copy from Source Object.
-     *
-     * @param source Source object
-     */
-    public QOffsetRange(QOffsetRange source) {
-        this._value = source._value;
-    }
-
-    public static QOffsetRange getDefaultInstance(String defaultValue) {
-        return new QOffsetRange(Short.valueOf(defaultValue));
-    }
-
-    public Short getValue() {
-        return _value;
-    }
-
-
-    @Override
-    public int hashCode() {
-        return CodeHelpers.wrapperHashCode(_value);
-    }
-
-    @Override
-    public boolean equals(java.lang.Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        QOffsetRange other = (QOffsetRange) obj;
-        if (!Objects.equals(_value, other._value)) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public String toString() {
-        final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(QOffsetRange.class);
-        CodeHelpers.appendValue(helper, "_value", _value);
-        return helper.toString();
-    }
-}
-
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/RRMPolicyRatio2.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/RRMPolicyRatio2.java
deleted file mode 100644 (file)
index 5669971..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import java.lang.Integer;
-import java.lang.Short;
-import java.util.List;
-import org.eclipse.jdt.annotation.Nullable;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.common.QName;
-
-/**
- *
- * <p>
- * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
- * <pre>
- * grouping RRMPolicyRatio2 {
- *   leaf groupId {
- *     type uint16;
- *   }
- *   leaf-list sNSSAI {
- *     type t_s-NSSAI;
- *   }
- *   leaf quotaType {
- *     type t_quotaType;
- *   }
- *   leaf rRMPolicyMaxRation {
- *     type uint8;
- *   }
- *   leaf rRMPolicyMarginMaxRation {
- *     type uint8;
- *   }
- *   leaf rRMPolicyMinRation {
- *     type uint8;
- *   }
- *   leaf rRMPolicyMarginMinRation {
- *     type uint8;
- *   }
- * }
- * </pre>The schema path to identify an instance is
- * <i>_3gpp-common-yang-types/RRMPolicyRatio2</i>
- *
- */
-public interface RRMPolicyRatio2
-    extends
-    DataObject
-{
-
-
-
-    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("RRMPolicyRatio2");
-
-    /**
-     * @return <code>java.lang.Integer</code> <code>groupId</code>, or <code>null</code> if not present
-     */
-    @Nullable Integer getGroupId();
-    
-    /**
-     * @return <code>java.util.List</code> <code>sNSSAI</code>, or <code>null</code> if not present
-     */
-    @Nullable List<TSNSSAI> getSNSSAI();
-    
-    /**
-     * @return <code>org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.TQuotaType</code> <code>quotaType</code>, or <code>null</code> if not present
-     */
-    @Nullable TQuotaType getQuotaType();
-    
-    /**
-     * @return <code>java.lang.Short</code> <code>rRMPolicyMaxRation</code>, or <code>null</code> if not present
-     */
-    @Nullable Short getRRMPolicyMaxRation();
-    
-    /**
-     * @return <code>java.lang.Short</code> <code>rRMPolicyMarginMaxRation</code>, or <code>null</code> if not present
-     */
-    @Nullable Short getRRMPolicyMarginMaxRation();
-    
-    /**
-     * @return <code>java.lang.Short</code> <code>rRMPolicyMinRation</code>, or <code>null</code> if not present
-     */
-    @Nullable Short getRRMPolicyMinRation();
-    
-    /**
-     * @return <code>java.lang.Short</code> <code>rRMPolicyMarginMinRation</code>, or <code>null</code> if not present
-     */
-    @Nullable Short getRRMPolicyMarginMinRation();
-
-}
-
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/SnssaiUpfInfoItem.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/SnssaiUpfInfoItem.java
deleted file mode 100644 (file)
index 04f47b0..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import java.util.List;
-import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.jdt.annotation.Nullable;
-import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.snssaiupfinfoitem.DnnUpfInfo;
-import org.opendaylight.yangtools.yang.binding.CodeHelpers;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.common.QName;
-
-/**
- *
- * <p>
- * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
- * <pre>
- * grouping SnssaiUpfInfoItem {
- *   leaf sNssai {
- *     type t_s-NSSAI;
- *   }
- *   list dnnUpfInfo {
- *     key dnn;
- *     uses DnnUpfInfoItem;
- *   }
- * }
- * </pre>The schema path to identify an instance is
- * <i>_3gpp-common-yang-types/SnssaiUpfInfoItem</i>
- *
- */
-public interface SnssaiUpfInfoItem
-    extends
-    DataObject
-{
-
-
-
-    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("SnssaiUpfInfoItem");
-
-    /**
-     * @return <code>org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.TSNSSAI</code> <code>sNssai</code>, or <code>null</code> if not present
-     */
-    @Nullable TSNSSAI getSNssai();
-    
-    /**
-     * @return <code>java.util.List</code> <code>dnnUpfInfo</code>, or <code>null</code> if not present
-     */
-    @Nullable List<DnnUpfInfo> getDnnUpfInfo();
-    
-    /**
-     * @return <code>java.util.List</code> <code>dnnUpfInfo</code>, or an empty list if it is not present
-     */
-    default @NonNull List<DnnUpfInfo> nonnullDnnUpfInfo() {
-        return CodeHelpers.nonnull(getDnnUpfInfo());
-    }
-
-}
-
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/SupiRange.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/SupiRange.java
deleted file mode 100644 (file)
index e959fca..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import java.lang.String;
-import org.eclipse.jdt.annotation.Nullable;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.common.QName;
-
-/**
- *
- * <p>
- * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
- * <pre>
- * grouping SupiRange {
- *   leaf start {
- *     type string;
- *   }
- *   leaf end {
- *     type string;
- *   }
- *   leaf pattern {
- *     type string;
- *   }
- * }
- * </pre>The schema path to identify an instance is
- * <i>_3gpp-common-yang-types/SupiRange</i>
- *
- */
-public interface SupiRange
-    extends
-    DataObject
-{
-
-
-
-    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("SupiRange");
-
-    /**
-     * @return <code>java.lang.String</code> <code>start</code>, or <code>null</code> if not present
-     */
-    @Nullable String getStart();
-    
-    /**
-     * @return <code>java.lang.String</code> <code>end</code>, or <code>null</code> if not present
-     */
-    @Nullable String getEnd();
-    
-    /**
-     * @return <code>java.lang.String</code> <code>pattern</code>, or <code>null</code> if not present
-     */
-    @Nullable String getPattern();
-
-}
-
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/SupportedFeatures.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/SupportedFeatures.java
deleted file mode 100644 (file)
index dec0ed6..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import com.google.common.base.MoreObjects;
-import com.google.common.collect.ImmutableList;
-import java.beans.ConstructorProperties;
-import java.io.Serializable;
-import java.lang.Override;
-import java.lang.String;
-import java.util.List;
-import java.util.Objects;
-import java.util.regex.Pattern;
-import org.opendaylight.yangtools.yang.binding.CodeHelpers;
-import org.opendaylight.yangtools.yang.binding.TypeObject;
-
-public class SupportedFeatures
- implements TypeObject, Serializable {
-    private static final long serialVersionUID = 237085469237900179L;
-    public static final List<String> PATTERN_CONSTANTS = ImmutableList.of("^(?:[A-Fa-f0-9]*)$");
-    private static final Pattern patterns = Pattern.compile(PATTERN_CONSTANTS.get(0));
-    private static final String regexes = "[A-Fa-f0-9]*";
-    private final String _value;
-
-    private static void check_valueLength(final String value) {
-    }
-
-    @ConstructorProperties("value")
-    public SupportedFeatures(String _value) {
-        if (_value != null) {
-            check_valueLength(_value);
-        }
-    
-        Objects.requireNonNull(_value, "Supplied value may not be null");
-        CodeHelpers.checkPattern(_value, patterns, regexes);
-    
-        this._value = _value;
-    }
-    
-    /**
-     * Creates a copy from Source Object.
-     *
-     * @param source Source object
-     */
-    public SupportedFeatures(SupportedFeatures source) {
-        this._value = source._value;
-    }
-
-    public static SupportedFeatures getDefaultInstance(String defaultValue) {
-        return new SupportedFeatures(defaultValue);
-    }
-
-    public String getValue() {
-        return _value;
-    }
-
-
-    @Override
-    public int hashCode() {
-        return CodeHelpers.wrapperHashCode(_value);
-    }
-
-    @Override
-    public boolean equals(java.lang.Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        SupportedFeatures other = (SupportedFeatures) obj;
-        if (!Objects.equals(_value, other._value)) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public String toString() {
-        final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(SupportedFeatures.class);
-        CodeHelpers.appendValue(helper, "_value", _value);
-        return helper.toString();
-    }
-}
-
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TAMFPointer.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TAMFPointer.java
deleted file mode 100644 (file)
index 05ec3a3..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import com.google.common.base.MoreObjects;
-import com.google.common.collect.ImmutableList;
-import java.beans.ConstructorProperties;
-import java.io.Serializable;
-import java.lang.Override;
-import java.lang.String;
-import java.util.List;
-import java.util.Objects;
-import java.util.regex.Pattern;
-import org.opendaylight.yangtools.yang.binding.CodeHelpers;
-import org.opendaylight.yangtools.yang.binding.TypeObject;
-
-public class TAMFPointer
- implements TypeObject, Serializable {
-    private static final long serialVersionUID = -7925647994457565082L;
-    public static final List<String> PATTERN_CONSTANTS = ImmutableList.of("^(?:[01]*)$");
-    private static final Pattern patterns = Pattern.compile(PATTERN_CONSTANTS.get(0));
-    private static final String regexes = "[01]*";
-    private final String _value;
-
-    private static void check_valueLength(final String value) {
-        final int length = value.length();
-        if (length == 6) {
-            return;
-        }
-        CodeHelpers.throwInvalidLength("[[6..6]]", value);
-    }
-
-    @ConstructorProperties("value")
-    public TAMFPointer(String _value) {
-        if (_value != null) {
-            check_valueLength(_value);
-        }
-    
-        Objects.requireNonNull(_value, "Supplied value may not be null");
-        CodeHelpers.checkPattern(_value, patterns, regexes);
-    
-        this._value = _value;
-    }
-    
-    /**
-     * Creates a copy from Source Object.
-     *
-     * @param source Source object
-     */
-    public TAMFPointer(TAMFPointer source) {
-        this._value = source._value;
-    }
-
-    public static TAMFPointer getDefaultInstance(String defaultValue) {
-        return new TAMFPointer(defaultValue);
-    }
-
-    public String getValue() {
-        return _value;
-    }
-
-
-    @Override
-    public int hashCode() {
-        return CodeHelpers.wrapperHashCode(_value);
-    }
-
-    @Override
-    public boolean equals(java.lang.Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        TAMFPointer other = (TAMFPointer) obj;
-        if (!Objects.equals(_value, other._value)) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public String toString() {
-        final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(TAMFPointer.class);
-        CodeHelpers.appendValue(helper, "_value", _value);
-        return helper.toString();
-    }
-}
-
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TAMFRegionId.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TAMFRegionId.java
deleted file mode 100644 (file)
index bb70b4f..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import com.google.common.base.MoreObjects;
-import com.google.common.collect.ImmutableList;
-import java.beans.ConstructorProperties;
-import java.io.Serializable;
-import java.lang.Override;
-import java.lang.String;
-import java.util.List;
-import java.util.Objects;
-import java.util.regex.Pattern;
-import org.opendaylight.yangtools.yang.binding.CodeHelpers;
-import org.opendaylight.yangtools.yang.binding.TypeObject;
-
-public class TAMFRegionId
- implements TypeObject, Serializable {
-    private static final long serialVersionUID = -4812289071560773109L;
-    public static final List<String> PATTERN_CONSTANTS = ImmutableList.of("^(?:[01]*)$");
-    private static final Pattern patterns = Pattern.compile(PATTERN_CONSTANTS.get(0));
-    private static final String regexes = "[01]*";
-    private final String _value;
-
-    private static void check_valueLength(final String value) {
-        final int length = value.length();
-        if (length == 8) {
-            return;
-        }
-        CodeHelpers.throwInvalidLength("[[8..8]]", value);
-    }
-
-    @ConstructorProperties("value")
-    public TAMFRegionId(String _value) {
-        if (_value != null) {
-            check_valueLength(_value);
-        }
-    
-        Objects.requireNonNull(_value, "Supplied value may not be null");
-        CodeHelpers.checkPattern(_value, patterns, regexes);
-    
-        this._value = _value;
-    }
-    
-    /**
-     * Creates a copy from Source Object.
-     *
-     * @param source Source object
-     */
-    public TAMFRegionId(TAMFRegionId source) {
-        this._value = source._value;
-    }
-
-    public static TAMFRegionId getDefaultInstance(String defaultValue) {
-        return new TAMFRegionId(defaultValue);
-    }
-
-    public String getValue() {
-        return _value;
-    }
-
-
-    @Override
-    public int hashCode() {
-        return CodeHelpers.wrapperHashCode(_value);
-    }
-
-    @Override
-    public boolean equals(java.lang.Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        TAMFRegionId other = (TAMFRegionId) obj;
-        if (!Objects.equals(_value, other._value)) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public String toString() {
-        final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(TAMFRegionId.class);
-        CodeHelpers.appendValue(helper, "_value", _value);
-        return helper.toString();
-    }
-}
-
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TAMFSetId.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TAMFSetId.java
deleted file mode 100644 (file)
index 6ecd82e..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import com.google.common.base.MoreObjects;
-import com.google.common.collect.ImmutableList;
-import java.beans.ConstructorProperties;
-import java.io.Serializable;
-import java.lang.Override;
-import java.lang.String;
-import java.util.List;
-import java.util.Objects;
-import java.util.regex.Pattern;
-import org.opendaylight.yangtools.yang.binding.CodeHelpers;
-import org.opendaylight.yangtools.yang.binding.TypeObject;
-
-public class TAMFSetId
- implements TypeObject, Serializable {
-    private static final long serialVersionUID = 6265848852591033404L;
-    public static final List<String> PATTERN_CONSTANTS = ImmutableList.of("^(?:[01]*)$");
-    private static final Pattern patterns = Pattern.compile(PATTERN_CONSTANTS.get(0));
-    private static final String regexes = "[01]*";
-    private final String _value;
-
-    private static void check_valueLength(final String value) {
-        final int length = value.length();
-        if (length == 10) {
-            return;
-        }
-        CodeHelpers.throwInvalidLength("[[10..10]]", value);
-    }
-
-    @ConstructorProperties("value")
-    public TAMFSetId(String _value) {
-        if (_value != null) {
-            check_valueLength(_value);
-        }
-    
-        Objects.requireNonNull(_value, "Supplied value may not be null");
-        CodeHelpers.checkPattern(_value, patterns, regexes);
-    
-        this._value = _value;
-    }
-    
-    /**
-     * Creates a copy from Source Object.
-     *
-     * @param source Source object
-     */
-    public TAMFSetId(TAMFSetId source) {
-        this._value = source._value;
-    }
-
-    public static TAMFSetId getDefaultInstance(String defaultValue) {
-        return new TAMFSetId(defaultValue);
-    }
-
-    public String getValue() {
-        return _value;
-    }
-
-
-    @Override
-    public int hashCode() {
-        return CodeHelpers.wrapperHashCode(_value);
-    }
-
-    @Override
-    public boolean equals(java.lang.Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        TAMFSetId other = (TAMFSetId) obj;
-        if (!Objects.equals(_value, other._value)) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public String toString() {
-        final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(TAMFSetId.class);
-        CodeHelpers.appendValue(helper, "_value", _value);
-        return helper.toString();
-    }
-}
-
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TAdministrativeState.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TAdministrativeState.java
deleted file mode 100644 (file)
index 2838c3c..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableMap.Builder;
-import java.lang.Integer;
-import java.lang.Override;
-import java.lang.String;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import org.opendaylight.yangtools.yang.binding.Enumeration;
-
-public enum TAdministrativeState implements Enumeration {
-    /**
-     * The resource is administratively prohibited from performingservices for its 
-     * users.
-     *
-     */
-    Locked(0, "Locked"),
-    
-    /**
-     * Use of the resource is administratively permitted to existinginstances of use 
-     * only. While the system remains in the shutting down statethe manager may at any 
-     * time cause the managed object to revert to theunlocked state.
-     *
-     */
-    Shutdown(1, "Shutdown"),
-    
-    /**
-     * The resource is administratively permitted to perform services forits users. 
-     * This is independent of its inherent operability.
-     *
-     */
-    Unlocked(2, "Unlocked")
-    ;
-
-    private static final Map<String, TAdministrativeState> NAME_MAP;
-    private static final Map<Integer, TAdministrativeState> VALUE_MAP;
-
-    static {
-        final Builder<String, TAdministrativeState> nb = ImmutableMap.builder();
-        final Builder<Integer, TAdministrativeState> vb = ImmutableMap.builder();
-        for (TAdministrativeState enumItem : TAdministrativeState.values()) {
-            vb.put(enumItem.value, enumItem);
-            nb.put(enumItem.name, enumItem);
-        }
-
-        NAME_MAP = nb.build();
-        VALUE_MAP = vb.build();
-    }
-
-    private final String name;
-    private final int value;
-
-    private TAdministrativeState(int value, String name) {
-        this.value = value;
-        this.name = name;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public int getIntValue() {
-        return value;
-    }
-
-    /**
-     * Return the enumeration member whose {@link #getName()} matches specified value.
-     *
-     * @param name YANG assigned name
-     * @return corresponding TAdministrativeState item, if present
-     * @throws NullPointerException if name is null
-     */
-    public static Optional<TAdministrativeState> forName(String name) {
-        return Optional.ofNullable(NAME_MAP.get(Objects.requireNonNull(name)));
-    }
-
-    /**
-     * Return the enumeration member whose {@link #getIntValue()} matches specified value.
-     *
-     * @param intValue integer value
-     * @return corresponding TAdministrativeState item, or null if no such item exists
-     */
-    public static TAdministrativeState forValue(int intValue) {
-        return VALUE_MAP.get(intValue);
-    }
-}
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TAvailabilityStatus.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TAvailabilityStatus.java
deleted file mode 100644 (file)
index d86f688..0000000
+++ /dev/null
@@ -1,147 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableMap.Builder;
-import java.lang.Integer;
-import java.lang.Override;
-import java.lang.String;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import org.opendaylight.yangtools.yang.binding.Enumeration;
-
-public enum TAvailabilityStatus implements Enumeration {
-    /**
-     * The resource is undergoing a test procedure. If the administrativestate is 
-     * locked or shutting down then normal users are precluded from usingthe resource 
-     * and the control status attribute has the value reserved for test.Tests that do 
-     * not exclude additional users can be present in any operationalor administrative 
-     * state but the reserved for test condition should not bepresent.
-     *
-     */
-    INTEST(0, "IN TEST"),
-    
-    /**
-     * The resource has an internal fault that prevents it from operating.The 
-     * operational state is disabled.
-     *
-     */
-    FAILED(1, "FAILED"),
-    
-    /**
-     * The resource requires power to be applied and is not powered on.For example, a 
-     * fuse or other protection device is known to have removedpower or a low voltage 
-     * condition has been detected. The operational stateis disabled.
-     *
-     */
-    POWEROFF(2, "POWER OFF"),
-    
-    /**
-     * The resource requires a routine operation to be performed to placeit online and 
-     * make it available for use. The operation may be manual orautomatic, or both. The
-     * operational state is disabled.
-     *
-     */
-    OFFLINE(3, "OFF LINE"),
-    
-    /**
-     * The resource has been made inactive by an internal control processin accordance 
-     * with a predetermined time schedule. Under normal conditionsthe control process 
-     * can be expected to reactivate the resource at somescheduled time, and it is 
-     * therefore considered to be optional. Theoperational state is enabled or 
-     * disabled.
-     *
-     */
-    OFFDUTY(4, "OFF DUTY"),
-    
-    /**
-     * The resource cannot operate because some other resource on which itdepends is 
-     * (i.e. a resource not represented by the same managed object)unavailable. For 
-     * example, a device is not accessible because its controlleris powered off. The 
-     * operational state is disabled.
-     *
-     */
-    DEPENDENCY(5, "DEPENDENCY"),
-    
-    /**
-     * The service available from the resource is degraded in some respect,such as in 
-     * speed or operating capacity. Failure of a test or an unacceptableperformance 
-     * measurement has established that some or all services are notfunctional or are 
-     * degraded due to the presence of a defect. However, theresource remains available
-     * for service, either because some services aresatisfactory or because degraded 
-     * service is preferable to no service at all.Object specific attributes may be 
-     * defined to represent further informationindicating, for example, which services 
-     * are not functional and the nature ofthe degradation. The operational state is 
-     * enabled.
-     *
-     */
-    DEGRADED(6, "DEGRADED"),
-    
-    /**
-     * The resource represented by the managed object is not present, or isincomplete. 
-     * For example, a plug-in module is missing, a cable is disconnectedor a software 
-     * module is not loaded. The operational state is disabled.
-     *
-     */
-    NOTINSTALLED(7, "NOT INSTALLED"),
-    
-    /**
-     * This indicates a log full condition.
-     *
-     */
-    LOGFULL(8, "LOG FULL")
-    ;
-
-    private static final Map<String, TAvailabilityStatus> NAME_MAP;
-    private static final Map<Integer, TAvailabilityStatus> VALUE_MAP;
-
-    static {
-        final Builder<String, TAvailabilityStatus> nb = ImmutableMap.builder();
-        final Builder<Integer, TAvailabilityStatus> vb = ImmutableMap.builder();
-        for (TAvailabilityStatus enumItem : TAvailabilityStatus.values()) {
-            vb.put(enumItem.value, enumItem);
-            nb.put(enumItem.name, enumItem);
-        }
-
-        NAME_MAP = nb.build();
-        VALUE_MAP = vb.build();
-    }
-
-    private final String name;
-    private final int value;
-
-    private TAvailabilityStatus(int value, String name) {
-        this.value = value;
-        this.name = name;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public int getIntValue() {
-        return value;
-    }
-
-    /**
-     * Return the enumeration member whose {@link #getName()} matches specified value.
-     *
-     * @param name YANG assigned name
-     * @return corresponding TAvailabilityStatus item, if present
-     * @throws NullPointerException if name is null
-     */
-    public static Optional<TAvailabilityStatus> forName(String name) {
-        return Optional.ofNullable(NAME_MAP.get(Objects.requireNonNull(name)));
-    }
-
-    /**
-     * Return the enumeration member whose {@link #getIntValue()} matches specified value.
-     *
-     * @param intValue integer value
-     * @return corresponding TAvailabilityStatus item, or null if no such item exists
-     */
-    public static TAvailabilityStatus forValue(int intValue) {
-        return VALUE_MAP.get(intValue);
-    }
-}
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TCellState.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TCellState.java
deleted file mode 100644 (file)
index 0082d6c..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableMap.Builder;
-import java.lang.Integer;
-import java.lang.Override;
-import java.lang.String;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import org.opendaylight.yangtools.yang.binding.Enumeration;
-
-public enum TCellState implements Enumeration {
-    /**
-     * The resource is not currently in use.
-     *
-     */
-    Idle(0, "Idle"),
-    
-    /**
-     * The resource is not available for use.
-     *
-     */
-    Inactive(1, "Inactive"),
-    
-    /**
-     * The resource is in use.
-     *
-     */
-    Active(2, "Active")
-    ;
-
-    private static final Map<String, TCellState> NAME_MAP;
-    private static final Map<Integer, TCellState> VALUE_MAP;
-
-    static {
-        final Builder<String, TCellState> nb = ImmutableMap.builder();
-        final Builder<Integer, TCellState> vb = ImmutableMap.builder();
-        for (TCellState enumItem : TCellState.values()) {
-            vb.put(enumItem.value, enumItem);
-            nb.put(enumItem.name, enumItem);
-        }
-
-        NAME_MAP = nb.build();
-        VALUE_MAP = vb.build();
-    }
-
-    private final String name;
-    private final int value;
-
-    private TCellState(int value, String name) {
-        this.value = value;
-        this.name = name;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public int getIntValue() {
-        return value;
-    }
-
-    /**
-     * Return the enumeration member whose {@link #getName()} matches specified value.
-     *
-     * @param name YANG assigned name
-     * @return corresponding TCellState item, if present
-     * @throws NullPointerException if name is null
-     */
-    public static Optional<TCellState> forName(String name) {
-        return Optional.ofNullable(NAME_MAP.get(Objects.requireNonNull(name)));
-    }
-
-    /**
-     * Return the enumeration member whose {@link #getIntValue()} matches specified value.
-     *
-     * @param intValue integer value
-     * @return corresponding TCellState item, or null if no such item exists
-     */
-    public static TCellState forValue(int intValue) {
-        return VALUE_MAP.get(intValue);
-    }
-}
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TCyclicPrefix.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TCyclicPrefix.java
deleted file mode 100644 (file)
index e8b2f3f..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableMap.Builder;
-import java.lang.Integer;
-import java.lang.Override;
-import java.lang.String;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import org.opendaylight.yangtools.yang.binding.Enumeration;
-
-public enum TCyclicPrefix implements Enumeration {
-    Normal(0, "Normal"),
-    
-    Extended(1, "Extended")
-    ;
-
-    private static final Map<String, TCyclicPrefix> NAME_MAP;
-    private static final Map<Integer, TCyclicPrefix> VALUE_MAP;
-
-    static {
-        final Builder<String, TCyclicPrefix> nb = ImmutableMap.builder();
-        final Builder<Integer, TCyclicPrefix> vb = ImmutableMap.builder();
-        for (TCyclicPrefix enumItem : TCyclicPrefix.values()) {
-            vb.put(enumItem.value, enumItem);
-            nb.put(enumItem.name, enumItem);
-        }
-
-        NAME_MAP = nb.build();
-        VALUE_MAP = vb.build();
-    }
-
-    private final String name;
-    private final int value;
-
-    private TCyclicPrefix(int value, String name) {
-        this.value = value;
-        this.name = name;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public int getIntValue() {
-        return value;
-    }
-
-    /**
-     * Return the enumeration member whose {@link #getName()} matches specified value.
-     *
-     * @param name YANG assigned name
-     * @return corresponding TCyclicPrefix item, if present
-     * @throws NullPointerException if name is null
-     */
-    public static Optional<TCyclicPrefix> forName(String name) {
-        return Optional.ofNullable(NAME_MAP.get(Objects.requireNonNull(name)));
-    }
-
-    /**
-     * Return the enumeration member whose {@link #getIntValue()} matches specified value.
-     *
-     * @param intValue integer value
-     * @return corresponding TCyclicPrefix item, or null if no such item exists
-     */
-    public static TCyclicPrefix forValue(int intValue) {
-        return VALUE_MAP.get(intValue);
-    }
-}
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TDistinguishedName.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TDistinguishedName.java
deleted file mode 100644 (file)
index fbf1a49..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import com.google.common.base.MoreObjects;
-import java.beans.ConstructorProperties;
-import java.io.Serializable;
-import java.lang.Override;
-import java.lang.String;
-import java.util.Objects;
-import org.opendaylight.yangtools.yang.binding.CodeHelpers;
-import org.opendaylight.yangtools.yang.binding.TypeObject;
-
-public class TDistinguishedName
- implements TypeObject, Serializable {
-    private static final long serialVersionUID = 2209417379079206418L;
-    private final String _value;
-
-
-    @ConstructorProperties("value")
-    public TDistinguishedName(String _value) {
-    
-        Objects.requireNonNull(_value, "Supplied value may not be null");
-    
-        this._value = _value;
-    }
-    
-    /**
-     * Creates a copy from Source Object.
-     *
-     * @param source Source object
-     */
-    public TDistinguishedName(TDistinguishedName source) {
-        this._value = source._value;
-    }
-
-    public static TDistinguishedName getDefaultInstance(String defaultValue) {
-        return new TDistinguishedName(defaultValue);
-    }
-
-    public String getValue() {
-        return _value;
-    }
-
-
-    @Override
-    public int hashCode() {
-        return CodeHelpers.wrapperHashCode(_value);
-    }
-
-    @Override
-    public boolean equals(java.lang.Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        TDistinguishedName other = (TDistinguishedName) obj;
-        if (!Objects.equals(_value, other._value)) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public String toString() {
-        final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(TDistinguishedName.class);
-        CodeHelpers.appendValue(helper, "_value", _value);
-        return helper.toString();
-    }
-}
-
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TDnn.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TDnn.java
deleted file mode 100644 (file)
index b7d4857..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import com.google.common.base.MoreObjects;
-import java.beans.ConstructorProperties;
-import java.io.Serializable;
-import java.lang.Override;
-import java.lang.String;
-import java.util.Objects;
-import org.opendaylight.yangtools.yang.binding.CodeHelpers;
-import org.opendaylight.yangtools.yang.binding.TypeObject;
-
-public class TDnn
- implements TypeObject, Serializable {
-    private static final long serialVersionUID = -6761478371390250952L;
-    private final String _value;
-
-
-    @ConstructorProperties("value")
-    public TDnn(String _value) {
-    
-        Objects.requireNonNull(_value, "Supplied value may not be null");
-    
-        this._value = _value;
-    }
-    
-    /**
-     * Creates a copy from Source Object.
-     *
-     * @param source Source object
-     */
-    public TDnn(TDnn source) {
-        this._value = source._value;
-    }
-
-    public static TDnn getDefaultInstance(String defaultValue) {
-        return new TDnn(defaultValue);
-    }
-
-    public String getValue() {
-        return _value;
-    }
-
-
-    @Override
-    public int hashCode() {
-        return CodeHelpers.wrapperHashCode(_value);
-    }
-
-    @Override
-    public boolean equals(java.lang.Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        TDnn other = (TDnn) obj;
-        if (!Objects.equals(_value, other._value)) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public String toString() {
-        final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(TDnn.class);
-        CodeHelpers.appendValue(helper, "_value", _value);
-        return helper.toString();
-    }
-}
-
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TLoad.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TLoad.java
deleted file mode 100644 (file)
index 65038cb..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import com.google.common.base.MoreObjects;
-import java.beans.ConstructorProperties;
-import java.io.Serializable;
-import java.lang.Override;
-import java.lang.Short;
-import java.lang.String;
-import java.util.Objects;
-import org.opendaylight.yangtools.yang.binding.CodeHelpers;
-import org.opendaylight.yangtools.yang.binding.TypeObject;
-
-public class TLoad
- implements TypeObject, Serializable {
-    private static final long serialVersionUID = -1391841480548249841L;
-    private final Short _value;
-
-    private static void check_valueRange(final short value) {
-        if (value >= (short)0 && value <= (short)100) {
-            return;
-        }
-        CodeHelpers.throwInvalidRange("[[0..100]]", value);
-    }
-
-    @ConstructorProperties("value")
-    public TLoad(Short _value) {
-        if (_value != null) {
-            check_valueRange(_value);
-        }
-    
-        Objects.requireNonNull(_value, "Supplied value may not be null");
-    
-        this._value = _value;
-    }
-    
-    /**
-     * Creates a copy from Source Object.
-     *
-     * @param source Source object
-     */
-    public TLoad(TLoad source) {
-        this._value = source._value;
-    }
-
-    public static TLoad getDefaultInstance(String defaultValue) {
-        return new TLoad(Short.valueOf(defaultValue));
-    }
-
-    public Short getValue() {
-        return _value;
-    }
-
-
-    @Override
-    public int hashCode() {
-        return CodeHelpers.wrapperHashCode(_value);
-    }
-
-    @Override
-    public boolean equals(java.lang.Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        TLoad other = (TLoad) obj;
-        if (!Objects.equals(_value, other._value)) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public String toString() {
-        final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(TLoad.class);
-        CodeHelpers.appendValue(helper, "_value", _value);
-        return helper.toString();
-    }
-}
-
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TMcc.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TMcc.java
deleted file mode 100644 (file)
index a5d32a3..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import com.google.common.base.MoreObjects;
-import com.google.common.collect.ImmutableList;
-import java.beans.ConstructorProperties;
-import java.io.Serializable;
-import java.lang.Override;
-import java.lang.String;
-import java.util.List;
-import java.util.Objects;
-import java.util.regex.Pattern;
-import org.opendaylight.yangtools.yang.binding.CodeHelpers;
-import org.opendaylight.yangtools.yang.binding.TypeObject;
-
-public class TMcc
- implements TypeObject, Serializable {
-    private static final long serialVersionUID = 8336530756398858673L;
-    public static final List<String> PATTERN_CONSTANTS = ImmutableList.of("^(?:[02-79][0-9][0-9])$");
-    private static final Pattern patterns = Pattern.compile(PATTERN_CONSTANTS.get(0));
-    private static final String regexes = "[02-79][0-9][0-9]";
-    private final String _value;
-
-    private static void check_valueLength(final String value) {
-    }
-
-    @ConstructorProperties("value")
-    public TMcc(String _value) {
-        if (_value != null) {
-            check_valueLength(_value);
-        }
-    
-        Objects.requireNonNull(_value, "Supplied value may not be null");
-        CodeHelpers.checkPattern(_value, patterns, regexes);
-    
-        this._value = _value;
-    }
-    
-    /**
-     * Creates a copy from Source Object.
-     *
-     * @param source Source object
-     */
-    public TMcc(TMcc source) {
-        this._value = source._value;
-    }
-
-    public static TMcc getDefaultInstance(String defaultValue) {
-        return new TMcc(defaultValue);
-    }
-
-    public String getValue() {
-        return _value;
-    }
-
-
-    @Override
-    public int hashCode() {
-        return CodeHelpers.wrapperHashCode(_value);
-    }
-
-    @Override
-    public boolean equals(java.lang.Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        TMcc other = (TMcc) obj;
-        if (!Objects.equals(_value, other._value)) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public String toString() {
-        final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(TMcc.class);
-        CodeHelpers.appendValue(helper, "_value", _value);
-        return helper.toString();
-    }
-}
-
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TMnc.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TMnc.java
deleted file mode 100644 (file)
index d5de22d..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import com.google.common.base.MoreObjects;
-import com.google.common.collect.ImmutableList;
-import java.beans.ConstructorProperties;
-import java.io.Serializable;
-import java.lang.Override;
-import java.lang.String;
-import java.util.List;
-import java.util.Objects;
-import java.util.regex.Pattern;
-import org.opendaylight.yangtools.yang.binding.CodeHelpers;
-import org.opendaylight.yangtools.yang.binding.TypeObject;
-
-public class TMnc
- implements TypeObject, Serializable {
-    private static final long serialVersionUID = 7207647705509368021L;
-    public static final List<String> PATTERN_CONSTANTS = ImmutableList.of("^(?:[0-9][0-9][0-9]|[0-9][0-9])$");
-    private static final Pattern patterns = Pattern.compile(PATTERN_CONSTANTS.get(0));
-    private static final String regexes = "[0-9][0-9][0-9]|[0-9][0-9]";
-    private final String _value;
-
-    private static void check_valueLength(final String value) {
-    }
-
-    @ConstructorProperties("value")
-    public TMnc(String _value) {
-        if (_value != null) {
-            check_valueLength(_value);
-        }
-    
-        Objects.requireNonNull(_value, "Supplied value may not be null");
-        CodeHelpers.checkPattern(_value, patterns, regexes);
-    
-        this._value = _value;
-    }
-    
-    /**
-     * Creates a copy from Source Object.
-     *
-     * @param source Source object
-     */
-    public TMnc(TMnc source) {
-        this._value = source._value;
-    }
-
-    public static TMnc getDefaultInstance(String defaultValue) {
-        return new TMnc(defaultValue);
-    }
-
-    public String getValue() {
-        return _value;
-    }
-
-
-    @Override
-    public int hashCode() {
-        return CodeHelpers.wrapperHashCode(_value);
-    }
-
-    @Override
-    public boolean equals(java.lang.Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        TMnc other = (TMnc) obj;
-        if (!Objects.equals(_value, other._value)) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public String toString() {
-        final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(TMnc.class);
-        CodeHelpers.appendValue(helper, "_value", _value);
-        return helper.toString();
-    }
-}
-
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TNCI.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TNCI.java
deleted file mode 100644 (file)
index e778650..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import com.google.common.base.MoreObjects;
-import com.google.common.collect.ImmutableList;
-import java.io.Serializable;
-import java.lang.Override;
-import java.lang.String;
-import java.util.List;
-import java.util.Objects;
-import java.util.regex.Pattern;
-import org.opendaylight.yangtools.yang.binding.CodeHelpers;
-import org.opendaylight.yangtools.yang.binding.TypeObject;
-
-public class TNCI
- implements TypeObject, Serializable {
-    private static final long serialVersionUID = 6536694555014033331L;
-    public static final List<String> PATTERN_CONSTANTS = ImmutableList.of("^(?:[01]*)$", "^(?:[a-fA-F0-9]*)$");
-    private static final Pattern[] patterns = CodeHelpers.compilePatterns(PATTERN_CONSTANTS);
-    private static final String[] regexes = { "[01]*", "[a-fA-F0-9]*" };
-    private final String _string;
-
-
-    private static void check_stringLength(final String value) {
-        final int length = value.length();
-        if (length == 36) {
-            return;
-        }
-        CodeHelpers.throwInvalidLength("[[36..36]]", value);
-    }
-    public TNCI(String _string) {
-        super();
-        check_stringLength(_string);
-        
-        this._string = _string;
-    }
-    /**
-     * Creates a copy from Source Object.
-     *
-     * @param source Source object
-     */
-    public TNCI(TNCI source) {
-        this._string = source._string;
-    }
-    
-    /**
-     * Return a String representing the value of this union.
-     *
-     * @return String representation of this union's value.
-     */
-    public String stringValue() {
-        if (_string != null) {
-            return _string;
-        }
-    
-        throw new IllegalStateException("No value assinged");
-    }
-
-
-    public String getString() {
-        return _string;
-    }
-
-
-    @Override
-    public int hashCode() {
-        return CodeHelpers.wrapperHashCode(_string);
-    }
-
-    @Override
-    public boolean equals(java.lang.Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        TNCI other = (TNCI) obj;
-        if (!Objects.equals(_string, other._string)) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public String toString() {
-        final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(TNCI.class);
-        CodeHelpers.appendValue(helper, "_string", _string);
-        return helper.toString();
-    }
-}
-
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TNCIBuilder.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TNCIBuilder.java
deleted file mode 100644 (file)
index 3c8462d..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import java.lang.String;
-import java.lang.UnsupportedOperationException;
-
-/**
- * The purpose of generated class in src/main/java for Union types is to create new instances of unions from a string representation.
- * In some cases it is very difficult to automate it since there can be unions such as (uint32 - uint16), or (string - uint32).
- *
- * The reason behind putting it under src/main/java is:
- * This class is generated in form of a stub and needs to be finished by the user. This class is generated only once to prevent
- * loss of user code.
- *
- */
-public class TNCIBuilder {
-    private TNCIBuilder() {
-        //Exists only to defeat instantiation.
-    }
-
-    public static TNCI getDefaultInstance(String defaultValue) {
-        throw new UnsupportedOperationException("Not yet implemented");
-    }
-
-}
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TNRPCI.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TNRPCI.java
deleted file mode 100644 (file)
index 72a8400..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import com.google.common.base.MoreObjects;
-import java.beans.ConstructorProperties;
-import java.io.Serializable;
-import java.lang.Long;
-import java.lang.Override;
-import java.lang.String;
-import java.util.Objects;
-import org.opendaylight.yangtools.yang.binding.CodeHelpers;
-import org.opendaylight.yangtools.yang.binding.TypeObject;
-
-public class TNRPCI
- implements TypeObject, Serializable {
-    private static final long serialVersionUID = -8223745380422869872L;
-    private final Long _value;
-
-    private static void check_valueRange(final long value) {
-        if (value >= 0L && value <= 4294967295L) {
-            return;
-        }
-        CodeHelpers.throwInvalidRange("[[0..4294967295]]", value);
-    }
-
-    @ConstructorProperties("value")
-    public TNRPCI(Long _value) {
-        if (_value != null) {
-            check_valueRange(_value);
-        }
-    
-        Objects.requireNonNull(_value, "Supplied value may not be null");
-    
-        this._value = _value;
-    }
-    
-    /**
-     * Creates a copy from Source Object.
-     *
-     * @param source Source object
-     */
-    public TNRPCI(TNRPCI source) {
-        this._value = source._value;
-    }
-
-    public static TNRPCI getDefaultInstance(String defaultValue) {
-        return new TNRPCI(Long.valueOf(defaultValue));
-    }
-
-    public Long getValue() {
-        return _value;
-    }
-
-
-    @Override
-    public int hashCode() {
-        return CodeHelpers.wrapperHashCode(_value);
-    }
-
-    @Override
-    public boolean equals(java.lang.Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        TNRPCI other = (TNRPCI) obj;
-        if (!Objects.equals(_value, other._value)) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public String toString() {
-        final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(TNRPCI.class);
-        CodeHelpers.appendValue(helper, "_value", _value);
-        return helper.toString();
-    }
-}
-
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TNsiId.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TNsiId.java
deleted file mode 100644 (file)
index 1ae6f3c..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import com.google.common.base.MoreObjects;
-import java.beans.ConstructorProperties;
-import java.io.Serializable;
-import java.lang.Override;
-import java.lang.String;
-import java.util.Objects;
-import org.opendaylight.yangtools.yang.binding.CodeHelpers;
-import org.opendaylight.yangtools.yang.binding.TypeObject;
-
-public class TNsiId
- implements TypeObject, Serializable {
-    private static final long serialVersionUID = 5629408106052088513L;
-    private final String _value;
-
-
-    @ConstructorProperties("value")
-    public TNsiId(String _value) {
-    
-        Objects.requireNonNull(_value, "Supplied value may not be null");
-    
-        this._value = _value;
-    }
-    
-    /**
-     * Creates a copy from Source Object.
-     *
-     * @param source Source object
-     */
-    public TNsiId(TNsiId source) {
-        this._value = source._value;
-    }
-
-    public static TNsiId getDefaultInstance(String defaultValue) {
-        return new TNsiId(defaultValue);
-    }
-
-    public String getValue() {
-        return _value;
-    }
-
-
-    @Override
-    public int hashCode() {
-        return CodeHelpers.wrapperHashCode(_value);
-    }
-
-    @Override
-    public boolean equals(java.lang.Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        TNsiId other = (TNsiId) obj;
-        if (!Objects.equals(_value, other._value)) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public String toString() {
-        final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(TNsiId.class);
-        CodeHelpers.appendValue(helper, "_value", _value);
-        return helper.toString();
-    }
-}
-
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TOperationalState.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TOperationalState.java
deleted file mode 100644 (file)
index 8aae8b4..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableMap.Builder;
-import java.lang.Integer;
-import java.lang.Override;
-import java.lang.String;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import org.opendaylight.yangtools.yang.binding.Enumeration;
-
-public enum TOperationalState implements Enumeration {
-    /**
-     * The resource is partially or fully operable and available for use.
-     *
-     */
-    Enabled(0, "Enabled"),
-    
-    /**
-     * The resource is totally inoperable and unable to provide serviceto the user(s).
-     *
-     */
-    Disabled(1, "Disabled")
-    ;
-
-    private static final Map<String, TOperationalState> NAME_MAP;
-    private static final Map<Integer, TOperationalState> VALUE_MAP;
-
-    static {
-        final Builder<String, TOperationalState> nb = ImmutableMap.builder();
-        final Builder<Integer, TOperationalState> vb = ImmutableMap.builder();
-        for (TOperationalState enumItem : TOperationalState.values()) {
-            vb.put(enumItem.value, enumItem);
-            nb.put(enumItem.name, enumItem);
-        }
-
-        NAME_MAP = nb.build();
-        VALUE_MAP = vb.build();
-    }
-
-    private final String name;
-    private final int value;
-
-    private TOperationalState(int value, String name) {
-        this.value = value;
-        this.name = name;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public int getIntValue() {
-        return value;
-    }
-
-    /**
-     * Return the enumeration member whose {@link #getName()} matches specified value.
-     *
-     * @param name YANG assigned name
-     * @return corresponding TOperationalState item, if present
-     * @throws NullPointerException if name is null
-     */
-    public static Optional<TOperationalState> forName(String name) {
-        return Optional.ofNullable(NAME_MAP.get(Objects.requireNonNull(name)));
-    }
-
-    /**
-     * Return the enumeration member whose {@link #getIntValue()} matches specified value.
-     *
-     * @param intValue integer value
-     * @return corresponding TOperationalState item, or null if no such item exists
-     */
-    public static TOperationalState forValue(int intValue) {
-        return VALUE_MAP.get(intValue);
-    }
-}
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TQuotaType.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TQuotaType.java
deleted file mode 100644 (file)
index 2b66b0c..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableMap.Builder;
-import java.lang.Integer;
-import java.lang.Override;
-import java.lang.String;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import org.opendaylight.yangtools.yang.binding.Enumeration;
-
-public enum TQuotaType implements Enumeration {
-    Strict(0, "strict"),
-    
-    Float(1, "float")
-    ;
-
-    private static final Map<String, TQuotaType> NAME_MAP;
-    private static final Map<Integer, TQuotaType> VALUE_MAP;
-
-    static {
-        final Builder<String, TQuotaType> nb = ImmutableMap.builder();
-        final Builder<Integer, TQuotaType> vb = ImmutableMap.builder();
-        for (TQuotaType enumItem : TQuotaType.values()) {
-            vb.put(enumItem.value, enumItem);
-            nb.put(enumItem.name, enumItem);
-        }
-
-        NAME_MAP = nb.build();
-        VALUE_MAP = vb.build();
-    }
-
-    private final String name;
-    private final int value;
-
-    private TQuotaType(int value, String name) {
-        this.value = value;
-        this.name = name;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public int getIntValue() {
-        return value;
-    }
-
-    /**
-     * Return the enumeration member whose {@link #getName()} matches specified value.
-     *
-     * @param name YANG assigned name
-     * @return corresponding TQuotaType item, if present
-     * @throws NullPointerException if name is null
-     */
-    public static Optional<TQuotaType> forName(String name) {
-        return Optional.ofNullable(NAME_MAP.get(Objects.requireNonNull(name)));
-    }
-
-    /**
-     * Return the enumeration member whose {@link #getIntValue()} matches specified value.
-     *
-     * @param intValue integer value
-     * @return corresponding TQuotaType item, or null if no such item exists
-     */
-    public static TQuotaType forValue(int intValue) {
-        return VALUE_MAP.get(intValue);
-    }
-}
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TResourceSharingLevel.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TResourceSharingLevel.java
deleted file mode 100644 (file)
index ea8eca6..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableMap.Builder;
-import java.lang.Integer;
-import java.lang.Override;
-import java.lang.String;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import org.opendaylight.yangtools.yang.binding.Enumeration;
-
-public enum TResourceSharingLevel implements Enumeration {
-    Shared(0, "shared"),
-    
-    NotShared(1, "not-shared")
-    ;
-
-    private static final Map<String, TResourceSharingLevel> NAME_MAP;
-    private static final Map<Integer, TResourceSharingLevel> VALUE_MAP;
-
-    static {
-        final Builder<String, TResourceSharingLevel> nb = ImmutableMap.builder();
-        final Builder<Integer, TResourceSharingLevel> vb = ImmutableMap.builder();
-        for (TResourceSharingLevel enumItem : TResourceSharingLevel.values()) {
-            vb.put(enumItem.value, enumItem);
-            nb.put(enumItem.name, enumItem);
-        }
-
-        NAME_MAP = nb.build();
-        VALUE_MAP = vb.build();
-    }
-
-    private final String name;
-    private final int value;
-
-    private TResourceSharingLevel(int value, String name) {
-        this.value = value;
-        this.name = name;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public int getIntValue() {
-        return value;
-    }
-
-    /**
-     * Return the enumeration member whose {@link #getName()} matches specified value.
-     *
-     * @param name YANG assigned name
-     * @return corresponding TResourceSharingLevel item, if present
-     * @throws NullPointerException if name is null
-     */
-    public static Optional<TResourceSharingLevel> forName(String name) {
-        return Optional.ofNullable(NAME_MAP.get(Objects.requireNonNull(name)));
-    }
-
-    /**
-     * Return the enumeration member whose {@link #getIntValue()} matches specified value.
-     *
-     * @param intValue integer value
-     * @return corresponding TResourceSharingLevel item, or null if no such item exists
-     */
-    public static TResourceSharingLevel forValue(int intValue) {
-        return VALUE_MAP.get(intValue);
-    }
-}
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TSNSSAI.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TSNSSAI.java
deleted file mode 100644 (file)
index 09cf352..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import com.google.common.base.MoreObjects;
-import java.io.Serializable;
-import java.lang.Long;
-import java.lang.Override;
-import java.lang.Short;
-import java.lang.String;
-import java.util.Objects;
-import org.opendaylight.yangtools.yang.binding.CodeHelpers;
-import org.opendaylight.yangtools.yang.binding.TypeObject;
-
-public class TSNSSAI
- implements TypeObject, Serializable {
-    private static final long serialVersionUID = -2943261658086489871L;
-    private final Short _uint8;
-    private final Long _uint32;
-
-
-    private static void checkUint8Range(final short value) {
-        if (value >= (short)0 && value <= (short)255) {
-            return;
-        }
-        CodeHelpers.throwInvalidRange("[[0..255]]", value);
-    }
-    public TSNSSAI(Short _uint8) {
-        super();
-        checkUint8Range(_uint8);
-        
-        this._uint8 = _uint8;
-        this._uint32 = null;
-    }
-    
-    private static void checkUint32Range(final long value) {
-        if (value >= 0L && value <= 4294967295L) {
-            return;
-        }
-        CodeHelpers.throwInvalidRange("[[0..4294967295]]", value);
-    }
-    public TSNSSAI(Long _uint32) {
-        super();
-        checkUint32Range(_uint32);
-        
-        this._uint32 = _uint32;
-        this._uint8 = null;
-    }
-    /**
-     * Creates a copy from Source Object.
-     *
-     * @param source Source object
-     */
-    public TSNSSAI(TSNSSAI source) {
-        this._uint8 = source._uint8;
-        this._uint32 = source._uint32;
-    }
-    
-    /**
-     * Return a String representing the value of this union.
-     *
-     * @return String representation of this union's value.
-     */
-    public String stringValue() {
-        if (_uint8 != null) {
-            return _uint8.toString();
-        }
-        if (_uint32 != null) {
-            return _uint32.toString();
-        }
-    
-        throw new IllegalStateException("No value assinged");
-    }
-
-
-    public Short getUint8() {
-        return _uint8;
-    }
-    
-    public Long getUint32() {
-        return _uint32;
-    }
-
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + Objects.hashCode(_uint8);
-        result = prime * result + Objects.hashCode(_uint32);
-        return result;
-    }
-
-    @Override
-    public boolean equals(java.lang.Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        TSNSSAI other = (TSNSSAI) obj;
-        if (!Objects.equals(_uint8, other._uint8)) {
-            return false;
-        }
-        if (!Objects.equals(_uint32, other._uint32)) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public String toString() {
-        final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(TSNSSAI.class);
-        CodeHelpers.appendValue(helper, "_uint8", _uint8);
-        CodeHelpers.appendValue(helper, "_uint32", _uint32);
-        return helper.toString();
-    }
-}
-
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TSNSSAIBuilder.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TSNSSAIBuilder.java
deleted file mode 100644 (file)
index b0d11a7..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import java.lang.String;
-import java.lang.UnsupportedOperationException;
-
-/**
- * The purpose of generated class in src/main/java for Union types is to create new instances of unions from a string representation.
- * In some cases it is very difficult to automate it since there can be unions such as (uint32 - uint16), or (string - uint32).
- *
- * The reason behind putting it under src/main/java is:
- * This class is generated in form of a stub and needs to be finished by the user. This class is generated only once to prevent
- * loss of user code.
- *
- */
-public class TSNSSAIBuilder {
-    private TSNSSAIBuilder() {
-        //Exists only to defeat instantiation.
-    }
-
-    public static TSNSSAI getDefaultInstance(String defaultValue) {
-        throw new UnsupportedOperationException("Not yet implemented");
-    }
-
-}
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TSST.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TSST.java
deleted file mode 100644 (file)
index 1045aa9..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import com.google.common.base.MoreObjects;
-import java.beans.ConstructorProperties;
-import java.io.Serializable;
-import java.lang.Override;
-import java.lang.Short;
-import java.lang.String;
-import java.util.Objects;
-import org.opendaylight.yangtools.yang.binding.CodeHelpers;
-import org.opendaylight.yangtools.yang.binding.TypeObject;
-
-public class TSST
- implements TypeObject, Serializable {
-    private static final long serialVersionUID = -2844923602415446951L;
-    private final Short _value;
-
-    private static void check_valueRange(final short value) {
-        if (value >= (short)0 && value <= (short)255) {
-            return;
-        }
-        CodeHelpers.throwInvalidRange("[[0..255]]", value);
-    }
-
-    @ConstructorProperties("value")
-    public TSST(Short _value) {
-        if (_value != null) {
-            check_valueRange(_value);
-        }
-    
-        Objects.requireNonNull(_value, "Supplied value may not be null");
-    
-        this._value = _value;
-    }
-    
-    /**
-     * Creates a copy from Source Object.
-     *
-     * @param source Source object
-     */
-    public TSST(TSST source) {
-        this._value = source._value;
-    }
-
-    public static TSST getDefaultInstance(String defaultValue) {
-        return new TSST(Short.valueOf(defaultValue));
-    }
-
-    public Short getValue() {
-        return _value;
-    }
-
-
-    @Override
-    public int hashCode() {
-        return CodeHelpers.wrapperHashCode(_value);
-    }
-
-    @Override
-    public boolean equals(java.lang.Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        TSST other = (TSST) obj;
-        if (!Objects.equals(_value, other._value)) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public String toString() {
-        final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(TSST.class);
-        CodeHelpers.appendValue(helper, "_value", _value);
-        return helper.toString();
-    }
-}
-
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TSubcarrierSpacing.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TSubcarrierSpacing.java
deleted file mode 100644 (file)
index 4912402..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableMap.Builder;
-import java.lang.Integer;
-import java.lang.Override;
-import java.lang.String;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import org.opendaylight.yangtools.yang.binding.Enumeration;
-
-public enum TSubcarrierSpacing implements Enumeration {
-    _15(0, "15"),
-    
-    _30(1, "30"),
-    
-    _60(2, "60"),
-    
-    _120(3, "120")
-    ;
-
-    private static final Map<String, TSubcarrierSpacing> NAME_MAP;
-    private static final Map<Integer, TSubcarrierSpacing> VALUE_MAP;
-
-    static {
-        final Builder<String, TSubcarrierSpacing> nb = ImmutableMap.builder();
-        final Builder<Integer, TSubcarrierSpacing> vb = ImmutableMap.builder();
-        for (TSubcarrierSpacing enumItem : TSubcarrierSpacing.values()) {
-            vb.put(enumItem.value, enumItem);
-            nb.put(enumItem.name, enumItem);
-        }
-
-        NAME_MAP = nb.build();
-        VALUE_MAP = vb.build();
-    }
-
-    private final String name;
-    private final int value;
-
-    private TSubcarrierSpacing(int value, String name) {
-        this.value = value;
-        this.name = name;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public int getIntValue() {
-        return value;
-    }
-
-    /**
-     * Return the enumeration member whose {@link #getName()} matches specified value.
-     *
-     * @param name YANG assigned name
-     * @return corresponding TSubcarrierSpacing item, if present
-     * @throws NullPointerException if name is null
-     */
-    public static Optional<TSubcarrierSpacing> forName(String name) {
-        return Optional.ofNullable(NAME_MAP.get(Objects.requireNonNull(name)));
-    }
-
-    /**
-     * Return the enumeration member whose {@link #getIntValue()} matches specified value.
-     *
-     * @param intValue integer value
-     * @return corresponding TSubcarrierSpacing item, or null if no such item exists
-     */
-    public static TSubcarrierSpacing forValue(int intValue) {
-        return VALUE_MAP.get(intValue);
-    }
-}
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TTAC.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TTAC.java
deleted file mode 100644 (file)
index f85c972..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import com.google.common.base.MoreObjects;
-import com.google.common.collect.ImmutableList;
-import java.io.Serializable;
-import java.lang.Override;
-import java.lang.String;
-import java.util.List;
-import java.util.Objects;
-import java.util.regex.Pattern;
-import org.opendaylight.yangtools.yang.binding.CodeHelpers;
-import org.opendaylight.yangtools.yang.binding.TypeObject;
-
-public class TTAC
- implements TypeObject, Serializable {
-    private static final long serialVersionUID = -7663797870532797015L;
-    public static final List<String> PATTERN_CONSTANTS = ImmutableList.of("^(?:[a-fA-F0-9]*)$");
-    private static final Pattern patterns = Pattern.compile(PATTERN_CONSTANTS.get(0));
-    private static final String regexes = "[a-fA-F0-9]*";
-    private final String _string;
-
-
-    private static void check_stringLength(final String value) {
-        final int length = value.length();
-        if (length == 4) {
-            return;
-        }
-        CodeHelpers.throwInvalidLength("[[4..4]]", value);
-    }
-    public TTAC(String _string) {
-        super();
-        check_stringLength(_string);
-        
-        this._string = _string;
-    }
-    /**
-     * Creates a copy from Source Object.
-     *
-     * @param source Source object
-     */
-    public TTAC(TTAC source) {
-        this._string = source._string;
-    }
-    
-    /**
-     * Return a String representing the value of this union.
-     *
-     * @return String representation of this union's value.
-     */
-    public String stringValue() {
-        if (_string != null) {
-            return _string;
-        }
-    
-        throw new IllegalStateException("No value assinged");
-    }
-
-
-    public String getString() {
-        return _string;
-    }
-
-
-    @Override
-    public int hashCode() {
-        return CodeHelpers.wrapperHashCode(_string);
-    }
-
-    @Override
-    public boolean equals(java.lang.Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        TTAC other = (TTAC) obj;
-        if (!Objects.equals(_string, other._string)) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public String toString() {
-        final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(TTAC.class);
-        CodeHelpers.appendValue(helper, "_string", _string);
-        return helper.toString();
-    }
-}
-
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TTACBuilder.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TTACBuilder.java
deleted file mode 100644 (file)
index e9aba26..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import java.lang.String;
-import java.lang.UnsupportedOperationException;
-
-/**
- * The purpose of generated class in src/main/java for Union types is to create new instances of unions from a string representation.
- * In some cases it is very difficult to automate it since there can be unions such as (uint32 - uint16), or (string - uint32).
- *
- * The reason behind putting it under src/main/java is:
- * This class is generated in form of a stub and needs to be finished by the user. This class is generated only once to prevent
- * loss of user code.
- *
- */
-public class TTACBuilder {
-    private TTACBuilder() {
-        //Exists only to defeat instantiation.
-    }
-
-    public static TTAC getDefaultInstance(String defaultValue) {
-        throw new UnsupportedOperationException("Not yet implemented");
-    }
-
-}
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TTransportProtocol.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TTransportProtocol.java
deleted file mode 100644 (file)
index bfdf26c..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableMap.Builder;
-import java.lang.Integer;
-import java.lang.Override;
-import java.lang.String;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import org.opendaylight.yangtools.yang.binding.Enumeration;
-
-public enum TTransportProtocol implements Enumeration {
-    TCP(0, "TCP"),
-    
-    STCP(1, "STCP"),
-    
-    UDP(2, "UDP")
-    ;
-
-    private static final Map<String, TTransportProtocol> NAME_MAP;
-    private static final Map<Integer, TTransportProtocol> VALUE_MAP;
-
-    static {
-        final Builder<String, TTransportProtocol> nb = ImmutableMap.builder();
-        final Builder<Integer, TTransportProtocol> vb = ImmutableMap.builder();
-        for (TTransportProtocol enumItem : TTransportProtocol.values()) {
-            vb.put(enumItem.value, enumItem);
-            nb.put(enumItem.name, enumItem);
-        }
-
-        NAME_MAP = nb.build();
-        VALUE_MAP = vb.build();
-    }
-
-    private final String name;
-    private final int value;
-
-    private TTransportProtocol(int value, String name) {
-        this.value = value;
-        this.name = name;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public int getIntValue() {
-        return value;
-    }
-
-    /**
-     * Return the enumeration member whose {@link #getName()} matches specified value.
-     *
-     * @param name YANG assigned name
-     * @return corresponding TTransportProtocol item, if present
-     * @throws NullPointerException if name is null
-     */
-    public static Optional<TTransportProtocol> forName(String name) {
-        return Optional.ofNullable(NAME_MAP.get(Objects.requireNonNull(name)));
-    }
-
-    /**
-     * Return the enumeration member whose {@link #getIntValue()} matches specified value.
-     *
-     * @param intValue integer value
-     * @return corresponding TTransportProtocol item, or null if no such item exists
-     */
-    public static TTransportProtocol forValue(int intValue) {
-        return VALUE_MAP.get(intValue);
-    }
-}
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TUEMobilityLevel.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TUEMobilityLevel.java
deleted file mode 100644 (file)
index 96aa56c..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableMap.Builder;
-import java.lang.Integer;
-import java.lang.Override;
-import java.lang.String;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import org.opendaylight.yangtools.yang.binding.Enumeration;
-
-public enum TUEMobilityLevel implements Enumeration {
-    Stationary(0, "stationary"),
-    
-    Nomadic(1, "nomadic"),
-    
-    RestrictedMobility(2, "restricted mobility"),
-    
-    FullyMobility(3, "fully mobility")
-    ;
-
-    private static final Map<String, TUEMobilityLevel> NAME_MAP;
-    private static final Map<Integer, TUEMobilityLevel> VALUE_MAP;
-
-    static {
-        final Builder<String, TUEMobilityLevel> nb = ImmutableMap.builder();
-        final Builder<Integer, TUEMobilityLevel> vb = ImmutableMap.builder();
-        for (TUEMobilityLevel enumItem : TUEMobilityLevel.values()) {
-            vb.put(enumItem.value, enumItem);
-            nb.put(enumItem.name, enumItem);
-        }
-
-        NAME_MAP = nb.build();
-        VALUE_MAP = vb.build();
-    }
-
-    private final String name;
-    private final int value;
-
-    private TUEMobilityLevel(int value, String name) {
-        this.value = value;
-        this.name = name;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public int getIntValue() {
-        return value;
-    }
-
-    /**
-     * Return the enumeration member whose {@link #getName()} matches specified value.
-     *
-     * @param name YANG assigned name
-     * @return corresponding TUEMobilityLevel item, if present
-     * @throws NullPointerException if name is null
-     */
-    public static Optional<TUEMobilityLevel> forName(String name) {
-        return Optional.ofNullable(NAME_MAP.get(Objects.requireNonNull(name)));
-    }
-
-    /**
-     * Return the enumeration member whose {@link #getIntValue()} matches specified value.
-     *
-     * @param intValue integer value
-     * @return corresponding TUEMobilityLevel item, or null if no such item exists
-     */
-    public static TUEMobilityLevel forValue(int intValue) {
-        return VALUE_MAP.get(intValue);
-    }
-}
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/Tai.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/Tai.java
deleted file mode 100644 (file)
index 325f70a..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import org.eclipse.jdt.annotation.Nullable;
-import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.tai.PlmnId;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.common.QName;
-
-/**
- *
- * <p>
- * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
- * <pre>
- * grouping Tai {
- *   container plmnId {
- *     uses pLMNId;
- *   }
- *   leaf tac {
- *     type t_tAC;
- *   }
- * }
- * </pre>The schema path to identify an instance is
- * <i>_3gpp-common-yang-types/Tai</i>
- *
- */
-public interface Tai
-    extends
-    DataObject
-{
-
-
-
-    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("Tai");
-
-    /**
-     * @return <code>org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.tai.PlmnId</code> <code>plmnId</code>, or <code>null</code> if not present
-     */
-    @Nullable PlmnId getPlmnId();
-    
-    /**
-     * @return <code>org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.TTAC</code> <code>tac</code>, or <code>null</code> if not present
-     */
-    @Nullable TTAC getTac();
-
-}
-
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TxDirection.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TxDirection.java
deleted file mode 100644 (file)
index a02cee6..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableMap.Builder;
-import java.lang.Integer;
-import java.lang.Override;
-import java.lang.String;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import org.opendaylight.yangtools.yang.binding.Enumeration;
-
-public enum TxDirection implements Enumeration {
-    DL(0, "DL"),
-    
-    UL(1, "UL"),
-    
-    DLAndUL(2, "DL and UL")
-    ;
-
-    private static final Map<String, TxDirection> NAME_MAP;
-    private static final Map<Integer, TxDirection> VALUE_MAP;
-
-    static {
-        final Builder<String, TxDirection> nb = ImmutableMap.builder();
-        final Builder<Integer, TxDirection> vb = ImmutableMap.builder();
-        for (TxDirection enumItem : TxDirection.values()) {
-            vb.put(enumItem.value, enumItem);
-            nb.put(enumItem.name, enumItem);
-        }
-
-        NAME_MAP = nb.build();
-        VALUE_MAP = vb.build();
-    }
-
-    private final String name;
-    private final int value;
-
-    private TxDirection(int value, String name) {
-        this.value = value;
-        this.name = name;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public int getIntValue() {
-        return value;
-    }
-
-    /**
-     * Return the enumeration member whose {@link #getName()} matches specified value.
-     *
-     * @param name YANG assigned name
-     * @return corresponding TxDirection item, if present
-     * @throws NullPointerException if name is null
-     */
-    public static Optional<TxDirection> forName(String name) {
-        return Optional.ofNullable(NAME_MAP.get(Objects.requireNonNull(name)));
-    }
-
-    /**
-     * Return the enumeration member whose {@link #getIntValue()} matches specified value.
-     *
-     * @param intValue integer value
-     * @return corresponding TxDirection item, or null if no such item exists
-     */
-    public static TxDirection forValue(int intValue) {
-        return VALUE_MAP.get(intValue);
-    }
-}
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/UPInterfaceType.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/UPInterfaceType.java
deleted file mode 100644 (file)
index bdcf43a..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableMap.Builder;
-import java.lang.Integer;
-import java.lang.Override;
-import java.lang.String;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import org.opendaylight.yangtools.yang.binding.Enumeration;
-
-public enum UPInterfaceType implements Enumeration {
-    N3(0, "N3"),
-    
-    N6(1, "N6"),
-    
-    N9(2, "N9")
-    ;
-
-    private static final Map<String, UPInterfaceType> NAME_MAP;
-    private static final Map<Integer, UPInterfaceType> VALUE_MAP;
-
-    static {
-        final Builder<String, UPInterfaceType> nb = ImmutableMap.builder();
-        final Builder<Integer, UPInterfaceType> vb = ImmutableMap.builder();
-        for (UPInterfaceType enumItem : UPInterfaceType.values()) {
-            vb.put(enumItem.value, enumItem);
-            nb.put(enumItem.name, enumItem);
-        }
-
-        NAME_MAP = nb.build();
-        VALUE_MAP = vb.build();
-    }
-
-    private final String name;
-    private final int value;
-
-    private UPInterfaceType(int value, String name) {
-        this.value = value;
-        this.name = name;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public int getIntValue() {
-        return value;
-    }
-
-    /**
-     * Return the enumeration member whose {@link #getName()} matches specified value.
-     *
-     * @param name YANG assigned name
-     * @return corresponding UPInterfaceType item, if present
-     * @throws NullPointerException if name is null
-     */
-    public static Optional<UPInterfaceType> forName(String name) {
-        return Optional.ofNullable(NAME_MAP.get(Objects.requireNonNull(name)));
-    }
-
-    /**
-     * Return the enumeration member whose {@link #getIntValue()} matches specified value.
-     *
-     * @param intValue integer value
-     * @return corresponding UPInterfaceType item, or null if no such item exists
-     */
-    public static UPInterfaceType forValue(int intValue) {
-        return VALUE_MAP.get(intValue);
-    }
-}
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/guami/AmfId.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/guami/AmfId.java
deleted file mode 100644 (file)
index 3918d23..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.guami;
-import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.$YangModuleInfoImpl;
-import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.AMFIdentifier;
-import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.Guami;
-import org.opendaylight.yangtools.yang.binding.Augmentable;
-import org.opendaylight.yangtools.yang.binding.ChildOf;
-import org.opendaylight.yangtools.yang.common.QName;
-
-/**
- *
- * <p>
- * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
- * <pre>
- * container amfId {
- *   uses aMFIdentifier;
- * }
- * </pre>The schema path to identify an instance is
- * <i>_3gpp-common-yang-types/Guami/amfId</i>
- *
- * <p>To create instances of this class use {@link AmfIdBuilder}.
- * @see AmfIdBuilder
- *
- */
-public interface AmfId
-    extends
-    ChildOf<Guami>,
-    Augmentable<AmfId>,
-    AMFIdentifier
-{
-
-
-
-    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("amfId");
-
-
-}
-
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/guami/PlmnId.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/guami/PlmnId.java
deleted file mode 100644 (file)
index 6f00171..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.guami;
-import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.$YangModuleInfoImpl;
-import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.Guami;
-import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.PLMNId;
-import org.opendaylight.yangtools.yang.binding.Augmentable;
-import org.opendaylight.yangtools.yang.binding.ChildOf;
-import org.opendaylight.yangtools.yang.common.QName;
-
-/**
- *
- * <p>
- * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
- * <pre>
- * container plmnId {
- *   uses pLMNId;
- * }
- * </pre>The schema path to identify an instance is
- * <i>_3gpp-common-yang-types/Guami/plmnId</i>
- *
- * <p>To create instances of this class use {@link PlmnIdBuilder}.
- * @see PlmnIdBuilder
- *
- */
-public interface PlmnId
-    extends
-    ChildOf<Guami>,
-    Augmentable<PlmnId>,
-    PLMNId
-{
-
-
-
-    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("plmnId");
-
-
-}
-
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/Address.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/Address.java
deleted file mode 100644 (file)
index d9718e6..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.interfaceupfinfoitem;
-import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.$YangModuleInfoImpl;
-import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.InterfaceUpfInfoItem;
-import org.opendaylight.yangtools.yang.binding.ChoiceIn;
-import org.opendaylight.yangtools.yang.common.QName;
-
-/**
- *
- * <p>
- * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
- * <pre>
- * choice address {
- *   case ipv4Address {
- *     leaf ipv4Address {
- *       type inet:ipv4-address;
- *     }
- *   }
- *   case ipv6Address {
- *     leaf ipv6Address {
- *       type inet:ipv6-address;
- *     }
- *   }
- *   case ipv6Prefix {
- *     leaf ipv6Prefix {
- *       type inet:ipv6-prefix;
- *     }
- *   }
- *   case endpointFqdn {
- *     leaf endpointFqdn {
- *       type inet:domain-name;
- *     }
- *   }
- * }
- * </pre>The schema path to identify an instance is
- * <i>_3gpp-common-yang-types/InterfaceUpfInfoItem/address</i>
- *
- */
-public interface Address
-    extends
-    ChoiceIn<InterfaceUpfInfoItem>
-{
-
-
-
-    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("address");
-
-
-}
-
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/EndpointFqdn.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/EndpointFqdn.java
deleted file mode 100644 (file)
index 4bf58dd..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.interfaceupfinfoitem.address;
-import org.eclipse.jdt.annotation.Nullable;
-import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.$YangModuleInfoImpl;
-import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.interfaceupfinfoitem.Address;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.DomainName;
-import org.opendaylight.yangtools.yang.binding.Augmentable;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.common.QName;
-
-/**
- *
- * <p>
- * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
- * <pre>
- * case endpointFqdn {
- *   leaf endpointFqdn {
- *     type inet:domain-name;
- *   }
- * }
- * </pre>The schema path to identify an instance is
- * <i>_3gpp-common-yang-types/InterfaceUpfInfoItem/address/endpointFqdn</i>
- *
- */
-public interface EndpointFqdn
-    extends
-    DataObject,
-    Augmentable<EndpointFqdn>,
-    Address
-{
-
-
-
-    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("endpointFqdn");
-
-    /**
-     * @return <code>org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.DomainName</code> <code>endpointFqdn</code>, or <code>null</code> if not present
-     */
-    @Nullable DomainName getEndpointFqdn();
-
-}
-
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/Ipv4Address.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/Ipv4Address.java
deleted file mode 100644 (file)
index 92483f4..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.interfaceupfinfoitem.address;
-import org.eclipse.jdt.annotation.Nullable;
-import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.$YangModuleInfoImpl;
-import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.interfaceupfinfoitem.Address;
-import org.opendaylight.yangtools.yang.binding.Augmentable;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.common.QName;
-
-/**
- *
- * <p>
- * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
- * <pre>
- * case ipv4Address {
- *   leaf ipv4Address {
- *     type inet:ipv4-address;
- *   }
- * }
- * </pre>The schema path to identify an instance is
- * <i>_3gpp-common-yang-types/InterfaceUpfInfoItem/address/ipv4Address</i>
- *
- */
-public interface Ipv4Address
-    extends
-    DataObject,
-    Augmentable<Ipv4Address>,
-    Address
-{
-
-
-
-    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("ipv4Address");
-
-    /**
-     * @return <code>org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address</code> <code>ipv4Address</code>, or <code>null</code> if not present
-     */
-    org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.@Nullable Ipv4Address getIpv4Address();
-
-}
-
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/Ipv6Address.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/Ipv6Address.java
deleted file mode 100644 (file)
index 93a8aff..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.interfaceupfinfoitem.address;
-import org.eclipse.jdt.annotation.Nullable;
-import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.$YangModuleInfoImpl;
-import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.interfaceupfinfoitem.Address;
-import org.opendaylight.yangtools.yang.binding.Augmentable;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.common.QName;
-
-/**
- *
- * <p>
- * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
- * <pre>
- * case ipv6Address {
- *   leaf ipv6Address {
- *     type inet:ipv6-address;
- *   }
- * }
- * </pre>The schema path to identify an instance is
- * <i>_3gpp-common-yang-types/InterfaceUpfInfoItem/address/ipv6Address</i>
- *
- */
-public interface Ipv6Address
-    extends
-    DataObject,
-    Augmentable<Ipv6Address>,
-    Address
-{
-
-
-
-    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("ipv6Address");
-
-    /**
-     * @return <code>org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address</code> <code>ipv6Address</code>, or <code>null</code> if not present
-     */
-    org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.@Nullable Ipv6Address getIpv6Address();
-
-}
-
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/Ipv6Prefix.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/Ipv6Prefix.java
deleted file mode 100644 (file)
index e18a666..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.interfaceupfinfoitem.address;
-import org.eclipse.jdt.annotation.Nullable;
-import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.$YangModuleInfoImpl;
-import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.interfaceupfinfoitem.Address;
-import org.opendaylight.yangtools.yang.binding.Augmentable;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.common.QName;
-
-/**
- *
- * <p>
- * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
- * <pre>
- * case ipv6Prefix {
- *   leaf ipv6Prefix {
- *     type inet:ipv6-prefix;
- *   }
- * }
- * </pre>The schema path to identify an instance is
- * <i>_3gpp-common-yang-types/InterfaceUpfInfoItem/address/ipv6Prefix</i>
- *
- */
-public interface Ipv6Prefix
-    extends
-    DataObject,
-    Augmentable<Ipv6Prefix>,
-    Address
-{
-
-
-
-    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("ipv6Prefix");
-
-    /**
-     * @return <code>org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix</code> <code>ipv6Prefix</code>, or <code>null</code> if not present
-     */
-    org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.@Nullable Ipv6Prefix getIpv6Prefix();
-
-}
-
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/Address.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/Address.java
deleted file mode 100644 (file)
index f15a2bd..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.ipendpoint;
-import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.$YangModuleInfoImpl;
-import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.IpEndPoint;
-import org.opendaylight.yangtools.yang.binding.ChoiceIn;
-import org.opendaylight.yangtools.yang.common.QName;
-
-/**
- *
- * <p>
- * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
- * <pre>
- * choice address {
- *   case ipv4Address {
- *     leaf ipv4Address {
- *       type inet:ipv4-address;
- *     }
- *   }
- *   case ipv6Address {
- *     leaf ipv6Address {
- *       type inet:ipv6-address;
- *     }
- *   }
- *   case ipv6Prefix {
- *     leaf ipv6Prefix {
- *       type inet:ipv6-prefix;
- *     }
- *   }
- * }
- * </pre>The schema path to identify an instance is
- * <i>_3gpp-common-yang-types/ipEndPoint/address</i>
- *
- */
-public interface Address
-    extends
-    ChoiceIn<IpEndPoint>
-{
-
-
-
-    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("address");
-
-
-}
-
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/address/Ipv4Address.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/address/Ipv4Address.java
deleted file mode 100644 (file)
index b387e3f..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.ipendpoint.address;
-import org.eclipse.jdt.annotation.Nullable;
-import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.$YangModuleInfoImpl;
-import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.ipendpoint.Address;
-import org.opendaylight.yangtools.yang.binding.Augmentable;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.common.QName;
-
-/**
- *
- * <p>
- * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
- * <pre>
- * case ipv4Address {
- *   leaf ipv4Address {
- *     type inet:ipv4-address;
- *   }
- * }
- * </pre>The schema path to identify an instance is
- * <i>_3gpp-common-yang-types/ipEndPoint/address/ipv4Address</i>
- *
- */
-public interface Ipv4Address
-    extends
-    DataObject,
-    Augmentable<Ipv4Address>,
-    Address
-{
-
-
-
-    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("ipv4Address");
-
-    /**
-     * @return <code>org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address</code> <code>ipv4Address</code>, or <code>null</code> if not present
-     */
-    org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.@Nullable Ipv4Address getIpv4Address();
-
-}
-
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/address/Ipv6Address.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/address/Ipv6Address.java
deleted file mode 100644 (file)
index f6a3a4a..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.ipendpoint.address;
-import org.eclipse.jdt.annotation.Nullable;
-import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.$YangModuleInfoImpl;
-import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.ipendpoint.Address;
-import org.opendaylight.yangtools.yang.binding.Augmentable;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.common.QName;
-
-/**
- *
- * <p>
- * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
- * <pre>
- * case ipv6Address {
- *   leaf ipv6Address {
- *     type inet:ipv6-address;
- *   }
- * }
- * </pre>The schema path to identify an instance is
- * <i>_3gpp-common-yang-types/ipEndPoint/address/ipv6Address</i>
- *
- */
-public interface Ipv6Address
-    extends
-    DataObject,
-    Augmentable<Ipv6Address>,
-    Address
-{
-
-
-
-    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("ipv6Address");
-
-    /**
-     * @return <code>org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address</code> <code>ipv6Address</code>, or <code>null</code> if not present
-     */
-    org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.@Nullable Ipv6Address getIpv6Address();
-
-}
-
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/address/Ipv6Prefix.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/address/Ipv6Prefix.java
deleted file mode 100644 (file)
index 95022a3..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.ipendpoint.address;
-import org.eclipse.jdt.annotation.Nullable;
-import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.$YangModuleInfoImpl;
-import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.ipendpoint.Address;
-import org.opendaylight.yangtools.yang.binding.Augmentable;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.common.QName;
-
-/**
- *
- * <p>
- * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
- * <pre>
- * case ipv6Prefix {
- *   leaf ipv6Prefix {
- *     type inet:ipv6-prefix;
- *   }
- * }
- * </pre>The schema path to identify an instance is
- * <i>_3gpp-common-yang-types/ipEndPoint/address/ipv6Prefix</i>
- *
- */
-public interface Ipv6Prefix
-    extends
-    DataObject,
-    Augmentable<Ipv6Prefix>,
-    Address
-{
-
-
-
-    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("ipv6Prefix");
-
-    /**
-     * @return <code>org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix</code> <code>ipv6Prefix</code>, or <code>null</code> if not present
-     */
-    org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.@Nullable Ipv6Prefix getIpv6Prefix();
-
-}
-
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/snssaiupfinfoitem/DnnUpfInfo.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/snssaiupfinfoitem/DnnUpfInfo.java
deleted file mode 100644 (file)
index 0257063..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.snssaiupfinfoitem;
-import java.lang.Override;
-import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.$YangModuleInfoImpl;
-import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.DnnUpfInfoItem;
-import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.SnssaiUpfInfoItem;
-import org.opendaylight.yangtools.yang.binding.Augmentable;
-import org.opendaylight.yangtools.yang.binding.ChildOf;
-import org.opendaylight.yangtools.yang.binding.Identifiable;
-import org.opendaylight.yangtools.yang.common.QName;
-
-/**
- *
- * <p>
- * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
- * <pre>
- * list dnnUpfInfo {
- *   key dnn;
- *   uses DnnUpfInfoItem;
- * }
- * </pre>The schema path to identify an instance is
- * <i>_3gpp-common-yang-types/SnssaiUpfInfoItem/dnnUpfInfo</i>
- *
- * <p>To create instances of this class use {@link DnnUpfInfoBuilder}.
- * @see DnnUpfInfoBuilder
- * @see DnnUpfInfoKey
- *
- */
-public interface DnnUpfInfo
-    extends
-    ChildOf<SnssaiUpfInfoItem>,
-    Augmentable<DnnUpfInfo>,
-    DnnUpfInfoItem,
-    Identifiable<DnnUpfInfoKey>
-{
-
-
-
-    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("dnnUpfInfo");
-
-    @Override
-    DnnUpfInfoKey key();
-
-}
-
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/snssaiupfinfoitem/DnnUpfInfoKey.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/snssaiupfinfoitem/DnnUpfInfoKey.java
deleted file mode 100644 (file)
index faa589d..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.snssaiupfinfoitem;
-import com.google.common.base.MoreObjects;
-import java.lang.Override;
-import java.lang.String;
-import java.util.Objects;
-import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.TDnn;
-import org.opendaylight.yangtools.yang.binding.CodeHelpers;
-import org.opendaylight.yangtools.yang.binding.Identifier;
-
-public class DnnUpfInfoKey
- implements Identifier<DnnUpfInfo> {
-    private static final long serialVersionUID = -3246452801435528856L;
-    private final TDnn _dnn;
-
-
-    public DnnUpfInfoKey(TDnn _dnn) {
-    
-    
-        this._dnn = _dnn;
-    }
-    
-    /**
-     * Creates a copy from Source Object.
-     *
-     * @param source Source object
-     */
-    public DnnUpfInfoKey(DnnUpfInfoKey source) {
-        this._dnn = source._dnn;
-    }
-
-
-    public TDnn getDnn() {
-        return _dnn;
-    }
-
-
-    @Override
-    public int hashCode() {
-        return CodeHelpers.wrapperHashCode(_dnn);
-    }
-
-    @Override
-    public boolean equals(java.lang.Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        DnnUpfInfoKey other = (DnnUpfInfoKey) obj;
-        if (!Objects.equals(_dnn, other._dnn)) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public String toString() {
-        final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(DnnUpfInfoKey.class);
-        CodeHelpers.appendValue(helper, "_dnn", _dnn);
-        return helper.toString();
-    }
-}
-
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/tai/PlmnId.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/tai/PlmnId.java
deleted file mode 100644 (file)
index 44c34f2..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.tai;
-import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.$YangModuleInfoImpl;
-import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.PLMNId;
-import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.Tai;
-import org.opendaylight.yangtools.yang.binding.Augmentable;
-import org.opendaylight.yangtools.yang.binding.ChildOf;
-import org.opendaylight.yangtools.yang.common.QName;
-
-/**
- *
- * <p>
- * This class represents the following YANG schema fragment defined in module <b>_3gpp-common-yang-types</b>
- * <pre>
- * container plmnId {
- *   uses pLMNId;
- * }
- * </pre>The schema path to identify an instance is
- * <i>_3gpp-common-yang-types/Tai/plmnId</i>
- *
- * <p>To create instances of this class use {@link PlmnIdBuilder}.
- * @see PlmnIdBuilder
- *
- */
-public interface PlmnId
-    extends
-    ChildOf<Tai>,
-    Augmentable<PlmnId>,
-    PLMNId
-{
-
-
-
-    public static final QName QNAME = $YangModuleInfoImpl.qnameOf("plmnId");
-
-
-}
-
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/gran/GRanNetworkElement.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/gran/GRanNetworkElement.java
deleted file mode 100644 (file)
index 93cbdfd..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- * ============LICENSE_END==========================================================================
- */
-package org.oransc.oam.features.devicemanager.gran;
-
-import java.util.Optional;
-import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.DataProvider;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.ne.service.NetworkElement;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.ne.service.NetworkElementService;
-import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfAccessor;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.NetworkElementDeviceType;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author herbert
- *
- */
-public class GRanNetworkElement implements NetworkElement {
-
-    private static final Logger log = LoggerFactory.getLogger(GRanNetworkElement.class);
-
-    private final NetconfAccessor netconfAccessor;
-    @SuppressWarnings("unused")
-    private final DataProvider databaseService;
-
-    public GRanNetworkElement(NetconfAccessor netconfAccess, DataProvider databaseService) {
-        log.info("Create {}", GRanNetworkElement.class.getSimpleName());
-        this.netconfAccessor = netconfAccess;
-        this.databaseService = databaseService;
-    }
-
-    @Override
-    public void register() {
-        log.info("Register actions should be here");
-    }
-
-    @Override
-    public void deregister() {
-        log.info("deRegister actions should be here");
-    }
-
-    @Override
-    public void warmstart() {
-        log.info("Warmstart actions should be here");
-    }
-
-    @Override
-    public NodeId getNodeId() {
-        return netconfAccessor.getNodeId();
-    }
-
-    @Override
-    public <L extends NetworkElementService> Optional<L> getService(Class<L> clazz) {
-        return Optional.empty();
-    }
-
-    @Override
-    public NetworkElementDeviceType getDeviceType() {
-        return NetworkElementDeviceType.RAN3GPP;
-    }
-
-    @Override
-    public Optional<NetconfAccessor> getAcessor() {
-        return Optional.of(netconfAccessor);
-    }
-
-}
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/gran/GRanNetworkElementFactory.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/gran/GRanNetworkElementFactory.java
deleted file mode 100644 (file)
index 12366b9..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- * ============LICENSE_END==========================================================================
- */
-
-package org.oransc.oam.features.devicemanager.gran;
-
-import java.util.Optional;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.ne.factory.NetworkElementFactory;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.ne.service.NetworkElement;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.service.DeviceManagerServiceProvider;
-import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfAccessor;
-import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.top.rev180731.TopGrp;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class GRanNetworkElementFactory implements NetworkElementFactory {
-
-    private static final Logger log = LoggerFactory.getLogger(GRanNetworkElementFactory.class);
-
-    @Override
-    public Optional<NetworkElement> create(NetconfAccessor acessor, DeviceManagerServiceProvider serviceProvider) {
-        if (acessor.getCapabilites().isSupportingNamespace(TopGrp.QNAME)) {
-            log.info("Create device {} ", GRanNetworkElement.class.getName());
-            return Optional.of(new GRanNetworkElement(acessor, serviceProvider.getDataProvider()));
-        } else {
-            return Optional.empty();
-        }
-    }
-}
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/gran/impl/DeviceManagerGRanImpl.java b/features/devicemanager/g-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/gran/impl/DeviceManagerGRanImpl.java
deleted file mode 100644 (file)
index cc6158c..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- * ============LICENSE_END==========================================================================
- */
-package org.oransc.oam.features.devicemanager.gran.impl;
-
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.ne.factory.FactoryRegistration;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.service.NetconfNetworkElementService;
-import org.oransc.oam.features.devicemanager.gran.GRanNetworkElementFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class DeviceManagerGRanImpl implements AutoCloseable  {
-
-    private static final Logger LOG = LoggerFactory.getLogger(DeviceManagerGRanImpl.class);
-    private static final String APPLICATION_NAME = "DeviceManagerGRan";
-    
-    private NetconfNetworkElementService netconfNetworkElementService;
-
-    private Boolean devicemanagerInitializationOk;
-    private FactoryRegistration<GRanNetworkElementFactory> factoryRegistration;
-
-    // Blueprint 1
-    public DeviceManagerGRanImpl() {
-        LOG.info("Creating provider for {}", APPLICATION_NAME);
-        devicemanagerInitializationOk = false;
-
-        netconfNetworkElementService = null;
-        factoryRegistration = null;
-    
-    }
-   public void setNetconfNetworkElementService(NetconfNetworkElementService netconfNetworkElementService) {
-       this.netconfNetworkElementService = netconfNetworkElementService;
-   }
-
-    public void init() throws Exception {
-
-        LOG.info("Session Initiated start {}", APPLICATION_NAME);
-        // Intialization
-        factoryRegistration = netconfNetworkElementService.registerNetworkElementFactory(new GRanNetworkElementFactory());
-        netconfNetworkElementService.writeToEventLog(APPLICATION_NAME, "startup", "done");
-        this.devicemanagerInitializationOk = true;
-
-        LOG.info("Session Initiated end. Initialization done {}", devicemanagerInitializationOk);
-    }
-
-    @Override
-    public void close() throws Exception {
-        LOG.info("closing ...");
-        if (factoryRegistration != null) {
-            factoryRegistration.close();
-        }
-        LOG.info("closing done");
-    }
-
-}
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/features/devicemanager/g-ran/ru-fh/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
deleted file mode 100644 (file)
index 0d44fc5..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ ============LICENSE_START=======================================================
-  ~ ONAP : ccsdk features
-  ~ ================================================================================
-  ~ Copyright (C) 2019 highstreet technologies GmbH Intellectual Property.
-  ~ All rights reserved.
-  ~ ================================================================================
-  ~ Update Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
-  ~ ================================================================================
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~ ============LICENSE_END=======================================================
-  ~
-  -->
-
-<blueprint xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
-           xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" odl:use-default-for-reference-types="true">
-
-    <reference id="netconfNetworkElementService"
-               availability="mandatory" activation="eager"
-               interface="org.onap.ccsdk.features.sdnr.wt.devicemanager.service.NetconfNetworkElementService"/>
-
-    <bean id="provider"
-          class="org.oransc.oam.features.devicemanager.gran.impl.DeviceManagerGRanImpl"
-          init-method="init" destroy-method="close">
-        <property name="netconfNetworkElementService" ref="netconfNetworkElementService"/>
-    </bean>
-</blueprint>
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/main/resources/version.properties b/features/devicemanager/g-ran/ru-fh/provider/src/main/resources/version.properties
deleted file mode 100644 (file)
index 6638c04..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# ============LICENSE_START=======================================================
-# ONAP : ccsdk features
-# ================================================================================
-# Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END=======================================================
-#
-#
-
-# Properties filled in by maven during build process
-version = ${project.version}
-build = ${buildtime}
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/gran/test/TestDeviceManagerGRanImpl.java b/features/devicemanager/g-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/gran/test/TestDeviceManagerGRanImpl.java
deleted file mode 100644 (file)
index c82cda7..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2020 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- * ============LICENSE_END==========================================================================
- */
-package org.oransc.oam.features.devicemanager.gran.test;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import org.junit.Test;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.service.DeviceManagerServiceProvider;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.service.NetconfNetworkElementService;
-import org.oransc.oam.features.devicemanager.gran.GRanNetworkElementFactory;
-import org.oransc.oam.features.devicemanager.gran.impl.DeviceManagerGRanImpl;
-
-public class TestDeviceManagerGRanImpl {
-    GRanNetworkElementFactory factory = new GRanNetworkElementFactory();
-    DeviceManagerServiceProvider serviceProvider;
-
-    @Test
-    public void test() throws Exception {
-        serviceProvider = mock(DeviceManagerServiceProvider.class);
-        NetconfNetworkElementService netconfNetworkElementService = mock(NetconfNetworkElementService.class);
-        when(netconfNetworkElementService.registerNetworkElementFactory(factory)).thenReturn(null);
-        when(netconfNetworkElementService.getServiceProvider()).thenReturn(serviceProvider);
-
-        DeviceManagerGRanImpl devMgrGRan = new DeviceManagerGRanImpl();
-
-        devMgrGRan.setNetconfNetworkElementService(netconfNetworkElementService);
-        devMgrGRan.init();
-        devMgrGRan.close();
-
-    }
-
-}
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/gran/test/TestGRanNetworkElement.java b/features/devicemanager/g-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/gran/test/TestGRanNetworkElement.java
deleted file mode 100644 (file)
index f3f8224..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2020 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- * ============LICENSE_END==========================================================================
- */
-package org.oransc.oam.features.devicemanager.gran.test;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import org.junit.Test;
-import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.DataProvider;
-import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfAccessor;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
-import org.oransc.oam.features.devicemanager.gran.GRanNetworkElement;
-
-public class TestGRanNetworkElement {
-
-    private static final String NODEID = "node1";
-
-    @Test
-    public void test() {
-        NetconfAccessor netconfAccessor = mock(NetconfAccessor.class);
-        DataProvider databaseService = mock(DataProvider.class);
-
-        when(netconfAccessor.getNodeId()).thenReturn(new NodeId(NODEID));
-
-        GRanNetworkElement gRanNe = new GRanNetworkElement(netconfAccessor, databaseService);
-        assertEquals(3, gRanNe.getDeviceType().getIntValue());
-        assertEquals("RAN3GPP", gRanNe.getDeviceType().getName());
-        assertEquals(NODEID, gRanNe.getNodeId().getValue());
-
-        gRanNe.register();
-        gRanNe.deregister();
-        gRanNe.warmstart();
-        gRanNe.getAcessor();
-        gRanNe.getService(null);
-
-    }
-
-
-}
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/gran/test/TestGRanNetworkElementFactory.java b/features/devicemanager/g-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/gran/test/TestGRanNetworkElementFactory.java
deleted file mode 100644 (file)
index 9edfa9a..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2020 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- * ============LICENSE_END==========================================================================
- */
-package org.oransc.oam.features.devicemanager.gran.test;
-
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.service.DeviceManagerServiceProvider;
-import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.Capabilities;
-import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfAccessor;
-import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.top.rev180731.TopGrp;
-import org.oransc.oam.features.devicemanager.gran.GRanNetworkElementFactory;
-
-
-public class TestGRanNetworkElementFactory {
-
-    Capabilities capabilities;
-    NetconfAccessor netconfAccessor;
-    DeviceManagerServiceProvider devMgrService;
-
-    @SuppressWarnings("unused")
-    @Before
-    public void init() {
-        capabilities = mock(Capabilities.class);
-        netconfAccessor = mock(NetconfAccessor.class);
-        devMgrService = mock(DeviceManagerServiceProvider.class);
-
-        when(netconfAccessor.getCapabilites()).thenReturn(capabilities);
-        when(devMgrService.getDataProvider()).thenReturn(null);
-
-    }
-
-    @Test
-    public void testCreate() throws Exception {
-        when(netconfAccessor.getCapabilites().isSupportingNamespace(TopGrp.QNAME)).thenReturn(true);
-
-        GRanNetworkElementFactory gRanNeFactory = new GRanNetworkElementFactory();
-        assertTrue((gRanNeFactory.create(netconfAccessor, devMgrService)).isPresent());
-    }
-
-    @Test
-    public void testCreateNone() throws Exception {
-        when(netconfAccessor.getCapabilites().isSupportingNamespace(TopGrp.QNAME)).thenReturn(false);
-
-        GRanNetworkElementFactory gRanNeFactory = new GRanNetworkElementFactory();
-        assertTrue(!(gRanNeFactory.create(netconfAccessor, devMgrService).isPresent()));
-    }
-
-}
diff --git a/features/devicemanager/g-ran/ru-fh/provider/src/test/resources/simplelogger.properties b/features/devicemanager/g-ran/ru-fh/provider/src/test/resources/simplelogger.properties
deleted file mode 100644 (file)
index 9af26dc..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# ============LICENSE_START=======================================================
-# ONAP : ccsdk features
-# ================================================================================
-# Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END=======================================================
-#
-#
-
-# SLF4J's SimpleLogger configuration file
-# Simple implementation of Logger that sends all enabled log messages, for all defined loggers, to System.err.
-
-# Default logging detail level for all instances of SimpleLogger.
-# Must be one of ("trace", "debug", "info", "warn", or "error").
-# If not specified, defaults to "info".
-org.slf4j.simpleLogger.defaultLogLevel=info
-
-# Logging detail level for a SimpleLogger instance named "xxx.yyy.zzz".
-# Must be one of ("trace", "debug", "info", "warn", or "error").
-# If not specified, the default logging detail level is used.
-# org.slf4j.simpleLogger.log.xxx.yyy=debug
-org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.devicemanager=info
-org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.devicemanager.test=debug
-org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.database=debug
-org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.devicemanager.archiveservice=info
-org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.Resources=info
-org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.container=info
-
-# Set to true if you want the current date and time to be included in output messages.
-# Default is false, and will output the number of milliseconds elapsed since startup.
-#org.slf4j.simpleLogger.showDateTime=false
-
-# The date and time format to be used in the output messages.
-# The pattern describing the date and time format is the same that is used in java.text.SimpleDateFormat.
-# If the format is not specified or is invalid, the default format is used.
-# The default format is yyyy-MM-dd HH:mm:ss:SSS Z.
-#org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss:SSS Z
-
-# Set to true if you want to output the current thread name.
-# Defaults to true.
-#org.slf4j.simpleLogger.showThreadName=true
-
-# Set to true if you want the Logger instance name to be included in output messages.
-# Defaults to true.
-#org.slf4j.simpleLogger.showLogName=true
-
-# Set to true if you want the last component of the name to be included in output messages.
-# Defaults to false.
-#org.slf4j.simpleLogger.showShortLogName=false
diff --git a/features/devicemanager/o-ran/ru-fh/feature/pom.xml b/features/devicemanager/o-ran/ru-fh/feature/pom.xml
deleted file mode 100644 (file)
index 712fd0a..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ ============LICENSE_START=======================================================
-  ~ ONAP : ccsdk features
-  ~ ================================================================================
-  ~ Copyright (C) 2018 highstreet technologies GmbH Intellectual Property.
-  ~ All rights reserved.
-  ~ ================================================================================
-  ~ Update Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
-  ~ ================================================================================
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~ ============LICENSE_END=======================================================
-  ~
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.o-ran-sc.oam.features.parent</groupId>
-        <artifactId>single-feature-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.o-ran-sc.oam.features.devicemanager</groupId>
-    <artifactId>devicemanager-oran-ru-fh-feature</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
-
-    <name>o-ran-sc-features :: ${project.artifactId}</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>devicemanager-oran-ru-fh-provider</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-
-  <repositories>
-    <repository>
-      <id>onap-public</id>
-      <url>https://nexus.onap.org/content/groups/public/</url>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-        <updatePolicy>always</updatePolicy>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>onap-staging</id>
-      <url>https://nexus.onap.org/content/groups/staging/</url>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-        <updatePolicy>always</updatePolicy>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>ecomp-release</id>
-      <name>onap-repository-releases</name>
-      <url>https://nexus.onap.org/content/repositories/releases/</url>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>ecomp-snapshot</id>
-      <name>onap-repository-snapshots</name>
-      <url>https://nexus.onap.org/content/repositories/snapshots/</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
-</project>
diff --git a/features/devicemanager/o-ran/ru-fh/installer/pom.xml b/features/devicemanager/o-ran/ru-fh/installer/pom.xml
deleted file mode 100644 (file)
index 2a4aea2..0000000
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ ============LICENSE_START=======================================================
-  ~ ONAP : ccsdk features
-  ~ ================================================================================
-  ~ Copyright (C) 2018 highstreet technologies GmbH Intellectual Property.
-  ~ All rights reserved.
-  ~ ================================================================================
-  ~ Update Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
-  ~ ================================================================================
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~ ============LICENSE_END=======================================================
-  ~
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-       <groupId>org.o-ran-sc.oam.features.parent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.o-ran-sc.oam.features.devicemanager</groupId>
-    <artifactId>devicemanager-oran-ru-fh-installer</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <name>o-ran-sc-features :: ${project.artifactId}</name>
-
-    <properties>
-        <application.name>devicemanager-oran-ru-fh</application.name>
-        <include.transitive.dependencies>false</include.transitive.dependencies>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>mdsal-artifacts</artifactId>
-                <version>${odl.controller.mdsal.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>${application.name}-feature</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>${application.name}-provider</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>maven-repo-zip</id>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <phase>package</phase>
-                        <configuration>
-                            <attach>true</attach>
-                            <finalName>stage/${application.name}-${project.version}</finalName>
-                            <descriptors>
-                                <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
-                            </descriptors>
-                            <appendAssemblyId>true</appendAssemblyId>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-nested-dependencies</id>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <phase>prepare-package</phase>
-                        <configuration>
-                            <transitive>true</transitive>
-                            <outputDirectory>${project.build.directory}/assembly/system</outputDirectory>
-                            <overWriteReleases>false</overWriteReleases>
-                            <overWriteSnapshots>true</overWriteSnapshots>
-                            <overWriteIfNewer>true</overWriteIfNewer>
-                            <useRepositoryLayout>true</useRepositoryLayout>
-                            <addParentPoms>false</addParentPoms>
-                            <copyPom>false</copyPom>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-  <repositories>
-    <repository>
-      <id>onap-public</id>
-      <url>https://nexus.onap.org/content/groups/public/</url>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-        <updatePolicy>always</updatePolicy>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>onap-staging</id>
-      <url>https://nexus.onap.org/content/groups/staging/</url>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-        <updatePolicy>always</updatePolicy>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>ecomp-release</id>
-      <name>onap-repository-releases</name>
-      <url>https://nexus.onap.org/content/repositories/releases/</url>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>ecomp-snapshot</id>
-      <name>onap-repository-snapshots</name>
-      <url>https://nexus.onap.org/content/repositories/snapshots/</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
-</project>
diff --git a/features/devicemanager/o-ran/ru-fh/installer/src/assembly/assemble_mvnrepo_zip.xml b/features/devicemanager/o-ran/ru-fh/installer/src/assembly/assemble_mvnrepo_zip.xml
deleted file mode 100644 (file)
index dfe5060..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-  ~ ============LICENSE_START=======================================================
-  ~ ONAP : ccsdk features
-  ~ ================================================================================
-  ~ Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
-  ~ ================================================================================
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~ ============LICENSE_END=======================================================
-  ~
-  -->
-
-<!-- Defines how we build the .zip file which is our distribution. -->
-
-<assembly
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-    <id>repo</id>
-    <formats>
-        <format>zip</format>
-    </formats>
-
-    <!--  we want "system" and related files right at the root level
-          as this file is suppose to be unzip on top of a karaf
-          distro. -->
-    <includeBaseDirectory>false</includeBaseDirectory>
-
-    <fileSets>
-        <fileSet>
-            <directory>target/assembly/</directory>
-            <outputDirectory>.</outputDirectory>
-            <excludes>
-            </excludes>
-        </fileSet>
-    </fileSets>
-
-</assembly>
diff --git a/features/devicemanager/o-ran/ru-fh/model/pom.xml b/features/devicemanager/o-ran/ru-fh/model/pom.xml
deleted file mode 100644 (file)
index cdb2c42..0000000
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ ============LICENSE_START=======================================================
-  ~ ONAP : ccsdk features
-  ~ ================================================================================
-  ~ Copyright (C) 2018 highstreet technologies GmbH Intellectual Property.
-  ~ All rights reserved.
-  ~ ================================================================================
-  ~ Update Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
-  ~ ================================================================================
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~ ============LICENSE_END=======================================================
-  ~
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.o-ran-sc.oam.features.parent</groupId>
-        <artifactId>binding-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.o-ran-sc.oam.features.devicemanager</groupId>
-    <artifactId>devicemanager-oran-ru-fh-model</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-
-    <name>o-ran-sc-features :: ${project.artifactId}</name>
-    <licenses>
-        <license>
-            <name>Apache License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
-        </license>
-    </licenses>
-
-    <properties>
-        <maven.javadoc.skip>true</maven.javadoc.skip>
-    </properties>
-
-    <dependencies>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>**/gen/**</exclude>
-                        <exclude>**/generated-sources/**</exclude>
-                        <exclude>**/yang-gen-sal/**</exclude>
-                        <exclude>**/pax/**</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-  <repositories>
-    <repository>
-      <id>onap-public</id>
-      <url>https://nexus.onap.org/content/groups/public/</url>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-        <updatePolicy>always</updatePolicy>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>onap-staging</id>
-      <url>https://nexus.onap.org/content/groups/staging/</url>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-        <updatePolicy>always</updatePolicy>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>ecomp-release</id>
-      <name>onap-repository-releases</name>
-      <url>https://nexus.onap.org/content/repositories/releases/</url>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>ecomp-snapshot</id>
-      <name>onap-repository-snapshots</name>
-      <url>https://nexus.onap.org/content/repositories/snapshots/</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
-
-</project>
diff --git a/features/devicemanager/o-ran/ru-fh/model/src/main/yang/devicemanager-oran.yang b/features/devicemanager/o-ran/ru-fh/model/src/main/yang/devicemanager-oran.yang
deleted file mode 100644 (file)
index 6ea5836..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-module devicemanager-oran {
-
-  yang-version 1;
-  namespace "urn:opendaylight:params:xml:ns:yang:devicemanager-oran";
-  prefix devicemanager-oran;
-
-  organization
-    "highstreet technologies GmbH";
-  contact
-    "Web:   <https://highstreet-technologies.com>
-     O-RAN: <https://wiki.o-ran-sc.org/display/OAM/Operations+and+Maintenance";
-
-  description
-    "DeviceManager Open RAN Api Module
-
-     Copyright 2019 highstreet technologies GmbH Intellectual Property.
-     All rights reserved.
-
-     Licensed under the Apache License, Version 2.0 (the 'License');
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an 'AS IS' BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.";
-
-  revision 2019-11-15 {
-    description
-      "Initial revision";
-    reference
-      "https://jira.onap.org/browse/SDNC-877";
-  }
-}
diff --git a/features/devicemanager/o-ran/ru-fh/pom.xml b/features/devicemanager/o-ran/ru-fh/pom.xml
deleted file mode 100644 (file)
index 2290d0f..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ ============LICENSE_START=======================================================
-  ~ ONAP : ccsdk features
-  ~ ================================================================================
-  ~ Copyright (C) 2018 highstreet technologies GmbH Intellectual Property.
-  ~ All rights reserved.
-  ~ ================================================================================
-  ~ Update Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
-  ~ ================================================================================
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~ ============LICENSE_END=======================================================
-  ~
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.o-ran-sc.oam.features.parent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.o-ran-sc.oam.features.devicemanager</groupId>
-    <artifactId>devicemanager-oran-ru-fh-top</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <name>o-ran-sc-features :: ${project.artifactId}</name>
-
-    <properties>
-        <feature-name>devicemanager-oran-ru-fh</feature-name>
-    </properties>
-
-    <modules>
-        <module>model</module>
-        <module>provider</module>
-        <module>feature</module>
-        <module>installer</module>
-    </modules>
-
-  <repositories>
-    <repository>
-      <id>onap-public</id>
-      <url>https://nexus.onap.org/content/groups/public/</url>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-        <updatePolicy>always</updatePolicy>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>onap-staging</id>
-      <url>https://nexus.onap.org/content/groups/staging/</url>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-        <updatePolicy>always</updatePolicy>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>ecomp-release</id>
-      <name>onap-repository-releases</name>
-      <url>https://nexus.onap.org/content/repositories/releases/</url>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>ecomp-snapshot</id>
-      <name>onap-repository-snapshots</name>
-      <url>https://nexus.onap.org/content/repositories/snapshots/</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
-</project>
diff --git a/features/devicemanager/o-ran/ru-fh/provider/copyright b/features/devicemanager/o-ran/ru-fh/provider/copyright
deleted file mode 100644 (file)
index 754b621..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- * ============LICENSE_END==========================================================================
- */
diff --git a/features/devicemanager/o-ran/ru-fh/provider/pom.xml b/features/devicemanager/o-ran/ru-fh/provider/pom.xml
deleted file mode 100644 (file)
index bef4a1f..0000000
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ ============LICENSE_START=======================================================
-  ~ ONAP : ccsdk features
-  ~ ================================================================================
-  ~ Copyright (C) 2020 highstreet technologies GmbH Intellectual Property.
-  ~ All rights reserved.
-  ~ ================================================================================
-  ~ Update Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
-  ~ ================================================================================
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~ ============LICENSE_END=======================================================
-  ~
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.o-ran-sc.oam.features.parent</groupId>
-        <artifactId>binding-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.o-ran-sc.oam.features.devicemanager</groupId>
-    <artifactId>devicemanager-oran-ru-fh-provider</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-
-    <name>o-ran-sc-features :: ${project.artifactId}</name>
-    <licenses>
-        <license>
-            <name>Apache License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
-        </license>
-    </licenses>
-
-    <properties>
-        <checkstyle.skip>true</checkstyle.skip> <!-- POM configuration -->
-        <maven.javadoc.skip>true</maven.javadoc.skip>
-        <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
-        <buildtime>${maven.build.timestamp} UTC</buildtime>
-        <databaseport>49400</databaseport>
-    </properties>
-
-    <dependencies>
-        <!-- begin for testing -->
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- end for testing -->
-        <dependency>
-            <groupId>org.o-ran-sc.scp-oam-modeling.features</groupId>
-            <artifactId>o-ran-ru-fh-model</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-            <artifactId>sdnr-wt-devicemanager-model</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-            <artifactId>sdnr-wt-netconfnode-state-service-model</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>sal-netconf-connector</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-singleton-common-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>**/gen/**</exclude>
-                        <exclude>**/generated-sources/**</exclude>
-                        <exclude>**/yang-gen-sal/**</exclude>
-                        <exclude>**/pax/**</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-  <repositories>
-    <repository>
-      <id>onap-public</id>
-      <url>https://nexus.onap.org/content/groups/public/</url>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-        <updatePolicy>always</updatePolicy>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>onap-staging</id>
-      <url>https://nexus.onap.org/content/groups/staging/</url>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-        <updatePolicy>always</updatePolicy>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>ecomp-release</id>
-      <name>onap-repository-releases</name>
-      <url>https://nexus.onap.org/content/repositories/releases/</url>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>ecomp-snapshot</id>
-      <name>onap-repository-snapshots</name>
-      <url>https://nexus.onap.org/content/repositories/snapshots/</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
-</project>
diff --git a/features/devicemanager/o-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/alarms/rev190911/OperatorStateBuilder.java b/features/devicemanager/o-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/alarms/rev190911/OperatorStateBuilder.java
deleted file mode 100644 (file)
index 7e8327a..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.alarms.rev190911;
-import java.lang.String;
-import java.lang.UnsupportedOperationException;
-
-/**
- * The purpose of generated class in src/main/java for Union types is to create new instances of unions from a string representation.
- * In some cases it is very difficult to automate it since there can be unions such as (uint32 - uint16), or (string - uint32).
- *
- * The reason behind putting it under src/main/java is:
- * This class is generated in form of a stub and needs to be finished by the user. This class is generated only once to prevent
- * loss of user code.
- *
- */
-public class OperatorStateBuilder {
-    private OperatorStateBuilder() {
-        //Exists only to defeat instantiation.
-    }
-
-    public static OperatorState getDefaultInstance(String defaultValue) {
-        throw new UnsupportedOperationException("Not yet implemented");
-    }
-
-}
diff --git a/features/devicemanager/o-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/alarms/rev190911/ResourceBuilder.java b/features/devicemanager/o-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/alarms/rev190911/ResourceBuilder.java
deleted file mode 100644 (file)
index 7c4a63d..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.alarms.rev190911;
-import java.lang.String;
-import java.lang.UnsupportedOperationException;
-
-/**
- * The purpose of generated class in src/main/java for Union types is to create new instances of unions from a string representation.
- * In some cases it is very difficult to automate it since there can be unions such as (uint32 - uint16), or (string - uint32).
- *
- * The reason behind putting it under src/main/java is:
- * This class is generated in form of a stub and needs to be finished by the user. This class is generated only once to prevent
- * loss of user code.
- *
- */
-public class ResourceBuilder {
-    private ResourceBuilder() {
-        //Exists only to defeat instantiation.
-    }
-
-    public static Resource getDefaultInstance(String defaultValue) {
-        throw new UnsupportedOperationException("Not yet implemented");
-    }
-
-}
diff --git a/features/devicemanager/o-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/alarms/rev190911/ResourceMatchBuilder.java b/features/devicemanager/o-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/alarms/rev190911/ResourceMatchBuilder.java
deleted file mode 100644 (file)
index 282a6a2..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.alarms.rev190911;
-import java.lang.String;
-import java.lang.UnsupportedOperationException;
-
-/**
- * The purpose of generated class in src/main/java for Union types is to create new instances of unions from a string representation.
- * In some cases it is very difficult to automate it since there can be unions such as (uint32 - uint16), or (string - uint32).
- *
- * The reason behind putting it under src/main/java is:
- * This class is generated in form of a stub and needs to be finished by the user. This class is generated only once to prevent
- * loss of user code.
- *
- */
-public class ResourceMatchBuilder {
-    private ResourceMatchBuilder() {
-        //Exists only to defeat instantiation.
-    }
-
-    public static ResourceMatch getDefaultInstance(String defaultValue) {
-        throw new UnsupportedOperationException("Not yet implemented");
-    }
-
-}
diff --git a/features/devicemanager/o-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/alarms/rev190911/SeverityWithClearBuilder.java b/features/devicemanager/o-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/alarms/rev190911/SeverityWithClearBuilder.java
deleted file mode 100644 (file)
index 8139192..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.alarms.rev190911;
-import java.lang.String;
-import java.lang.UnsupportedOperationException;
-
-/**
- * The purpose of generated class in src/main/java for Union types is to create new instances of unions from a string representation.
- * In some cases it is very difficult to automate it since there can be unions such as (uint32 - uint16), or (string - uint32).
- *
- * The reason behind putting it under src/main/java is:
- * This class is generated in form of a stub and needs to be finished by the user. This class is generated only once to prevent
- * loss of user code.
- *
- */
-public class SeverityWithClearBuilder {
-    private SeverityWithClearBuilder() {
-        //Exists only to defeat instantiation.
-    }
-
-    public static SeverityWithClear getDefaultInstance(String defaultValue) {
-        throw new UnsupportedOperationException("Not yet implemented");
-    }
-
-}
diff --git a/features/devicemanager/o-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/alarms/rev190911/alarms/ControlMaxAlarmStatusChangesBuilder.java b/features/devicemanager/o-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/alarms/rev190911/alarms/ControlMaxAlarmStatusChangesBuilder.java
deleted file mode 100644 (file)
index 9f10ae8..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.alarms.rev190911.alarms;
-import java.lang.String;
-import java.lang.UnsupportedOperationException;
-
-/**
- * The purpose of generated class in src/main/java for Union types is to create new instances of unions from a string representation.
- * In some cases it is very difficult to automate it since there can be unions such as (uint32 - uint16), or (string - uint32).
- *
- * The reason behind putting it under src/main/java is:
- * This class is generated in form of a stub and needs to be finished by the user. This class is generated only once to prevent
- * loss of user code.
- *
- */
-public class ControlMaxAlarmStatusChangesBuilder {
-    private ControlMaxAlarmStatusChangesBuilder() {
-        //Exists only to defeat instantiation.
-    }
-
-    public static Control.MaxAlarmStatusChanges getDefaultInstance(String defaultValue) {
-        throw new UnsupportedOperationException("Not yet implemented");
-    }
-
-}
diff --git a/features/devicemanager/o-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/oran/impl/DeviceManagerORanImpl.java b/features/devicemanager/o-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/oran/impl/DeviceManagerORanImpl.java
deleted file mode 100644 (file)
index e580426..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * ============LICENSE_START========================================================================
- * O-RAN-SC : oam/ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2020 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- * ============LICENSE_END==========================================================================
- */
-package org.oransc.oam.features.devicemanager.oran.impl;
-
-import org.onap.ccsdk.features.sdnr.wt.common.database.HtDatabaseClient;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.ne.factory.FactoryRegistration;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.service.NetconfNetworkElementService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class DeviceManagerORanImpl implements AutoCloseable {
-
-    private static final Logger LOG = LoggerFactory.getLogger(DeviceManagerORanImpl.class);
-    private static final String APPLICATION_NAME = "DeviceManagerORan";
-    @SuppressWarnings("unused")
-    private static final String CONFIGURATIONFILE = "etc/devicemanager-oran.properties";
-
-
-    private NetconfNetworkElementService netconfNetworkElementService;
-
-    private HtDatabaseClient htDatabaseClient;
-    private Boolean devicemanagerInitializationOk = false;
-    private FactoryRegistration<ORanNetworkElementFactory> resORan;
-
-    // Blueprint begin
-    public DeviceManagerORanImpl() {
-        LOG.info("Creating provider for {}", APPLICATION_NAME);
-        resORan = null;
-    }
-
-    public void setNetconfNetworkElementService(NetconfNetworkElementService netconfNetworkElementService) {
-        this.netconfNetworkElementService = netconfNetworkElementService;
-    }
-
-    public void init() throws Exception {
-
-        LOG.info("Session Initiated start {}", APPLICATION_NAME);
-
-        resORan = netconfNetworkElementService.registerNetworkElementFactory(new ORanNetworkElementFactory());
-
-
-        netconfNetworkElementService.writeToEventLog(APPLICATION_NAME, "startup", "done");
-        this.devicemanagerInitializationOk = true;
-
-        LOG.info("Session Initiated end. Initialization done {}", devicemanagerInitializationOk);
-    }
-    // Blueprint end
-
-    @Override
-    public void close() throws Exception {
-        LOG.info("closing ...");
-        close(htDatabaseClient);
-        close(resORan);
-        LOG.info("closing done");
-    }
-
-    /**
-     * Used to close all Services, that should support AutoCloseable Pattern
-     *
-     * @param toClose
-     * @throws Exception
-     */
-    private void close(AutoCloseable... toCloseList) {
-        for (AutoCloseable element : toCloseList) {
-            if (element != null) {
-                try {
-                    element.close();
-                } catch (Exception e) {
-                    LOG.warn("Fail during close: ", e);
-                }
-            }
-        }
-    }
-}
diff --git a/features/devicemanager/o-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/oran/impl/ORanChangeNotificationListener.java b/features/devicemanager/o-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/oran/impl/ORanChangeNotificationListener.java
deleted file mode 100644 (file)
index 5c35f85..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * ============LICENSE_START========================================================================
- * O-RAN-SC : oam/ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2020 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- * ============LICENSE_END==========================================================================
- */
-package org.oransc.oam.features.devicemanager.oran.impl;
-
-import java.util.List;
-import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.DataProvider;
-import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfAccessor;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.IetfNetconfNotificationsListener;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.NetconfCapabilityChange;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.NetconfConfigChange;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.NetconfConfirmedCommit;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.NetconfSessionEnd;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.NetconfSessionStart;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.netconf.config.change.Edit;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.EventlogBuilder;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.PathArgument;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Listener for change notifications
- */
-public class ORanChangeNotificationListener implements IetfNetconfNotificationsListener {
-
-    private static final Logger log = LoggerFactory.getLogger(ORanChangeNotificationListener.class);
-
-    private final NetconfAccessor netconfAccessor;
-    private final DataProvider databaseService;
-
-    public ORanChangeNotificationListener(NetconfAccessor netconfAccessor, DataProvider databaseService) {
-        this.netconfAccessor = netconfAccessor;
-        this.databaseService = databaseService;
-    }
-
-    @Override
-    public void onNetconfConfirmedCommit(NetconfConfirmedCommit notification) {
-        log.info("onNetconfConfirmedCommit ", notification);
-    }
-
-    @Override
-    public void onNetconfSessionStart(NetconfSessionStart notification) {
-        log.info("onNetconfSessionStart ", notification);
-    }
-
-    @Override
-    public void onNetconfSessionEnd(NetconfSessionEnd notification) {
-        log.info("onNetconfSessionEnd ", notification);
-    }
-
-    @Override
-    public void onNetconfCapabilityChange(NetconfCapabilityChange notification) {
-        log.info("onNetconfCapabilityChange ", notification);
-    }
-
-    @Override
-    public void onNetconfConfigChange(NetconfConfigChange notification) {
-        log.info("onNetconfConfigChange (1) {}", notification);
-        StringBuffer sb = new StringBuffer();
-        List<Edit> editList = notification.nonnullEdit();
-        for (Edit edit : editList) {
-            if (sb.length() > 0) {
-                sb.append(", ");
-            }
-            sb.append(edit);
-
-            EventlogBuilder eventlogBuilder = new EventlogBuilder();
-
-            InstanceIdentifier<?> target = edit.getTarget();
-            if (target != null) {
-                eventlogBuilder.setObjectId(target.toString());
-                log.info("TARGET: {} {} {}", target.getClass(), target.getTargetType());
-                for (PathArgument pa : target.getPathArguments()) {
-                    log.info("PathArgument {}", pa);
-                }
-            }
-            eventlogBuilder.setNodeId(netconfAccessor.getNodeId().getValue());
-            eventlogBuilder.setNewValue(String.valueOf(edit.getOperation()));
-            databaseService.writeEventLog(eventlogBuilder.build());
-        }
-        log.info("onNetconfConfigChange (2) {}", sb);
-    }
-
-}
diff --git a/features/devicemanager/o-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/oran/impl/ORanFaultNotificationListener.java b/features/devicemanager/o-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/oran/impl/ORanFaultNotificationListener.java
deleted file mode 100644 (file)
index b460f16..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * ============LICENSE_START========================================================================
- * O-RAN-SC : oam/ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2020 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- * ============LICENSE_END==========================================================================
- */
-package org.oransc.oam.features.devicemanager.oran.impl;
-
-import org.opendaylight.yang.gen.v1.urn.o.ran.fm._1._0.rev190204.AlarmNotif;
-import org.opendaylight.yang.gen.v1.urn.o.ran.fm._1._0.rev190204.ORanFmListener;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author herbert
- *
- */
-public class ORanFaultNotificationListener implements ORanFmListener {
-
-    private static final Logger log = LoggerFactory.getLogger(ORanFaultNotificationListener.class);
-
-    @Override
-    public void onAlarmNotif(AlarmNotif notification) {
-
-        log.info("onAlarmNotif {}", notification);
-    }
-
-}
diff --git a/features/devicemanager/o-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/oran/impl/ORanNetworkElement.java b/features/devicemanager/o-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/oran/impl/ORanNetworkElement.java
deleted file mode 100644 (file)
index 1404c34..0000000
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * ============LICENSE_START========================================================================
- * O-RAN-SC : oam/ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2020 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- * ============LICENSE_END==========================================================================
- */
-package org.oransc.oam.features.devicemanager.oran.impl;
-
-import java.util.List;
-import java.util.Optional;
-import org.eclipse.jdt.annotation.NonNull;
-import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.DataProvider;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.ne.service.NetworkElement;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.ne.service.NetworkElementService;
-import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfAccessor;
-import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.hardware.rev180313.Hardware;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.hardware.rev180313.hardware.Component;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.NetworkElementDeviceType;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
-import org.opendaylight.yangtools.concepts.ListenerRegistration;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.opendaylight.yangtools.yang.binding.NotificationListener;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- */
-public class ORanNetworkElement implements NetworkElement {
-
-    private static final Logger log = LoggerFactory.getLogger(ORanNetworkElement.class);
-
-    private final NetconfAccessor netconfAccessor;
-
-    private final DataProvider databaseService;
-
-    private final ORanToInternalDataModel oRanMapper;
-
-    private ListenerRegistration<NotificationListener> oRanListenerRegistrationResult;
-    private @NonNull final ORanChangeNotificationListener oRanListener;
-    private ListenerRegistration<NotificationListener> oRanFaultListenerRegistrationResult;
-    private @NonNull final ORanFaultNotificationListener oRanFaultListener;
-
-    ORanNetworkElement(NetconfAccessor netconfAccess, DataProvider databaseService) {
-        log.info("Create {}", ORanNetworkElement.class.getSimpleName());
-        this.netconfAccessor = netconfAccess;
-        this.databaseService = databaseService;
-
-        this.oRanListenerRegistrationResult = null;
-        this.oRanListener = new ORanChangeNotificationListener(netconfAccessor, databaseService);
-
-        this.oRanFaultListenerRegistrationResult = null;
-        this.oRanFaultListener = new ORanFaultNotificationListener();
-
-        this.oRanMapper = new ORanToInternalDataModel();
-
-    }
-
-    public void initialReadFromNetworkElement() {
-        Hardware hardware = readHardware(netconfAccessor);
-        if (hardware != null) {
-            List<Component> componentList = hardware.getComponent();
-            if (componentList != null) {
-                for (Component component : componentList) {
-                    databaseService
-                            .writeInventory(oRanMapper.getInternalEquipment(netconfAccessor.getNodeId(), component));
-                }
-            }
-        }
-    }
-
-    @Override
-    public NetworkElementDeviceType getDeviceType() {
-        return NetworkElementDeviceType.ORAN;
-    }
-
-    private Hardware readHardware(NetconfAccessor accessData) {
-
-        final Class<Hardware> clazzPac = Hardware.class;
-
-        log.info("DBRead Get equipment for class {} from mountpoint {} for uuid {}", clazzPac.getSimpleName(),
-                accessData.getNodeId().getValue());
-
-        InstanceIdentifier<Hardware> hardwareIID = InstanceIdentifier.builder(clazzPac).build();
-
-        Hardware res = accessData.getTransactionUtils().readData(accessData.getDataBroker(),
-                LogicalDatastoreType.OPERATIONAL, hardwareIID);
-
-        return res;
-    }
-
-    @Override
-    public void register() {
-
-        initialReadFromNetworkElement();
-        // Register call back class for receiving notifications
-        this.oRanListenerRegistrationResult = netconfAccessor.doRegisterNotificationListener(oRanListener);
-        this.oRanFaultListenerRegistrationResult = netconfAccessor.doRegisterNotificationListener(oRanFaultListener);
-        // Register netconf stream
-        netconfAccessor.registerNotificationsStream(NetconfAccessor.DefaultNotificationsStream);
-
-
-    }
-
-    @Override
-    public void deregister() {
-        if (oRanListenerRegistrationResult != null) {
-            this.oRanListenerRegistrationResult.close();
-        }
-        if (oRanFaultListenerRegistrationResult != null) {
-            this.oRanFaultListenerRegistrationResult.close();
-        } ;
-    }
-
-
-    @Override
-    public NodeId getNodeId() {
-        return netconfAccessor.getNodeId();
-    }
-
-    @Override
-    public <L extends NetworkElementService> Optional<L> getService(Class<L> clazz) {
-        return Optional.empty();
-    }
-
-    @Override
-    public void warmstart() {}
-
-    @Override
-    public Optional<NetconfAccessor> getAcessor() {
-        return Optional.of(netconfAccessor);
-    }
-
-}
diff --git a/features/devicemanager/o-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/oran/impl/ORanNetworkElementFactory.java b/features/devicemanager/o-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/oran/impl/ORanNetworkElementFactory.java
deleted file mode 100644 (file)
index bc9da71..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * ============LICENSE_START========================================================================
- * O-RAN-SC : oam/ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2020 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- * ============LICENSE_END==========================================================================
- */
-
-package org.oransc.oam.features.devicemanager.oran.impl;
-
-import java.util.Optional;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.ne.factory.NetworkElementFactory;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.ne.service.NetworkElement;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.service.DeviceManagerServiceProvider;
-import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.Capabilities;
-import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfAccessor;
-import org.opendaylight.yang.gen.v1.urn.o.ran.hardware._1._0.rev190328.ORANHWCOMPONENT;
-import org.opendaylight.yangtools.yang.common.QName;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class ORanNetworkElementFactory implements NetworkElementFactory {
-
-    private static final Logger log = LoggerFactory.getLogger(ORanNetworkElementFactory.class);
-    //Workaround
-    private static final QName OneCell =
-            QName.create("urn:onf:otcc:wireless:yang:radio-access:commscope-onecell", "2020-06-22", "onecell").intern();
-
-
-    @Override
-    public Optional<NetworkElement> create(NetconfAccessor acessor, DeviceManagerServiceProvider serviceProvider) {
-        Capabilities capabilites = acessor.getCapabilites();
-        if (!capabilites.isSupportingNamespace(OneCell)) {
-            if (capabilites.isSupportingNamespace(ORANHWCOMPONENT.QNAME)) {
-                log.info("Create device {} ", ORanNetworkElement.class.getName());
-                return Optional.of(new ORanNetworkElement(acessor, serviceProvider.getDataProvider()));
-            }
-        }
-        return Optional.empty();
-    }
-}
diff --git a/features/devicemanager/o-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/oran/impl/ORanToInternalDataModel.java b/features/devicemanager/o-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/oran/impl/ORanToInternalDataModel.java
deleted file mode 100644 (file)
index 0864b8f..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * ============LICENSE_START========================================================================
- * O-RAN-SC : oam/ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2020 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- * ============LICENSE_END==========================================================================
- */
-package org.oransc.oam.features.devicemanager.oran.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.hardware.rev180313.hardware.Component;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.Inventory;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.InventoryBuilder;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
-
-/**
- * @author herbert
- *
- */
-public class ORanToInternalDataModel {
-
-
-    public Inventory getInternalEquipment(NodeId nodeId, Component component) {
-
-        InventoryBuilder inventoryBuilder = new InventoryBuilder();
-
-        // General
-        inventoryBuilder.setNodeId(nodeId.getValue());
-        inventoryBuilder.setParentUuid(component.getParent());
-        inventoryBuilder.setTreeLevel(new Long(component.getParentRelPos()));
-
-        inventoryBuilder.setUuid(component.getUuid().getValue());
-        // -- String list with ids of holders
-        List<String> containerHolderKeyList = new ArrayList<>();
-        List<String> containerHolderList = component.getContainsChild();
-        if (containerHolderList != null) {
-            for (String containerHolder : containerHolderList) {
-                containerHolderKeyList.add(containerHolder);
-            }
-        }
-        inventoryBuilder.setContainedHolder(containerHolderKeyList);
-        // -- Manufacturer related things
-        inventoryBuilder.setManufacturerName(component.getName());
-
-        // Equipment type
-        inventoryBuilder.setDescription(component.getDescription());
-        inventoryBuilder.setModelIdentifier(component.getModelName());
-        inventoryBuilder.setPartTypeId(component.getXmlClass().getName());
-        inventoryBuilder.setTypeName(component.getName());
-        inventoryBuilder.setVersion(component.getHardwareRev());
-
-        // Equipment instance
-        inventoryBuilder.setDate(component.getMfgDate().getValue());
-        inventoryBuilder.setSerial(component.getSerialNum());
-
-        return inventoryBuilder.build();
-    }
-
-}
diff --git a/features/devicemanager/o-ran/ru-fh/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/features/devicemanager/o-ran/ru-fh/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
deleted file mode 100644 (file)
index d70f328..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ ============LICENSE_START=======================================================
-  ~ ONAP : ccsdk features
-  ~ ================================================================================
-  ~ Copyright (C) 2019 highstreet technologies GmbH Intellectual Property.
-  ~ All rights reserved.
-  ~ ================================================================================
-  ~ Update Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
-  ~ ================================================================================
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~ ============LICENSE_END=======================================================
-  ~
-  -->
-
-<blueprint xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
-           xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" odl:use-default-for-reference-types="true">
-
-    <reference id="netconfNetworkElementService"
-               availability="mandatory" activation="eager"
-               interface="org.onap.ccsdk.features.sdnr.wt.devicemanager.service.NetconfNetworkElementService"/>
-
-    <bean id="provider"
-          class="org.oransc.oam.features.devicemanager.oran.impl.DeviceManagerORanImpl"
-          init-method="init" destroy-method="close">
-        <property name="netconfNetworkElementService" ref="netconfNetworkElementService"/>
-    </bean>
-</blueprint>
diff --git a/features/devicemanager/o-ran/ru-fh/provider/src/main/resources/version.properties b/features/devicemanager/o-ran/ru-fh/provider/src/main/resources/version.properties
deleted file mode 100644 (file)
index 6638c04..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# ============LICENSE_START=======================================================
-# ONAP : ccsdk features
-# ================================================================================
-# Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END=======================================================
-#
-#
-
-# Properties filled in by maven during build process
-version = ${project.version}
-build = ${buildtime}
diff --git a/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/TestDeviceManagerORanImpl.java b/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/TestDeviceManagerORanImpl.java
deleted file mode 100644 (file)
index c9476be..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * ============LICENSE_START========================================================================
- * O-RAN-SC : oam/ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2020 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- * ============LICENSE_END==========================================================================
- */
-package org.oransc.oam.features.devicemanager.oran.test;
-
-import static org.mockito.Mockito.mock;
-import java.io.IOException;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.service.NetconfNetworkElementService;
-import org.oransc.oam.features.devicemanager.oran.impl.DeviceManagerORanImpl;
-
-public class TestDeviceManagerORanImpl {
-    DeviceManagerORanImpl devMgrOran;
-
-    @Before
-    public void init() throws InterruptedException, IOException {}
-
-    @Test
-    public void test() throws Exception {
-        devMgrOran = new DeviceManagerORanImpl();
-        NetconfNetworkElementService netconfNetworkElementService = mock(NetconfNetworkElementService.class);
-
-        try {
-            devMgrOran.setNetconfNetworkElementService(netconfNetworkElementService);
-            devMgrOran.init();
-        } catch (Exception e) {
-            throw e;
-        }
-    }
-
-    @After
-    public void cleanUp() throws Exception {
-        devMgrOran.close();
-    }
-}
diff --git a/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/TestHardwareClass.java b/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/TestHardwareClass.java
deleted file mode 100644 (file)
index 4d259cd..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * ============LICENSE_START========================================================================
- * O-RAN-SC : oam/ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2020 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- * ============LICENSE_END==========================================================================
- */
-package org.oransc.oam.features.devicemanager.oran.test;
-
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana.hardware.rev180313.HardwareClass;
-
-public interface TestHardwareClass extends HardwareClass {
-
-}
diff --git a/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/TestORanChangeNotificationListener.java b/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/TestORanChangeNotificationListener.java
deleted file mode 100644 (file)
index 435d565..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * ============LICENSE_START========================================================================
- * O-RAN-SC : oam/ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2020 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- * ============LICENSE_END==========================================================================
- */
-
-package org.oransc.oam.features.devicemanager.oran.test;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import java.util.Arrays;
-import java.util.List;
-import org.eclipse.jdt.annotation.NonNull;
-import org.junit.Test;
-import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.DataProvider;
-import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfAccessor;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.EditOperationType;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.NetconfConfigChange;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.netconf.config.change.Edit;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.netconf.config.change.EditBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.EventlogBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.EventlogEntity;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.PathArgument;
-import org.oransc.oam.features.devicemanager.oran.impl.ORanChangeNotificationListener;
-
-public class TestORanChangeNotificationListener {
-
-    private static final String NODEID = "node1";
-
-    @Test
-    public void test() {
-
-        NetconfAccessor netconfAccessor = mock(NetconfAccessor.class);
-        DataProvider databaseService = mock(DataProvider.class);
-        ORanChangeNotificationListener notifListener =
-                new ORanChangeNotificationListener(netconfAccessor, databaseService);
-        when(netconfAccessor.getNodeId()).thenReturn(new NodeId(NODEID));
-        Iterable<? extends PathArgument> pathArguments = Arrays.asList(new PathArgument() {
-
-            @Override
-            public int compareTo(PathArgument arg0) {
-                return 0;
-            }
-
-            @Override
-            public Class<? extends DataObject> getType() {
-                return DataObject.class;
-            }
-        });
-        InstanceIdentifier<?> target = InstanceIdentifier.create(pathArguments);
-
-        notifListener.onNetconfConfigChange(createNotification(EditOperationType.Create, target));
-        EventlogEntity event = new EventlogBuilder().setNodeId(NODEID)
-                .setNewValue(String.valueOf(EditOperationType.Create)).setObjectId(target.toString()).build();
-        verify(databaseService).writeEventLog(event);
-
-    }
-
-    /**
-     * @param type
-     * @return
-     */
-    private static NetconfConfigChange createNotification(EditOperationType type, InstanceIdentifier<?> target) {
-        NetconfConfigChange change = mock(NetconfConfigChange.class);
-
-        @SuppressWarnings("null")
-        final @NonNull List<Edit> edits = Arrays.asList(new EditBuilder().setOperation(type).setTarget(target).build());
-        when(change.nonnullEdit()).thenReturn(edits);
-        return change;
-    }
-}
diff --git a/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/TestORanFaultNotificationListener.java b/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/TestORanFaultNotificationListener.java
deleted file mode 100644 (file)
index 61e5d1b..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * ============LICENSE_START========================================================================
- * O-RAN-SC : oam/ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2020 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- * ============LICENSE_END==========================================================================
- */
-package org.oransc.oam.features.devicemanager.oran.test;
-
-import org.junit.Test;
-import org.oransc.oam.features.devicemanager.oran.impl.ORanFaultNotificationListener;
-
-public class TestORanFaultNotificationListener {
-
-    @Test
-    public void test() {
-        ORanFaultNotificationListener faultListener = new ORanFaultNotificationListener();
-        faultListener.onAlarmNotif(null);
-    }
-}
diff --git a/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/TestORanNetworkElement.java b/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/TestORanNetworkElement.java
deleted file mode 100644 (file)
index e969012..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * ============LICENSE_START========================================================================
- * O-RAN-SC : oam/ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2020 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- * ============LICENSE_END==========================================================================
- */
-package org.oransc.oam.features.devicemanager.oran.test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-import java.io.IOException;
-import java.util.Optional;
-import org.junit.After;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.DataProvider;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.ne.service.NetworkElement;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.service.DeviceManagerServiceProvider;
-import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.Capabilities;
-import org.opendaylight.yang.gen.v1.urn.o.ran.hardware._1._0.rev190328.ORANHWCOMPONENT;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
-import org.opendaylight.yangtools.yang.common.QName;
-import org.oransc.oam.features.devicemanager.oran.impl.ORanNetworkElementFactory;
-import org.oransc.oam.features.devicemanager.oran.test.mock.NetconfAccessorMock;
-import org.oransc.oam.features.devicemanager.oran.test.mock.TransactionUtilsMock;
-
-public class TestORanNetworkElement {
-
-    static NetconfAccessorMock accessor;
-    static DeviceManagerServiceProvider serviceProvider;
-    static Capabilities capabilities;
-    QName qCapability;
-
-    @BeforeClass
-    public static void init() throws InterruptedException, IOException {
-        capabilities = mock(Capabilities.class);
-        //accessor = mock(NetconfAccessorMock.class);
-        accessor = spy(new NetconfAccessorMock(null, null, null, null));
-        serviceProvider = mock(DeviceManagerServiceProvider.class);
-
-        NodeId nNodeId = new NodeId("nSky");
-        when(accessor.getCapabilites()).thenReturn(capabilities);
-        when (accessor.getNodeId()).thenReturn(nNodeId);
-        when (accessor.getTransactionUtils()).thenReturn(new TransactionUtilsMock());
-
-        DataProvider dataProvider = mock(DataProvider.class);
-        when(serviceProvider.getDataProvider()).thenReturn(dataProvider);
-    }
-
-    @Test
-    public void test() {
-        Optional<NetworkElement> oRanNe;
-        when(accessor.getCapabilites().isSupportingNamespace(ORANHWCOMPONENT.QNAME)).thenReturn(true);
-        ORanNetworkElementFactory factory = new ORanNetworkElementFactory();
-        oRanNe = factory.create(accessor, serviceProvider);
-        assertTrue(factory.create(accessor, serviceProvider).isPresent());
-        oRanNe.get().register();
-        oRanNe.get().deregister();
-        oRanNe.get().getAcessor();
-        oRanNe.get().getDeviceType();
-        assertEquals(oRanNe.get().getNodeId().getValue(), "nSky");
-    }
-
-    @After
-    public void cleanUp() throws Exception {
-
-    }
-}
diff --git a/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/TestORanNetworkElementFactory.java b/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/TestORanNetworkElementFactory.java
deleted file mode 100644 (file)
index ca61d44..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * ============LICENSE_START========================================================================
- * O-RAN-SC : oam/ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2020 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- * ============LICENSE_END==========================================================================
- */
-package org.oransc.oam.features.devicemanager.oran.test;
-
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-import java.io.IOException;
-import org.junit.After;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.service.DeviceManagerServiceProvider;
-import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.Capabilities;
-import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfAccessor;
-import org.opendaylight.yang.gen.v1.urn.o.ran.hardware._1._0.rev190328.ORANHWCOMPONENT;
-import org.opendaylight.yangtools.yang.common.QName;
-import org.oransc.oam.features.devicemanager.oran.impl.ORanNetworkElementFactory;
-import org.oransc.oam.features.devicemanager.oran.test.mock.NetconfAccessorMock;
-
-public class TestORanNetworkElementFactory {
-
-    static NetconfAccessor accessor;
-    static DeviceManagerServiceProvider serviceProvider;
-    static Capabilities capabilities;
-    QName qCapability;
-
-    @BeforeClass
-    public static void init() throws InterruptedException, IOException {
-        capabilities = mock(Capabilities.class);
-        accessor = mock(NetconfAccessorMock.class);
-        serviceProvider = mock(DeviceManagerServiceProvider.class);
-
-        when(accessor.getCapabilites()).thenReturn(capabilities);
-        when(serviceProvider.getDataProvider()).thenReturn(null);
-
-
-    }
-
-    @Test
-    public void testCreateORANHWComponent() throws Exception {
-        when(accessor.getCapabilites().isSupportingNamespace(ORANHWCOMPONENT.QNAME)).thenReturn(true);
-        ORanNetworkElementFactory factory = new ORanNetworkElementFactory();
-        assertTrue((factory.create(accessor, serviceProvider)).isPresent());
-    }
-
-    @Test
-    public void testCreateNone() throws Exception {
-        when(accessor.getCapabilites().isSupportingNamespace(ORANHWCOMPONENT.QNAME)).thenReturn(false);
-        ORanNetworkElementFactory factory = new ORanNetworkElementFactory();
-        assertTrue(!(factory.create(accessor, serviceProvider).isPresent()));
-    }
-
-    @After
-    public void cleanUp() throws Exception {
-
-    }
-}
-
diff --git a/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/TestORanToInternalDataModel.java b/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/TestORanToInternalDataModel.java
deleted file mode 100644 (file)
index f35bcb4..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * ============LICENSE_START========================================================================
- * O-RAN-SC : oam/ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2020 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- * ============LICENSE_END==========================================================================
- */
-package org.oransc.oam.features.devicemanager.oran.test;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mockito;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana.hardware.rev180313.HardwareClass;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.hardware.rev180313.hardware.Component;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
-import org.oransc.oam.features.devicemanager.oran.impl.ORanToInternalDataModel;
-
-public class TestORanToInternalDataModel {
-
-    NodeId nodeId;
-    Component component;
-
-    @SuppressWarnings("unchecked")
-    @Before
-    public void init() throws InterruptedException, IOException {
-        nodeId = mock(NodeId.class);
-        component = mock(Component.class);
-
-        when(nodeId.getValue()).thenReturn("ORan-1000");
-        when(component.getParent()).thenReturn("Shelf");
-        when(component.getParentRelPos()).thenReturn(0);
-        when(component.getUuid()).thenReturn(new Uuid("0Aabcdef-0abc-0cfD-0abC-0123456789AB"));
-
-        List<String> list = new ArrayList<String>();
-        list.add("Card-01A");
-        list.add("Card-01B");
-
-        when(component.getContainsChild()).thenReturn(list);
-        when(component.getName()).thenReturn("Nokia");
-        when(component.getDescription()).thenReturn("ORAN Network Element NO-456");
-        Class<? extends HardwareClass> hwClass = TestHardwareClass.class;
-        Mockito.<Class<? extends HardwareClass>>when(component.getXmlClass()).thenReturn(hwClass);
-
-        DateAndTime dt = new DateAndTime("2020-02-05T12:30:45.283Z");
-        when(component.getMfgDate()).thenReturn(dt);
-
-    }
-
-    @Test
-    public void test() throws Exception {
-        ORanToInternalDataModel model = new ORanToInternalDataModel();
-        model.getInternalEquipment(nodeId, component);
-        assertEquals(component.getUuid().getValue(), "0Aabcdef-0abc-0cfD-0abC-0123456789AB");
-        assertEquals(component.getMfgDate().getValue(), "2020-02-05T12:30:45.283Z");
-
-    }
-
-    @After
-    public void cleanUp() throws Exception {
-
-    }
-}
diff --git a/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/mock/NetconfAccessorMock.java b/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/mock/NetconfAccessorMock.java
deleted file mode 100644 (file)
index 165ad0f..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * ============LICENSE_START========================================================================
- * O-RAN-SC : oam/ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2020 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- * ============LICENSE_END==========================================================================
- */
-package org.oransc.oam.features.devicemanager.oran.test.mock;
-
-import com.google.common.util.concurrent.ListenableFuture;
-import org.eclipse.jdt.annotation.NonNull;
-import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.Capabilities;
-import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfAccessor;
-import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.TransactionUtils;
-import org.opendaylight.mdsal.binding.api.DataBroker;
-import org.opendaylight.mdsal.binding.api.MountPoint;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.notification._1._0.rev080714.CreateSubscriptionOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNode;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
-import org.opendaylight.yangtools.concepts.ListenerRegistration;
-import org.opendaylight.yangtools.yang.binding.NotificationListener;
-import org.opendaylight.yangtools.yang.common.RpcResult;
-
-/**
- */
-public class NetconfAccessorMock implements NetconfAccessor {
-
-    private final NodeId nNodeId;
-    private final NetconfNode netconfNode;
-    private final MountPoint mountpoint;
-    private final DataBroker netconfNodeDataBroker;
-
-    public NetconfAccessorMock(NodeId nNodeId, NetconfNode netconfNode, MountPoint mountpoint,
-            DataBroker netconfNodeDataBroker) {
-        this.nNodeId = nNodeId;
-        this.netconfNode = netconfNode;
-        this.mountpoint = mountpoint;
-        this.netconfNodeDataBroker = netconfNodeDataBroker;
-    }
-
-    @Override
-    public NodeId getNodeId() {
-        return nNodeId;
-    }
-
-    @Override
-    public NetconfNode getNetconfNode() {
-        return netconfNode;
-    }
-
-    @Override
-    public Capabilities getCapabilites() {
-        return null;
-    }
-
-    @Override
-    public DataBroker getDataBroker() {
-        return netconfNodeDataBroker;
-    }
-
-    @Override
-    public MountPoint getMountpoint() {
-        return mountpoint;
-    }
-
-    @Override
-    public TransactionUtils getTransactionUtils() {
-        return null;
-    }
-
-    @Override
-    public <T extends NotificationListener> ListenerRegistration<NotificationListener> doRegisterNotificationListener(
-            @NonNull T listener) {
-        return null;
-    }
-
-    @Override
-    public ListenableFuture<RpcResult<CreateSubscriptionOutput>> registerNotificationsStream(String streamName) {
-        return null;
-    }
-
-}
diff --git a/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/mock/TransactionUtilsMock.java b/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/mock/TransactionUtilsMock.java
deleted file mode 100644 (file)
index e07fce1..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * ============LICENSE_START========================================================================
- * O-RAN-SC : oam/ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2020 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- * ============LICENSE_END==========================================================================
- */
-package org.oransc.oam.features.devicemanager.oran.test.mock;
-
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
-import org.eclipse.jdt.annotation.Nullable;
-import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.TransactionUtils;
-import org.opendaylight.mdsal.binding.api.DataBroker;
-import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-public class TransactionUtilsMock implements TransactionUtils {
-
-    @Override
-    public <T extends DataObject> @Nullable T readData(DataBroker dataBroker, LogicalDatastoreType dataStoreType,
-            InstanceIdentifier<T> iid) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public <T extends DataObject> @Nullable T readDataOptionalWithStatus(DataBroker dataBroker,
-            LogicalDatastoreType dataStoreType, InstanceIdentifier<T> iid, AtomicBoolean noErrorIndication,
-            AtomicReference<String> statusIndicator) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-}
diff --git a/features/devicemanager/o-ran/ru-fh/provider/src/test/resources/simplelogger.properties b/features/devicemanager/o-ran/ru-fh/provider/src/test/resources/simplelogger.properties
deleted file mode 100644 (file)
index 9af26dc..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# ============LICENSE_START=======================================================
-# ONAP : ccsdk features
-# ================================================================================
-# Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END=======================================================
-#
-#
-
-# SLF4J's SimpleLogger configuration file
-# Simple implementation of Logger that sends all enabled log messages, for all defined loggers, to System.err.
-
-# Default logging detail level for all instances of SimpleLogger.
-# Must be one of ("trace", "debug", "info", "warn", or "error").
-# If not specified, defaults to "info".
-org.slf4j.simpleLogger.defaultLogLevel=info
-
-# Logging detail level for a SimpleLogger instance named "xxx.yyy.zzz".
-# Must be one of ("trace", "debug", "info", "warn", or "error").
-# If not specified, the default logging detail level is used.
-# org.slf4j.simpleLogger.log.xxx.yyy=debug
-org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.devicemanager=info
-org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.devicemanager.test=debug
-org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.database=debug
-org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.devicemanager.archiveservice=info
-org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.Resources=info
-org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.container=info
-
-# Set to true if you want the current date and time to be included in output messages.
-# Default is false, and will output the number of milliseconds elapsed since startup.
-#org.slf4j.simpleLogger.showDateTime=false
-
-# The date and time format to be used in the output messages.
-# The pattern describing the date and time format is the same that is used in java.text.SimpleDateFormat.
-# If the format is not specified or is invalid, the default format is used.
-# The default format is yyyy-MM-dd HH:mm:ss:SSS Z.
-#org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss:SSS Z
-
-# Set to true if you want to output the current thread name.
-# Defaults to true.
-#org.slf4j.simpleLogger.showThreadName=true
-
-# Set to true if you want the Logger instance name to be included in output messages.
-# Defaults to true.
-#org.slf4j.simpleLogger.showLogName=true
-
-# Set to true if you want the last component of the name to be included in output messages.
-# Defaults to false.
-#org.slf4j.simpleLogger.showShortLogName=false
diff --git a/features/devicemanager/x-ran/ru-fh/feature/pom.xml b/features/devicemanager/x-ran/ru-fh/feature/pom.xml
deleted file mode 100644 (file)
index 601012b..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ ============LICENSE_START=======================================================
-  ~ ONAP : ccsdk features
-  ~ ================================================================================
-  ~ Copyright (C) 2018 highstreet technologies GmbH Intellectual Property.
-  ~ All rights reserved.
-  ~ ================================================================================
-  ~ Update Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
-  ~ ================================================================================
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~ ============LICENSE_END=======================================================
-  ~
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.o-ran-sc.oam.features.parent</groupId>
-        <artifactId>single-feature-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.o-ran-sc.oam.features.devicemanager</groupId>
-    <artifactId>devicemanager-xran-ru-fh-feature</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
-
-    <name>o-ran-sc-features :: ${project.artifactId}</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>devicemanager-xran-ru-fh-provider</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-
-  <repositories>
-    <repository>
-      <id>onap-public</id>
-      <url>https://nexus.onap.org/content/groups/public/</url>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-        <updatePolicy>always</updatePolicy>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>onap-staging</id>
-      <url>https://nexus.onap.org/content/groups/staging/</url>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-        <updatePolicy>always</updatePolicy>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>ecomp-release</id>
-      <name>onap-repository-releases</name>
-      <url>https://nexus.onap.org/content/repositories/releases/</url>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>ecomp-snapshot</id>
-      <name>onap-repository-snapshots</name>
-      <url>https://nexus.onap.org/content/repositories/snapshots/</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
-</project>
diff --git a/features/devicemanager/x-ran/ru-fh/installer/pom.xml b/features/devicemanager/x-ran/ru-fh/installer/pom.xml
deleted file mode 100755 (executable)
index d91997e..0000000
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ ============LICENSE_START=======================================================
-  ~ ONAP : ccsdk features
-  ~ ================================================================================
-  ~ Copyright (C) 2018 highstreet technologies GmbH Intellectual Property.
-  ~ All rights reserved.
-  ~ ================================================================================
-  ~ Update Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
-  ~ ================================================================================
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~ ============LICENSE_END=======================================================
-  ~
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-       <groupId>org.o-ran-sc.oam.features.parent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.o-ran-sc.oam.features.devicemanager</groupId>
-    <artifactId>devicemanager-xran-ru-fh-installer</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <name>o-ran-sc-features :: ${project.artifactId}</name>
-
-    <properties>
-        <application.name>devicemanager-xran-ru-fh</application.name>
-        <include.transitive.dependencies>false</include.transitive.dependencies>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>mdsal-artifacts</artifactId>
-                <version>${odl.controller.mdsal.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>${application.name}-feature</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>${application.name}-provider</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>maven-repo-zip</id>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <phase>package</phase>
-                        <configuration>
-                            <attach>true</attach>
-                            <finalName>stage/${application.name}-${project.version}</finalName>
-                            <descriptors>
-                                <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
-                            </descriptors>
-                            <appendAssemblyId>true</appendAssemblyId>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-nested-dependencies</id>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <phase>prepare-package</phase>
-                        <configuration>
-                            <transitive>true</transitive>
-                            <outputDirectory>${project.build.directory}/assembly/system</outputDirectory>
-                            <overWriteReleases>false</overWriteReleases>
-                            <overWriteSnapshots>true</overWriteSnapshots>
-                            <overWriteIfNewer>true</overWriteIfNewer>
-                            <useRepositoryLayout>true</useRepositoryLayout>
-                            <addParentPoms>false</addParentPoms>
-                            <copyPom>false</copyPom>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-  <repositories>
-    <repository>
-      <id>onap-public</id>
-      <url>https://nexus.onap.org/content/groups/public/</url>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-        <updatePolicy>always</updatePolicy>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>onap-staging</id>
-      <url>https://nexus.onap.org/content/groups/staging/</url>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-        <updatePolicy>always</updatePolicy>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>ecomp-release</id>
-      <name>onap-repository-releases</name>
-      <url>https://nexus.onap.org/content/repositories/releases/</url>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>ecomp-snapshot</id>
-      <name>onap-repository-snapshots</name>
-      <url>https://nexus.onap.org/content/repositories/snapshots/</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
-</project>
diff --git a/features/devicemanager/x-ran/ru-fh/installer/src/assembly/assemble_mvnrepo_zip.xml b/features/devicemanager/x-ran/ru-fh/installer/src/assembly/assemble_mvnrepo_zip.xml
deleted file mode 100644 (file)
index dfe5060..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-  ~ ============LICENSE_START=======================================================
-  ~ ONAP : ccsdk features
-  ~ ================================================================================
-  ~ Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
-  ~ ================================================================================
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~ ============LICENSE_END=======================================================
-  ~
-  -->
-
-<!-- Defines how we build the .zip file which is our distribution. -->
-
-<assembly
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-    <id>repo</id>
-    <formats>
-        <format>zip</format>
-    </formats>
-
-    <!--  we want "system" and related files right at the root level
-          as this file is suppose to be unzip on top of a karaf
-          distro. -->
-    <includeBaseDirectory>false</includeBaseDirectory>
-
-    <fileSets>
-        <fileSet>
-            <directory>target/assembly/</directory>
-            <outputDirectory>.</outputDirectory>
-            <excludes>
-            </excludes>
-        </fileSet>
-    </fileSets>
-
-</assembly>
diff --git a/features/devicemanager/x-ran/ru-fh/model/pom.xml b/features/devicemanager/x-ran/ru-fh/model/pom.xml
deleted file mode 100644 (file)
index 68bd7df..0000000
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ ============LICENSE_START=======================================================
-  ~ ONAP : ccsdk features
-  ~ ================================================================================
-  ~ Copyright (C) 2018 highstreet technologies GmbH Intellectual Property.
-  ~ All rights reserved.
-  ~ ================================================================================
-  ~ Update Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
-  ~ ================================================================================
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~ ============LICENSE_END=======================================================
-  ~
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.o-ran-sc.oam.features.parent</groupId>
-        <artifactId>binding-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.o-ran-sc.oam.features.devicemanager</groupId>
-    <artifactId>devicemanager-xran-ru-fh-model</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-
-    <name>o-ran-sc-features :: ${project.artifactId}</name>
-    <licenses>
-        <license>
-            <name>Apache License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
-        </license>
-    </licenses>
-
-    <properties>
-        <maven.javadoc.skip>true</maven.javadoc.skip>
-    </properties>
-
-    <dependencies>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>**/gen/**</exclude>
-                        <exclude>**/generated-sources/**</exclude>
-                        <exclude>**/yang-gen-sal/**</exclude>
-                        <exclude>**/pax/**</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-  <repositories>
-    <repository>
-      <id>onap-public</id>
-      <url>https://nexus.onap.org/content/groups/public/</url>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-        <updatePolicy>always</updatePolicy>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>onap-staging</id>
-      <url>https://nexus.onap.org/content/groups/staging/</url>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-        <updatePolicy>always</updatePolicy>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>ecomp-release</id>
-      <name>onap-repository-releases</name>
-      <url>https://nexus.onap.org/content/repositories/releases/</url>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>ecomp-snapshot</id>
-      <name>onap-repository-snapshots</name>
-      <url>https://nexus.onap.org/content/repositories/snapshots/</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
-</project>
diff --git a/features/devicemanager/x-ran/ru-fh/model/src/main/yang/devicemanager-xran.yang b/features/devicemanager/x-ran/ru-fh/model/src/main/yang/devicemanager-xran.yang
deleted file mode 100644 (file)
index bf1fc79..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-module devicemanager-xran {
-
-  yang-version 1;
-  namespace "urn:opendaylight:params:xml:ns:yang:devicemanager-xran";
-  prefix devicemanager-xran;
-
-  organization
-    "highstreet technologies GmbH";
-  contact
-    "Web:   <https://www.highstreet-technologies.com>";
-
-  description
-    "DeviceManager X RAN Api Module
-
-     Copyright 2020 highstreet technologies GmbH Intellectual Property.
-     All rights reserved.
-
-     Licensed under the Apache License, Version 2.0 (the 'License');
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an 'AS IS' BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.";
-
-  revision 2020-03-09 {
-    description
-      "Initial revision";
-    reference
-      "";
-  }
-}
diff --git a/features/devicemanager/x-ran/ru-fh/pom.xml b/features/devicemanager/x-ran/ru-fh/pom.xml
deleted file mode 100755 (executable)
index 8d73ed6..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ ============LICENSE_START=======================================================
-  ~ ONAP : ccsdk features
-  ~ ================================================================================
-  ~ Copyright (C) 2018 highstreet technologies GmbH Intellectual Property.
-  ~ All rights reserved.
-  ~ ================================================================================
-  ~ Update Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
-  ~ ================================================================================
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~ ============LICENSE_END=======================================================
-  ~
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.o-ran-sc.oam.features.parent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.o-ran-sc.oam.features.devicemanager</groupId>
-    <artifactId>devicemanager-xran-ru-fh-top</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <name>o-ran-sc-features :: ${project.artifactId}</name>
-
-    <properties>
-        <feature-name>devicemanager-xran-ru-fh</feature-name>
-    </properties>
-
-    <modules>
-        <module>model</module>
-        <module>provider</module>
-        <module>feature</module>
-        <module>installer</module>
-    </modules>
-
-    <repositories>
-    <repository>
-      <id>onap-public</id>
-      <url>https://nexus.onap.org/content/groups/public/</url>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-        <updatePolicy>always</updatePolicy>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>onap-staging</id>
-      <url>https://nexus.onap.org/content/groups/staging/</url>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-        <updatePolicy>always</updatePolicy>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>ecomp-release</id>
-      <name>onap-repository-releases</name>
-      <url>https://nexus.onap.org/content/repositories/releases/</url>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>ecomp-snapshot</id>
-      <name>onap-repository-snapshots</name>
-      <url>https://nexus.onap.org/content/repositories/snapshots/</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
-</project>
diff --git a/features/devicemanager/x-ran/ru-fh/provider/copyright b/features/devicemanager/x-ran/ru-fh/provider/copyright
deleted file mode 100644 (file)
index 754b621..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- * ============LICENSE_END==========================================================================
- */
diff --git a/features/devicemanager/x-ran/ru-fh/provider/pom.xml b/features/devicemanager/x-ran/ru-fh/provider/pom.xml
deleted file mode 100644 (file)
index 75cdf81..0000000
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ ============LICENSE_START=======================================================
-  ~ ONAP : ccsdk features
-  ~ ================================================================================
-  ~ Copyright (C) 2020 highstreet technologies GmbH Intellectual Property.
-  ~ All rights reserved.
-  ~ ================================================================================
-  ~ Update Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
-  ~ ================================================================================
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~ ============LICENSE_END=======================================================
-  ~
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.o-ran-sc.oam.features.parent</groupId>
-        <artifactId>binding-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.o-ran-sc.oam.features.devicemanager</groupId>
-    <artifactId>devicemanager-xran-ru-fh-provider</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-
-    <name>o-ran-sc-features :: ${project.artifactId}</name>
-    <licenses>
-        <license>
-            <name>Apache License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
-        </license>
-    </licenses>
-
-    <properties>
-        <checkstyle.skip>true</checkstyle.skip> <!-- POM configuration -->
-        <maven.javadoc.skip>true</maven.javadoc.skip>
-        <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
-        <buildtime>${maven.build.timestamp} UTC</buildtime>
-        <databaseport>49400</databaseport>
-    </properties>
-
-    <dependencies>
-        <!-- begin for testing -->
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- end for testing -->
-        <dependency>
-            <groupId>org.o-ran-sc.scp-oam-modeling.features</groupId>
-            <artifactId>x-ran-ru-fh-model</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-            <artifactId>sdnr-wt-devicemanager-model</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-            <artifactId>sdnr-wt-netconfnode-state-service-model</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>sal-netconf-connector</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-singleton-common-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>**/gen/**</exclude>
-                        <exclude>**/generated-sources/**</exclude>
-                        <exclude>**/yang-gen-sal/**</exclude>
-                        <exclude>**/pax/**</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-  <repositories>
-    <repository>
-      <id>onap-public</id>
-      <url>https://nexus.onap.org/content/groups/public/</url>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-        <updatePolicy>always</updatePolicy>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>onap-staging</id>
-      <url>https://nexus.onap.org/content/groups/staging/</url>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-        <updatePolicy>always</updatePolicy>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>ecomp-release</id>
-      <name>onap-repository-releases</name>
-      <url>https://nexus.onap.org/content/repositories/releases/</url>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>ecomp-snapshot</id>
-      <name>onap-repository-snapshots</name>
-      <url>https://nexus.onap.org/content/repositories/snapshots/</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
-</project>
diff --git a/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/alarms/rev190911/OperatorStateBuilder.java b/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/alarms/rev190911/OperatorStateBuilder.java
deleted file mode 100644 (file)
index 7e8327a..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.alarms.rev190911;
-import java.lang.String;
-import java.lang.UnsupportedOperationException;
-
-/**
- * The purpose of generated class in src/main/java for Union types is to create new instances of unions from a string representation.
- * In some cases it is very difficult to automate it since there can be unions such as (uint32 - uint16), or (string - uint32).
- *
- * The reason behind putting it under src/main/java is:
- * This class is generated in form of a stub and needs to be finished by the user. This class is generated only once to prevent
- * loss of user code.
- *
- */
-public class OperatorStateBuilder {
-    private OperatorStateBuilder() {
-        //Exists only to defeat instantiation.
-    }
-
-    public static OperatorState getDefaultInstance(String defaultValue) {
-        throw new UnsupportedOperationException("Not yet implemented");
-    }
-
-}
diff --git a/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/alarms/rev190911/ResourceBuilder.java b/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/alarms/rev190911/ResourceBuilder.java
deleted file mode 100644 (file)
index 7c4a63d..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.alarms.rev190911;
-import java.lang.String;
-import java.lang.UnsupportedOperationException;
-
-/**
- * The purpose of generated class in src/main/java for Union types is to create new instances of unions from a string representation.
- * In some cases it is very difficult to automate it since there can be unions such as (uint32 - uint16), or (string - uint32).
- *
- * The reason behind putting it under src/main/java is:
- * This class is generated in form of a stub and needs to be finished by the user. This class is generated only once to prevent
- * loss of user code.
- *
- */
-public class ResourceBuilder {
-    private ResourceBuilder() {
-        //Exists only to defeat instantiation.
-    }
-
-    public static Resource getDefaultInstance(String defaultValue) {
-        throw new UnsupportedOperationException("Not yet implemented");
-    }
-
-}
diff --git a/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/alarms/rev190911/ResourceMatchBuilder.java b/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/alarms/rev190911/ResourceMatchBuilder.java
deleted file mode 100644 (file)
index 282a6a2..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.alarms.rev190911;
-import java.lang.String;
-import java.lang.UnsupportedOperationException;
-
-/**
- * The purpose of generated class in src/main/java for Union types is to create new instances of unions from a string representation.
- * In some cases it is very difficult to automate it since there can be unions such as (uint32 - uint16), or (string - uint32).
- *
- * The reason behind putting it under src/main/java is:
- * This class is generated in form of a stub and needs to be finished by the user. This class is generated only once to prevent
- * loss of user code.
- *
- */
-public class ResourceMatchBuilder {
-    private ResourceMatchBuilder() {
-        //Exists only to defeat instantiation.
-    }
-
-    public static ResourceMatch getDefaultInstance(String defaultValue) {
-        throw new UnsupportedOperationException("Not yet implemented");
-    }
-
-}
diff --git a/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/alarms/rev190911/SeverityWithClearBuilder.java b/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/alarms/rev190911/SeverityWithClearBuilder.java
deleted file mode 100644 (file)
index 8139192..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.alarms.rev190911;
-import java.lang.String;
-import java.lang.UnsupportedOperationException;
-
-/**
- * The purpose of generated class in src/main/java for Union types is to create new instances of unions from a string representation.
- * In some cases it is very difficult to automate it since there can be unions such as (uint32 - uint16), or (string - uint32).
- *
- * The reason behind putting it under src/main/java is:
- * This class is generated in form of a stub and needs to be finished by the user. This class is generated only once to prevent
- * loss of user code.
- *
- */
-public class SeverityWithClearBuilder {
-    private SeverityWithClearBuilder() {
-        //Exists only to defeat instantiation.
-    }
-
-    public static SeverityWithClear getDefaultInstance(String defaultValue) {
-        throw new UnsupportedOperationException("Not yet implemented");
-    }
-
-}
diff --git a/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/alarms/rev190911/alarms/ControlMaxAlarmStatusChangesBuilder.java b/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/alarms/rev190911/alarms/ControlMaxAlarmStatusChangesBuilder.java
deleted file mode 100644 (file)
index 9f10ae8..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.alarms.rev190911.alarms;
-import java.lang.String;
-import java.lang.UnsupportedOperationException;
-
-/**
- * The purpose of generated class in src/main/java for Union types is to create new instances of unions from a string representation.
- * In some cases it is very difficult to automate it since there can be unions such as (uint32 - uint16), or (string - uint32).
- *
- * The reason behind putting it under src/main/java is:
- * This class is generated in form of a stub and needs to be finished by the user. This class is generated only once to prevent
- * loss of user code.
- *
- */
-public class ControlMaxAlarmStatusChangesBuilder {
-    private ControlMaxAlarmStatusChangesBuilder() {
-        //Exists only to defeat instantiation.
-    }
-
-    public static Control.MaxAlarmStatusChanges getDefaultInstance(String defaultValue) {
-        throw new UnsupportedOperationException("Not yet implemented");
-    }
-
-}
diff --git a/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/xran/dhcp/_1/_0/rev180720/NetconfClientIdBuilder.java b/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/xran/dhcp/_1/_0/rev180720/NetconfClientIdBuilder.java
deleted file mode 100644 (file)
index 910d92b..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.xran.dhcp._1._0.rev180720;
-import java.lang.String;
-import java.lang.UnsupportedOperationException;
-
-/**
- * The purpose of generated class in src/main/java for Union types is to create new instances of unions from a string representation.
- * In some cases it is very difficult to automate it since there can be unions such as (uint32 - uint16), or (string - uint32).
- *
- * The reason behind putting it under src/main/java is:
- * This class is generated in form of a stub and needs to be finished by the user. This class is generated only once to prevent
- * loss of user code.
- *
- */
-public class NetconfClientIdBuilder {
-    private NetconfClientIdBuilder() {
-        //Exists only to defeat instantiation.
-    }
-
-    public static NetconfClientId getDefaultInstance(String defaultValue) {
-        throw new UnsupportedOperationException("Not yet implemented");
-    }
-
-}
diff --git a/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/xran/impl/DeviceManagerXRanImpl.java b/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/xran/impl/DeviceManagerXRanImpl.java
deleted file mode 100644 (file)
index 5aa89da..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- * ============LICENSE_END==========================================================================
- */
-package org.oransc.oam.features.devicemanager.xran.impl;
-
-import org.onap.ccsdk.features.sdnr.wt.common.database.HtDatabaseClient;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.ne.factory.FactoryRegistration;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.service.NetconfNetworkElementService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class DeviceManagerXRanImpl implements AutoCloseable  {
-
-    private static final Logger LOG = LoggerFactory.getLogger(DeviceManagerXRanImpl.class);
-    private static final String APPLICATION_NAME = "DeviceManagerXRan";
-    @SuppressWarnings("unused")
-    private static final String CONFIGURATIONFILE = "etc/devicemanager-xran.properties";
-
-
-    private NetconfNetworkElementService netconfNetworkElementService;
-
-    private HtDatabaseClient htDatabaseClient;
-    private Boolean devicemanagerInitializationOk = false;
-    private FactoryRegistration<XRanNetworkElementFactory> resXRan;
-
-    // Blueprint begin
-    public DeviceManagerXRanImpl() {
-        LOG.info("Creating provider for {}", APPLICATION_NAME);
-        resXRan = null;
-    }
-
-    public void setNetconfNetworkElementService(NetconfNetworkElementService netconfNetworkElementService) {
-        this.netconfNetworkElementService = netconfNetworkElementService;
-    }
-
-    public void init() throws Exception {
-
-        LOG.info("Session Initiated start {}", APPLICATION_NAME);
-
-        resXRan = netconfNetworkElementService.registerNetworkElementFactory(new XRanNetworkElementFactory());
-
-
-        netconfNetworkElementService.writeToEventLog(APPLICATION_NAME, "startup", "done");
-        this.devicemanagerInitializationOk = true;
-
-        LOG.info("Session Initiated end. Initialization done {}", devicemanagerInitializationOk);
-    }
-    // Blueprint end
-
-    @Override
-    public void close() throws Exception {
-        LOG.info("closing ...");
-        close(htDatabaseClient);
-        close(resXRan);
-        LOG.info("closing done");
-    }
-
-    /**
-     * Used to close all Services, that should support AutoCloseable Pattern
-     *
-     * @param toClose
-     * @throws Exception
-     */
-    private void close(AutoCloseable... toCloseList) {
-        for (AutoCloseable element : toCloseList) {
-            if (element != null) {
-                try {
-                    element.close();
-                } catch (Exception e) {
-                    LOG.warn("Fail during close: ", e);
-                }
-            }
-        }
-    }
-}
diff --git a/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/xran/impl/NullableHelper.java b/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/xran/impl/NullableHelper.java
deleted file mode 100644 (file)
index 0764226..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- * ============LICENSE_END==========================================================================
- ******************************************************************************/
-package org.oransc.oam.features.devicemanager.xran.impl;
-
-import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.jdt.annotation.Nullable;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
-
-public class NullableHelper {
-
-    private static final @NonNull Uuid DEFAULT_Uuid = new Uuid("ad3545a5-1dd0-4293-b2d9-90366357a032");
-
-    public static @NonNull Uuid nnGetUuid(@Nullable Uuid x) {
-         return x == null ? DEFAULT_Uuid : x;
-    }
-
-    public static @NonNull Integer nnGetInteger(@Nullable Integer x) {
-        return x == null ? -1 : x;
-    }
-
-}
diff --git a/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/xran/impl/XRanChangeNotificationListener.java b/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/xran/impl/XRanChangeNotificationListener.java
deleted file mode 100644 (file)
index be0822f..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- * ============LICENSE_END==========================================================================
- */
-package org.oransc.oam.features.devicemanager.xran.impl;
-
-import java.util.List;
-import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.DataProvider;
-import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfAccessor;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.IetfNetconfNotificationsListener;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.NetconfCapabilityChange;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.NetconfConfigChange;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.NetconfConfirmedCommit;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.NetconfSessionEnd;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.NetconfSessionStart;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.netconf.config.change.Edit;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.EventlogBuilder;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.PathArgument;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Listener for change notifications
- */
-public class XRanChangeNotificationListener  implements IetfNetconfNotificationsListener {
-
-    private static final Logger log = LoggerFactory.getLogger(XRanChangeNotificationListener.class);
-
-    private final NetconfAccessor netconfAccessor;
-    private final DataProvider databaseService;
-
-    public XRanChangeNotificationListener(NetconfAccessor netconfAccessor, DataProvider databaseService) {
-        this.netconfAccessor = netconfAccessor;
-        this.databaseService = databaseService;
-    }
-
-    @Override
-    public void onNetconfConfirmedCommit(NetconfConfirmedCommit notification) {
-        log.info("onNetconfConfirmedCommit ", notification);
-    }
-
-    @Override
-    public void onNetconfSessionStart(NetconfSessionStart notification) {
-        log.info("onNetconfSessionStart ", notification);
-    }
-
-    @Override
-    public void onNetconfSessionEnd(NetconfSessionEnd notification) {
-        log.info("onNetconfSessionEnd ", notification);
-    }
-
-    @Override
-    public void onNetconfCapabilityChange(NetconfCapabilityChange notification) {
-        log.info("onNetconfCapabilityChange ", notification);
-    }
-
-    @Override
-    public void onNetconfConfigChange(NetconfConfigChange notification) {
-        log.info("onNetconfConfigChange (1) {}", notification);
-        StringBuffer sb = new StringBuffer();
-        List<Edit> editList = notification.nonnullEdit();
-        for (Edit edit : editList) {
-            if (sb.length() > 0) {
-                sb.append(", ");
-            }
-            sb.append(edit);
-
-            EventlogBuilder eventlogBuilder = new EventlogBuilder();
-
-            InstanceIdentifier<?> target = edit.getTarget();
-            if (target != null) {
-                eventlogBuilder.setObjectId(target.toString());
-                log.info("TARGET: {} {} {}", target.getClass(), target.getTargetType());
-                for (PathArgument pa : target.getPathArguments()) {
-                    log.info("PathArgument {}", pa);
-                }
-            }
-            eventlogBuilder.setNodeId(netconfAccessor.getNodeId().getValue());
-            eventlogBuilder.setNewValue(String.valueOf(edit.getOperation()));
-            databaseService.writeEventLog(eventlogBuilder.build());
-        }
-        log.info("onNetconfConfigChange (2) {}", sb);
-    }
-
-}
diff --git a/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/xran/impl/XRanFaultNotificationListener.java b/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/xran/impl/XRanFaultNotificationListener.java
deleted file mode 100644 (file)
index 5fdb078..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- * ============LICENSE_END==========================================================================
- */
-package org.oransc.oam.features.devicemanager.xran.impl;
-
-import org.opendaylight.yang.gen.v1.urn.xran.fm._1._0.rev180720.AlarmNotif;
-import org.opendaylight.yang.gen.v1.urn.xran.fm._1._0.rev180720.XranFmListener;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class XRanFaultNotificationListener implements XranFmListener {
-
-    private static final Logger log = LoggerFactory.getLogger(XRanFaultNotificationListener.class);
-
-    @Override
-    public void onAlarmNotif(AlarmNotif notification) {
-
-        log.info("onAlarmNotif {}", notification);
-    }
-
-}
diff --git a/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/xran/impl/XRanNetworkElement.java b/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/xran/impl/XRanNetworkElement.java
deleted file mode 100644 (file)
index a956c44..0000000
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- * ============LICENSE_END==========================================================================
- */
-package org.oransc.oam.features.devicemanager.xran.impl;
-
-import java.util.List;
-import java.util.Optional;
-import org.eclipse.jdt.annotation.NonNull;
-import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.DataProvider;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.ne.service.NetworkElement;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.ne.service.NetworkElementService;
-import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfAccessor;
-import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.hardware.rev180313.Hardware;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.hardware.rev180313.hardware.Component;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.NetworkElementDeviceType;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
-import org.opendaylight.yangtools.concepts.ListenerRegistration;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.opendaylight.yangtools.yang.binding.NotificationListener;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- */
-public class XRanNetworkElement implements NetworkElement {
-
-    private static final Logger log = LoggerFactory.getLogger(XRanNetworkElement.class);
-
-    private final NetconfAccessor netconfAccessor;
-
-    private final DataProvider databaseService;
-
-    private final XRanToInternalDataModel xRanMapper;
-
-    private ListenerRegistration<NotificationListener> xRanListenerRegistrationResult;
-    private @NonNull final XRanChangeNotificationListener xRanListener;
-    private ListenerRegistration<NotificationListener> xRanFaultListenerRegistrationResult;
-    private @NonNull final XRanFaultNotificationListener xRanFaultListener;
-
-    XRanNetworkElement(NetconfAccessor netconfAccess, DataProvider databaseService) {
-        log.info("Create {}",XRanNetworkElement.class.getSimpleName());
-        this.netconfAccessor = netconfAccess;
-        this.databaseService = databaseService;
-
-        this.xRanListenerRegistrationResult = null;
-        this.xRanListener = new XRanChangeNotificationListener(netconfAccessor, databaseService);
-
-        this.xRanFaultListenerRegistrationResult = null;
-        this.xRanFaultListener = new XRanFaultNotificationListener();
-
-        this.xRanMapper = new XRanToInternalDataModel();
-
-    }
-
-    public void initialReadFromNetworkElement() {
-        Hardware hardware = readHardware(netconfAccessor);
-        if (hardware != null) {
-            List<Component> componentList = hardware.getComponent();
-            if (componentList != null) {
-                for (Component component : componentList) {
-                    databaseService.writeInventory( xRanMapper.getInternalEquipment(netconfAccessor.getNodeId(), component));
-                }
-            }
-        }
-    }
-
-    @Override
-    public NetworkElementDeviceType getDeviceType() {
-        return NetworkElementDeviceType.RAN;
-    }
-
-    private Hardware readHardware(NetconfAccessor accessData) {
-
-        final Class<Hardware> clazzPac = Hardware.class;
-
-        log.info("DBRead Get equipment for class {} from mountpoint {} for uuid {}", clazzPac.getSimpleName(),
-                accessData.getNodeId().getValue());
-
-        InstanceIdentifier<Hardware> hardwareIID =
-                InstanceIdentifier.builder(clazzPac).build();
-
-        Hardware res = accessData.getTransactionUtils().readData(accessData.getDataBroker(), LogicalDatastoreType.OPERATIONAL,
-                hardwareIID);
-
-        return res;
-    }
-
-    @Override
-    public void register() {
-
-        initialReadFromNetworkElement();
-        // Register call back class for receiving notifications
-        this.xRanListenerRegistrationResult = netconfAccessor.doRegisterNotificationListener(xRanListener);
-        this.xRanFaultListenerRegistrationResult = netconfAccessor.doRegisterNotificationListener(xRanFaultListener);
-        // Register netconf stream
-        netconfAccessor.registerNotificationsStream(NetconfAccessor.DefaultNotificationsStream);
-
-
-    }
-
-    @Override
-    public void deregister() {
-        if (xRanListenerRegistrationResult != null) {
-            this.xRanListenerRegistrationResult.close();
-        }
-        if (xRanFaultListenerRegistrationResult != null) {
-            this.xRanFaultListenerRegistrationResult.close();
-        };
-    }
-
-
-    @Override
-    public NodeId getNodeId() {
-        return netconfAccessor.getNodeId();
-    }
-
-    @Override
-    public <L extends NetworkElementService> Optional<L> getService(Class<L> clazz) {
-        return Optional.empty();
-    }
-
-    @Override
-    public void warmstart() {
-    }
-
-    @Override
-    public Optional<NetconfAccessor> getAcessor() {
-        return Optional.of(netconfAccessor);
-    }
-
-}
diff --git a/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/xran/impl/XRanNetworkElementFactory.java b/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/xran/impl/XRanNetworkElementFactory.java
deleted file mode 100644 (file)
index 139fc16..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- * ============LICENSE_END==========================================================================
- */
-
-package org.oransc.oam.features.devicemanager.xran.impl;
-
-import java.util.Optional;
-import org.eclipse.jdt.annotation.NonNull;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.ne.factory.NetworkElementFactory;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.ne.service.NetworkElement;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.service.DeviceManagerServiceProvider;
-import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfAccessor;
-import org.opendaylight.yang.gen.v1.urn.xran.hardware._1._0.rev180720.XRANRADIO;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class XRanNetworkElementFactory implements NetworkElementFactory {
-
-    private static final Logger log = LoggerFactory.getLogger(XRanNetworkElementFactory.class);
-
-    @Override
-    public Optional<NetworkElement> create(@NonNull NetconfAccessor acessor, @NonNull DeviceManagerServiceProvider serviceProvider) {
-        if (acessor.getCapabilites().isSupportingNamespace(XRANRADIO.QNAME)) {
-            log.info("Create device {} ",XRanNetworkElement.class.getName());
-            return Optional.of(new XRanNetworkElement(acessor, serviceProvider.getDataProvider()));
-        } else {
-            return Optional.empty();
-        }
-    }
-}
diff --git a/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/xran/impl/XRanToInternalDataModel.java b/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/xran/impl/XRanToInternalDataModel.java
deleted file mode 100644 (file)
index ed8ffb3..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- * ============LICENSE_END==========================================================================
- */
-package org.oransc.oam.features.devicemanager.xran.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.eclipse.jdt.annotation.NonNull;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana.hardware.rev180313.HardwareClass;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.hardware.rev180313.hardware.Component;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.Inventory;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.InventoryBuilder;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
-
-public class XRanToInternalDataModel {
-
-
-    public Inventory getInternalEquipment(NodeId nodeId, @NonNull Component component) {
-
-        InventoryBuilder inventoryBuilder = new InventoryBuilder();
-
-        // General
-        inventoryBuilder.setNodeId(nodeId.getValue());
-        inventoryBuilder.setParentUuid(component.getParent());
-        inventoryBuilder.setTreeLevel(
-                Long.valueOf(
-                        NullableHelper.nnGetInteger(
-                                component.getParentRelPos())));
-
-        inventoryBuilder.setUuid(NullableHelper.nnGetUuid(component.getUuid()).getValue());
-        // -- String list with ids of holders
-        List<String> containerHolderKeyList = new ArrayList<>();
-        List<String> containerHolderList = component.getContainsChild();
-        if (containerHolderList != null) {
-            for (String containerHolder : containerHolderList) {
-                containerHolderKeyList.add(containerHolder);
-            }
-        }
-        inventoryBuilder.setContainedHolder(containerHolderKeyList);
-        // -- Manufacturer related things
-        inventoryBuilder.setManufacturerName(component.getName());
-
-        // Equipment type
-        inventoryBuilder.setDescription(component.getDescription());
-        inventoryBuilder.setModelIdentifier(component.getModelName());
-
-        Class<? extends HardwareClass> xmlClass = component.getXmlClass();
-        if (xmlClass != null) {
-          inventoryBuilder.setPartTypeId(xmlClass.getName());
-        }
-        inventoryBuilder.setTypeName(component.getName());
-        inventoryBuilder.setVersion(component.getHardwareRev());
-
-        // Equipment instance
-        DateAndTime mfgDate = component.getMfgDate();
-        if (mfgDate != null) {
-          inventoryBuilder.setDate(mfgDate.getValue());
-        }
-        inventoryBuilder.setSerial(component.getSerialNum());
-
-        return inventoryBuilder.build();
-    }
-
-}
diff --git a/features/devicemanager/x-ran/ru-fh/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/features/devicemanager/x-ran/ru-fh/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
deleted file mode 100644 (file)
index 14d3142..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ ============LICENSE_START=======================================================
-  ~ ONAP : ccsdk features
-  ~ ================================================================================
-  ~ Copyright (C) 2019 highstreet technologies GmbH Intellectual Property.
-  ~ All rights reserved.
-  ~ ================================================================================
-  ~ Update Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
-  ~ ================================================================================
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~ ============LICENSE_END=======================================================
-  ~
-  -->
-
-<blueprint xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
-           xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" odl:use-default-for-reference-types="true">
-
-    <reference id="netconfNetworkElementService"
-               availability="mandatory" activation="eager"
-               interface="org.onap.ccsdk.features.sdnr.wt.devicemanager.service.NetconfNetworkElementService"/>
-
-    <bean id="provider"
-          class="org.oransc.oam.features.devicemanager.xran.impl.DeviceManagerXRanImpl"
-          init-method="init" destroy-method="close">
-        <property name="netconfNetworkElementService" ref="netconfNetworkElementService"/>
-    </bean>
-</blueprint>
diff --git a/features/devicemanager/x-ran/ru-fh/provider/src/main/resources/version.properties b/features/devicemanager/x-ran/ru-fh/provider/src/main/resources/version.properties
deleted file mode 100644 (file)
index 6638c04..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# ============LICENSE_START=======================================================
-# ONAP : ccsdk features
-# ================================================================================
-# Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END=======================================================
-#
-#
-
-# Properties filled in by maven during build process
-version = ${project.version}
-build = ${buildtime}
diff --git a/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/TestDeviceManagerXRanImpl.java b/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/TestDeviceManagerXRanImpl.java
deleted file mode 100644 (file)
index cba3904..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-package org.oransc.oam.features.devicemanager.xran.test;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.oransc.oam.features.devicemanager.xran.impl.DeviceManagerXRanImpl;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class TestDeviceManagerXRanImpl {
-    private static Path KARAF_ETC = Paths.get("etc");
-    private static final Logger LOG = LoggerFactory.getLogger(TestDeviceManagerXRanImpl.class);
-    DeviceManagerXRanImpl devMgrXran;
-
-    @Before
-    public void init() throws InterruptedException, IOException {
-        /*System.out.println("Logger: " + LOG.getClass().getName() + " " + LOG.getName());
-        Path etc = KARAF_ETC;
-        delete(etc);
-
-        System.out.println("Create empty:" + etc.toString());
-        Files.createDirectories(etc);*/
-    }
-
-    @Test
-    public void test() throws Exception {
-        devMgrXran = new DeviceManagerXRanImpl();
-        /*DeviceManagerImpl devMgr = new DeviceManagerImpl();
-
-        try {
-            devMgr.init();
-            devMgrOran.setNetconfNetworkElementService(devMgr);
-            devMgrOran.init();
-        } catch (Exception e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }*/
-        /*
-         * devMgrOran.setNetconfNetworkElementService(null); devMgrOran.init();
-         * NetconfNetworkElementService netConfNetworkElementService =
-         * mock(NetconfNetworkElementService.class); devMgrOran =
-         * mock(DeviceManagerORanImpl.class);
-         * when(netConfNetworkElementService.registerNetworkElementFactory(new
-         * ORanNetworkElementFactory())).thenReturn(null);
-         */
-
-
-    }
-
-    @After
-    public void cleanUp() throws Exception {
-            devMgrXran.close();
-    }
-
-    private static void delete(Path etc) throws IOException {
-        if (Files.exists(etc)) {
-            System.out.println("Found, removing:" + etc.toString());
-            delete(etc.toFile());
-        }
-    }
-
-    private static void delete(File f) throws IOException {
-        if (f.isDirectory()) {
-            for (File c : f.listFiles()) {
-                delete(c);
-            }
-        }
-        if (!f.delete()) {
-            throw new FileNotFoundException("Failed to delete file: " + f);
-        }
-    }
-}
diff --git a/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/TestHardwareClass.java b/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/TestHardwareClass.java
deleted file mode 100644 (file)
index 34317f6..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.oransc.oam.features.devicemanager.xran.test;
-
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana.hardware.rev180313.HardwareClass;
-
-public interface TestHardwareClass extends HardwareClass {
-
-}
diff --git a/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/TestXORanNetworkElementFactory.java b/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/TestXORanNetworkElementFactory.java
deleted file mode 100644 (file)
index 600dc5f..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2020 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- * ============LICENSE_END==========================================================================
- */
-package org.oransc.oam.features.devicemanager.xran.test;
-
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.io.IOException;
-import org.junit.After;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.service.DeviceManagerServiceProvider;
-import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.Capabilities;
-import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfAccessor;
-import org.opendaylight.yang.gen.v1.urn.xran.hardware._1._0.rev180720.XRANRADIO;
-import org.opendaylight.yangtools.yang.common.QName;
-import org.oransc.oam.features.devicemanager.xran.impl.XRanNetworkElementFactory;
-import org.oransc.oam.features.devicemanager.xran.test.mock.NetconfAccessorMock;
-
-public class TestXORanNetworkElementFactory {
-
-    static NetconfAccessor accessor;
-    static DeviceManagerServiceProvider serviceProvider;
-    static Capabilities capabilities;
-    QName qCapability;
-
-    @BeforeClass
-    public static void init() throws InterruptedException, IOException {
-        capabilities = mock(Capabilities.class);
-        accessor = mock(NetconfAccessorMock.class);
-        serviceProvider = mock(DeviceManagerServiceProvider.class);
-
-        when(accessor.getCapabilites()).thenReturn(capabilities);
-        when(serviceProvider.getDataProvider()).thenReturn(null);
-    }
-
-    @Test
-    public void testCreateORANHWComponent() throws Exception {
-        when(accessor.getCapabilites().isSupportingNamespace(XRANRADIO.QNAME)).thenReturn(true);
-        XRanNetworkElementFactory factory = new XRanNetworkElementFactory();
-        assertTrue(factory.create(accessor, serviceProvider).isPresent());
-    }
-
-    @Test
-    public void testCreateNone() throws Exception {
-        when(accessor.getCapabilites().isSupportingNamespace(XRANRADIO.QNAME)).thenReturn(false);
-        XRanNetworkElementFactory factory = new XRanNetworkElementFactory();
-        assertTrue(!factory.create(accessor, serviceProvider).isPresent());
-    }
-
-    @After
-    public void cleanUp() throws Exception {
-
-    }
-}
-
diff --git a/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/TestXRanChangeNotificationListener.java b/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/TestXRanChangeNotificationListener.java
deleted file mode 100644 (file)
index c12ab9d..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2020 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- * ============LICENSE_END==========================================================================
- */
-
-package org.oransc.oam.features.devicemanager.xran.test;
-
-import static org.mockito.Mockito.*;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.jdt.annotation.NonNull;
-import org.junit.Test;
-import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.DataProvider;
-import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfAccessor;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.EditOperationType;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.NetconfConfigChange;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.netconf.config.change.Edit;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.netconf.config.change.EditBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.EventlogBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.EventlogEntity;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.PathArgument;
-import org.oransc.oam.features.devicemanager.xran.impl.XRanChangeNotificationListener;
-
-public class TestXRanChangeNotificationListener {
-
-       private static final String NODEID = "node1";
-
-       @Test
-       public void test() {
-
-               NetconfAccessor netconfAccessor = mock(NetconfAccessor.class);
-               DataProvider databaseService = mock(DataProvider.class);
-               XRanChangeNotificationListener notifListener = new XRanChangeNotificationListener(netconfAccessor,
-                               databaseService);
-               when(netconfAccessor.getNodeId()).thenReturn(new NodeId(NODEID));
-               Iterable<? extends PathArgument> pathArguments = Arrays.asList(new PathArgument() {
-
-                       @Override
-                       public int compareTo(PathArgument arg0) {
-                               return 0;
-                       }
-
-                       @Override
-                       public Class<? extends DataObject> getType() {
-                               return DataObject.class;
-                       }
-               });
-               InstanceIdentifier<?> target = InstanceIdentifier.create(pathArguments);
-
-               notifListener.onNetconfConfigChange(createNotification(EditOperationType.Create,target));
-               EventlogEntity event = new EventlogBuilder().setNodeId(NODEID)
-                               .setNewValue(String.valueOf(EditOperationType.Create)).setObjectId(target.toString()).build();
-               verify(databaseService).writeEventLog(event);
-
-       }
-
-       /**
-        * @param type 
-        * @return
-        */
-       private static NetconfConfigChange createNotification(EditOperationType type,InstanceIdentifier<?> target) {
-               NetconfConfigChange change = mock(NetconfConfigChange.class);
-               
-               @SuppressWarnings("null")
-               final @NonNull List<Edit> edits = Arrays.asList(new EditBuilder().setOperation(type).setTarget(target).build());
-               when(change.nonnullEdit()).thenReturn(edits);
-               return change;
-       }
-}
diff --git a/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/TestXRanFaultNotificationListener.java b/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/TestXRanFaultNotificationListener.java
deleted file mode 100644 (file)
index f246ccf..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2020 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- * ============LICENSE_END==========================================================================
- */
-package org.oransc.oam.features.devicemanager.xran.test;
-
-import org.junit.Test;
-import org.oransc.oam.features.devicemanager.xran.impl.XRanFaultNotificationListener;
-
-public class TestXRanFaultNotificationListener {
-
-       @Test
-       public void test() {
-               XRanFaultNotificationListener faultListener = new XRanFaultNotificationListener();
-               faultListener.onAlarmNotif(null);
-       }
-}
diff --git a/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/TestXRanNetworkElement.java b/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/TestXRanNetworkElement.java
deleted file mode 100644 (file)
index 91ff30e..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2020 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- * ============LICENSE_END==========================================================================
- */
-package org.oransc.oam.features.devicemanager.xran.test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-import static org.mockito.Mockito.*;
-
-import java.util.Optional;
-import java.io.IOException;
-import org.junit.After;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.DataProvider;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.ne.service.NetworkElement;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
-import org.opendaylight.yang.gen.v1.urn.xran.hardware._1._0.rev180720.XRANRADIO;
-import org.opendaylight.yangtools.yang.common.QName;
-import org.oransc.oam.features.devicemanager.xran.impl.XRanNetworkElementFactory;
-import org.oransc.oam.features.devicemanager.xran.test.mock.NetconfAccessorMock;
-import org.oransc.oam.features.devicemanager.xran.test.mock.TransactionUtilsMock;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.service.DeviceManagerServiceProvider;
-import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.Capabilities;
-
-public class TestXRanNetworkElement {
-
-    static NetconfAccessorMock accessor;
-    static DeviceManagerServiceProvider serviceProvider;
-    static Capabilities capabilities;
-    QName qCapability;
-
-    @BeforeClass
-    public static void init() throws InterruptedException, IOException {
-        capabilities = mock(Capabilities.class);
-        //accessor = mock(NetconfAccessorMock.class);
-        accessor = spy(new NetconfAccessorMock(null, null, null, null));
-        serviceProvider = mock(DeviceManagerServiceProvider.class);
-
-        NodeId nNodeId = new NodeId("nSky");
-        when(accessor.getCapabilites()).thenReturn(capabilities);
-        when (accessor.getNodeId()).thenReturn(nNodeId);
-        when (accessor.getTransactionUtils()).thenReturn(new TransactionUtilsMock());
-
-        DataProvider dataProvider = mock(DataProvider.class);
-        when(serviceProvider.getDataProvider()).thenReturn(dataProvider);
-    }
-
-    @Test
-    public void test() {
-        Optional<NetworkElement> oRanNe;
-        when(accessor.getCapabilites().isSupportingNamespace(XRANRADIO.QNAME)).thenReturn(true);
-        XRanNetworkElementFactory factory = new XRanNetworkElementFactory();
-        oRanNe = factory.create(accessor, serviceProvider);
-        assertTrue(factory.create(accessor, serviceProvider).isPresent());
-        oRanNe.get().register();
-        oRanNe.get().deregister();
-        oRanNe.get().getAcessor();
-        oRanNe.get().getDeviceType();
-        assertEquals(oRanNe.get().getNodeId().getValue(), "nSky");
-    }
-
-    @After
-    public void cleanUp() throws Exception {
-
-    }
-}
diff --git a/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/TestXRanToInternalDataModel.java b/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/TestXRanToInternalDataModel.java
deleted file mode 100644 (file)
index 153870f..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2020 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- * ============LICENSE_END==========================================================================
- */
-package org.oransc.oam.features.devicemanager.xran.test;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.util.List;
-import java.io.IOException;
-import java.util.ArrayList;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mockito;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana.hardware.rev180313.HardwareClass;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.hardware.rev180313.hardware.Component;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
-import org.oransc.oam.features.devicemanager.xran.impl.XRanToInternalDataModel;
-import org.oransc.oam.features.devicemanager.xran.test.TestHardwareClass;
-
-public class TestXRanToInternalDataModel {
-
-    NodeId nodeId;
-    Component component;
-
-    @Before
-    public void init() throws InterruptedException, IOException {
-        nodeId = mock(NodeId.class);
-        component = mock(Component.class);
-
-        when(nodeId.getValue()).thenReturn("ORan-1000");
-        when(component.getParent()).thenReturn("Shelf");
-        when(component.getParentRelPos()).thenReturn(0);
-        when(component.getUuid()).thenReturn(new Uuid("0Aabcdef-0abc-0cfD-0abC-0123456789AB"));
-
-        List<String> list = new ArrayList<>();
-        list.add("Card-01A");
-        list.add("Card-01B");
-
-        when (component.getContainsChild()).thenReturn(list);
-        when (component.getName()).thenReturn("Nokia");
-        when (component.getDescription()).thenReturn("ORAN Network Element NO-456");
-        Class<? extends HardwareClass> hwClass = TestHardwareClass.class;
-        Mockito.<Class<? extends HardwareClass>>when(component.getXmlClass()).thenReturn(hwClass);
-
-        DateAndTime dt = new DateAndTime("2020-02-05T12:30:45.283Z");
-        when (component.getMfgDate()).thenReturn(dt);
-
-    }
-
-    @Test
-    public void test() throws Exception {
-        XRanToInternalDataModel model = new XRanToInternalDataModel();
-        model.getInternalEquipment(nodeId, component);
-        assertEquals(component.getUuid().getValue(), "0Aabcdef-0abc-0cfD-0abC-0123456789AB");
-        assertEquals(component.getMfgDate().getValue(), "2020-02-05T12:30:45.283Z");
-
-    }
-
-    @After
-    public void cleanUp() throws Exception {
-
-    }
-}
diff --git a/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/mock/NetconfAccessorMock.java b/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/mock/NetconfAccessorMock.java
deleted file mode 100644 (file)
index 0c50454..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2020 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- * ============LICENSE_END==========================================================================
- */
-package org.oransc.oam.features.devicemanager.xran.test.mock;
-
-import com.google.common.util.concurrent.ListenableFuture;
-import org.eclipse.jdt.annotation.NonNull;
-import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.Capabilities;
-import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfAccessor;
-import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.TransactionUtils;
-import org.opendaylight.mdsal.binding.api.DataBroker;
-import org.opendaylight.mdsal.binding.api.MountPoint;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.notification._1._0.rev080714.CreateSubscriptionOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNode;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
-import org.opendaylight.yangtools.concepts.ListenerRegistration;
-import org.opendaylight.yangtools.yang.binding.NotificationListener;
-import org.opendaylight.yangtools.yang.common.RpcResult;
-
-/**
- */
-public class NetconfAccessorMock implements NetconfAccessor {
-
-    private final NodeId nNodeId;
-    private final NetconfNode netconfNode;
-    private final MountPoint mountpoint;
-    private final DataBroker netconfNodeDataBroker;
-
-    public NetconfAccessorMock(NodeId nNodeId, NetconfNode netconfNode, MountPoint mountpoint,
-            DataBroker netconfNodeDataBroker) {
-        this.nNodeId = nNodeId;
-        this.netconfNode = netconfNode;
-        this.mountpoint = mountpoint;
-        this.netconfNodeDataBroker = netconfNodeDataBroker;
-    }
-
-    @Override
-    public NodeId getNodeId() {
-        return nNodeId;
-    }
-
-    @Override
-    public NetconfNode getNetconfNode() {
-        return netconfNode;
-    }
-
-    @Override
-    public Capabilities getCapabilites() {
-        return null;
-    }
-
-    @Override
-    public DataBroker getDataBroker() {
-        return netconfNodeDataBroker;
-    }
-
-    @Override
-    public MountPoint getMountpoint() {
-        return mountpoint;
-    }
-
-    @Override
-    public TransactionUtils getTransactionUtils() {
-        return null;
-    }
-
-    @Override
-    public <T extends NotificationListener> ListenerRegistration<NotificationListener> doRegisterNotificationListener(
-            @NonNull T listener) {
-        return null;
-    }
-
-    @Override
-    public ListenableFuture<RpcResult<CreateSubscriptionOutput>> registerNotificationsStream(String streamName) {
-        return null;
-    }
-
-}
diff --git a/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/mock/TransactionUtilsMock.java b/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/mock/TransactionUtilsMock.java
deleted file mode 100644 (file)
index a8ff855..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2020 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- * ============LICENSE_END==========================================================================
- */
-package org.oransc.oam.features.devicemanager.xran.test.mock;
-
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
-
-import org.eclipse.jdt.annotation.Nullable;
-import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.TransactionUtils;
-import org.opendaylight.mdsal.binding.api.DataBroker;
-import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-public class TransactionUtilsMock implements TransactionUtils {
-
-       @Override
-       public <T extends DataObject> @Nullable T readData(DataBroker dataBroker, LogicalDatastoreType dataStoreType,
-                       InstanceIdentifier<T> iid) {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       @Override
-       public <T extends DataObject> @Nullable T readDataOptionalWithStatus(DataBroker dataBroker,
-                       LogicalDatastoreType dataStoreType, InstanceIdentifier<T> iid, AtomicBoolean noErrorIndication,
-                       AtomicReference<String> statusIndicator) {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-}
diff --git a/features/devicemanager/x-ran/ru-fh/provider/src/test/resources/simplelogger.properties b/features/devicemanager/x-ran/ru-fh/provider/src/test/resources/simplelogger.properties
deleted file mode 100644 (file)
index 9af26dc..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# ============LICENSE_START=======================================================
-# ONAP : ccsdk features
-# ================================================================================
-# Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END=======================================================
-#
-#
-
-# SLF4J's SimpleLogger configuration file
-# Simple implementation of Logger that sends all enabled log messages, for all defined loggers, to System.err.
-
-# Default logging detail level for all instances of SimpleLogger.
-# Must be one of ("trace", "debug", "info", "warn", or "error").
-# If not specified, defaults to "info".
-org.slf4j.simpleLogger.defaultLogLevel=info
-
-# Logging detail level for a SimpleLogger instance named "xxx.yyy.zzz".
-# Must be one of ("trace", "debug", "info", "warn", or "error").
-# If not specified, the default logging detail level is used.
-# org.slf4j.simpleLogger.log.xxx.yyy=debug
-org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.devicemanager=info
-org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.devicemanager.test=debug
-org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.database=debug
-org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.devicemanager.archiveservice=info
-org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.devicemanager.base.internalTypes.Resources=info
-org.slf4j.simpleLogger.log.org.onap.ccsdk.features.sdnr.wt.devicemanager.base.netconf.container=info
-
-# Set to true if you want the current date and time to be included in output messages.
-# Default is false, and will output the number of milliseconds elapsed since startup.
-#org.slf4j.simpleLogger.showDateTime=false
-
-# The date and time format to be used in the output messages.
-# The pattern describing the date and time format is the same that is used in java.text.SimpleDateFormat.
-# If the format is not specified or is invalid, the default format is used.
-# The default format is yyyy-MM-dd HH:mm:ss:SSS Z.
-#org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss:SSS Z
-
-# Set to true if you want to output the current thread name.
-# Defaults to true.
-#org.slf4j.simpleLogger.showThreadName=true
-
-# Set to true if you want the Logger instance name to be included in output messages.
-# Defaults to true.
-#org.slf4j.simpleLogger.showLogName=true
-
-# Set to true if you want the last component of the name to be included in output messages.
-# Defaults to false.
-#org.slf4j.simpleLogger.showShortLogName=false
diff --git a/features/pom.xml b/features/pom.xml
deleted file mode 100644 (file)
index 7c39bb5..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-################################################################################
-# Copyright 2020 highstreet technologies and others
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.o-ran-sc.oam.features</groupId>
-  <artifactId>features-top</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
-
-  <name>o-ran-sc features top</name>
-
-  <modules>
-    <module>devicemanager/o-ran/ru-fh</module>
-    <module>devicemanager/x-ran/ru-fh</module>
-    <module>devicemanager/g-ran/ru-fh</module>
-  </modules>
-
-</project>
diff --git a/parent/.gitignore b/parent/.gitignore
deleted file mode 100644 (file)
index 94227c1..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-target/
-target-ide/
-yang-gen-sal/
-.checkstyle
-.classpath
-.project
-.settings
-.factorypath
-.metadata
-*.swp
-dist/
-*/**/bin/
-etc/
-node_modules/
-.fbExcludeFilterFile
-*.md.html
diff --git a/parent/README.md b/parent/README.md
deleted file mode 100644 (file)
index 9de4c95..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-# parent
-
-This directory contains parent pom files to use ONAP sdnc and ccsdk framework for Opendaylight mdsal and netconf.
-
-Supported parents are:
-  - binding-parent
-  - odlparent-light
-  - single-feature-parent
-
-In ONAP project most OpenDaylight clients are supported. This is a subset.
diff --git a/parent/binding-parent/pom.xml b/parent/binding-parent/pom.xml
deleted file mode 100644 (file)
index 7c402bf..0000000
+++ /dev/null
@@ -1,1180 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-################################################################################
-# Copyright 2019 highstreet technologies and others
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>binding-parent</artifactId>
-        <version>4.0.14</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.o-ran-sc.oam.features.parent</groupId>
-    <artifactId>binding-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <name>o-ran-sc features binding-parent</name>
-    <description>Root POM to be used in place of odlparent for CCSDK based projects</description>
-    <url>http://wiki.o-ran-sc.org</url>
-    <organization>
-        <name>O-RAN-SC</name>
-    </organization>
-
-    <issueManagement>
-        <system>JIRA</system>
-        <url>https://jira.o-ran-sc.org/</url>
-    </issueManagement>
-    <distributionManagement>
-        <repository>
-            <id>ecomp-releases</id>
-            <url>${onap.nexus.release-url}</url>
-        </repository>
-        <snapshotRepository>
-            <id>ecomp-snapshots</id>
-            <url>${onap.nexus.snapshot-url}</url>
-        </snapshotRepository>
-    </distributionManagement>
-
-    <properties>
-        <!-- Sonar properties -->
-        <sonar.scanner.version>3.7.0.1746</sonar.scanner.version>
-        <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
-        <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-        <!-- Default Sonar configuration -->
-        <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml,${project.reporting.outputDirectory}/jacoco-it/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
-        <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
-        <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
-
-        <!-- Jacoco properties -->
-        <jacoco.version>0.8.5</jacoco.version>
-
-        <!-- properties from oparent -->
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
-        <!-- sitePath may be overridden in the inheriting POM if desired -->
-        <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>
-
-        <!-- If following file exist, auto-generation of swagger.json will be done -->
-        <swagger-properties>${basedir}/src/main/resources/swagger.properties</swagger-properties>
-        <!-- If following file exist, auto-generation of sdk will be done -->
-        <swagger-json>${basedir}/src/main/resources/swagger.json</swagger-json>
-        <!-- end of properties from oparent -->
-
-        <!-- ONAP repositories -->
-        <onap.nexus.host>nexus.onap.org</onap.nexus.host>
-        <onap.nexus.port>443</onap.nexus.port>
-        <onap.nexus.protocol>https</onap.nexus.protocol>
-        <onap.nexus.public-url>https://nexus.onap.org/content/groups/public</onap.nexus.public-url>
-        <onap.nexus.staging-url>https://nexus.onap.org/content/groups/staging</onap.nexus.staging-url>
-        <onap.nexus.release-url>https://nexus.onap.org/content/repositories/releases</onap.nexus.release-url>
-        <onap.nexus.snapshot-url>https://nexus.onap.org/content/repositories/snapshots</onap.nexus.snapshot-url>
-        <onap.nexus.staging.server-id>ecomp-staging</onap.nexus.staging.server-id>
-        <onap.nexus.staging.profile-id>176c31dfe190a</onap.nexus.staging.profile-id>
-
-        <!-- OpenDaylight repositories -->
-        <opendaylight.nexus.public-url>https://nexus.opendaylight.org/content/repositories/public/</opendaylight.nexus.public-url>
-        <opendaylight.nexus.snapshot-url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</opendaylight.nexus.snapshot-url>
-
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version.source>8</java.version.source>
-        <java.version.target>8</java.version.target>
-        <bundle.plugin.version>2.5.0</bundle.plugin.version>
-        <maven.compile.plugin.version>2.5.1</maven.compile.plugin.version>
-        <features.file>features.xml</features.file>
-        <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
-        <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
-        <checkstyle.skip>true</checkstyle.skip>
-
-        <!-- logging-analytics versions -->
-        <logging-analytics.version>1.6.6</logging-analytics.version>
-
-        <!-- CCSDK component versions -->
-        <ccsdk.cds.version>1.0.0-SNAPSHOT</ccsdk.cds.version>
-        <ccsdk.features.version>1.0.0-SNAPSHOT</ccsdk.features.version>
-        <ccsdk.sli.core.version>1.0.0-SNAPSHOT</ccsdk.sli.core.version>
-        <ccsdk.sli.adaptors.version>1.0.0-SNAPSHOT</ccsdk.sli.adaptors.version>
-        <ccsdk.sli.northbound.version>1.0.0-SNAPSHOT</ccsdk.sli.northbound.version>
-        <ccsdk.sli.plugins.version>1.0.0-SNAPSHOT</ccsdk.sli.plugins.version>
-        <ccsdk.distribution.version>1.0.0-SNAPSHOT</ccsdk.distribution.version>
-        <sdnctl.sli.version>${ccsdk.sli.core.version}</sdnctl.sli.version>
-        <sdnctl.aai.service.version>${ccsdk.sli.adaptors.version}</sdnctl.aai.service.version>
-        <sdnctl.dblib.version>${ccsdk.sli.core.version}</sdnctl.dblib.version>
-        <sdnctl.mdsal.resource.version>${ccsdk.sli.adaptors.version}</sdnctl.mdsal.resource.version>
-        <sdnctl.slipluginutils.version>${ccsdk.sli.core.version}</sdnctl.slipluginutils.version>
-
-        <!-- Support libraries used by OpenDaylight -->
-        <odl.controller.mdsal.version>1.10.3</odl.controller.mdsal.version>
-        <odl.mdsal.version>4.0.14</odl.mdsal.version>
-        <odl.mdsal.model.version>2.0.14</odl.mdsal.model.version>
-        <odl.netconf.restconf.version>1.10.3</odl.netconf.restconf.version>
-        <odl.netconf.netconf.version>1.7.3</odl.netconf.netconf.version>
-        <odl.netconf.sal.rest.docgen.version>1.10.3</odl.netconf.sal.rest.docgen.version>
-
-        <!-- Used by aaa, vtn -->
-        <commons.codec.version>1.13</commons.codec.version>
-        <!-- Used by netconf, ovsdb -->
-        <commons.lang3.version>3.8.1</commons.lang3.version>
-        <!-- Used by sfc, snmp4sdn; see also affinity, toolkit -->
-        <commons.lang.version>2.6</commons.lang.version>
-        <!-- Used by neutron; see also controller, vtn -->
-        <commons.net.version>3.6</commons.net.version>
-        <!-- Used by neutron -->
-        <eclipse.persistence.version>2.7.4</eclipse.persistence.version>
-        <!-- Used by aaa -->
-        <felix.dependencymanager.version>4.4.1</felix.dependencymanager.version>
-        <!-- Used by lacp, netconf, ovsdb, sfc, toolkit; see also vtn -->
-        <gson.version>2.8.5</gson.version>
-        <!-- Used by aaa, dlux, persistence, snmp4sdn, sxp -->
-        <guava.version>25.1-jre</guava.version>
-        <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all,
-            integration/distribution, snmp4sdn, toolkit, ttp -->
-        <jackson.version>2.9.10</jackson.version>
-        <!-- Used by snmp4sdn, yangtools -->
-        <javassist.version>3.24.1-GA</javassist.version>
-
-        <!-- FIXME remove all dependencies for jersey 1.17 after migration all projects -->
-        <!-- Used by aaa, alto, netconf, neutron, sfc; see also affinity, defense4all, snmp4sdn, toolkit -->
-        <jersey.version>2.25.1</jersey.version>
-        <!-- Used by sfc -->
-        <jersey.client.version>2.25.1</jersey.client.version>
-
-        <!-- New packages for jersey migration 1.17 to 2.8 -->
-        <!-- appache.geronimo.bundle for DocGen -->
-        <!-- Used by aaa, iotdm, netconf, ovsdb, sfc -->
-        <org.json.version>20131018</org.json.version>
-
-        <!-- Used everywhere -->
-        <junit.version>4.12</junit.version>
-        <!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
-        <logback.version>1.2.3</logback.version>
-        <!-- Used by nic, sfc, sxp, tsdr -->
-        <mockito.version>1.10.19</mockito.version>
-        <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
-        <netty.version>4.1.42.Final</netty.version>
-        <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
-        <slf4j.version>1.7.25</slf4j.version>
-        <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp -->
-        <spring.version>4.3.25.RELEASE</spring.version>
-
-        <!-- Extra support libraries used by SDN-C -->
-        <jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version>
-        <antlr.version>4.7.2</antlr.version>
-
-        <eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
-
-        <!-- Managed dependency versions -->
-        <apache.httpcomponents.core.version>4.4.12</apache.httpcomponents.core.version>
-        <apache.httpcomponents.client.version>4.5.10</apache.httpcomponents.client.version>
-        <derby.version>10.14.2.0</derby.version>
-        <eelf.version>1.0.0</eelf.version>
-        <grpc.version>1.21.1</grpc.version>
-        <mariadb.connector.version>2.4.4</mariadb.connector.version>
-        <mariadb4j.version>2.4.0</mariadb4j.version>
-        <testng.version>6.14.3</testng.version>
-        <tomcat-jdbc.version>9.0.30</tomcat-jdbc.version>
-        <jetty.version>9.4.12.v20180830</jetty.version>
-        <skip.karaf.featureTest>true</skip.karaf.featureTest>
-        <dependency-list.file>direct-dependencies.txt</dependency-list.file>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <!-- Note: If value in BOM conflicts with value inherited from
-            parent pom, inherited value takes precedence.  This seems more like
-            a bug than a feature, but this is how maven 3.6 works -->
-            <dependency>
-                <groupId>org.o-ran-sc.oam.features.parent</groupId>
-                <artifactId>dependencies-odl-bom</artifactId>
-                <version>2.0.0-SNAPSHOT</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.onap.logging-analytics</groupId>
-                <artifactId>logging-slf4j</artifactId>
-                <version>${logging-analytics.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.onap.logging-analytics</groupId>
-                <artifactId>logging-filter-base</artifactId>
-                <version>${logging-analytics.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>${junit.version}</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-                <artifactId>sdnr-wt-devicemanager-model</artifactId>
-                <version>1.0.0-SNAPSHOT</version>
-                <scope>provided</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-                <artifactId>sdnr-wt-netconfnode-state-service-model</artifactId>
-                <version>1.0.0-SNAPSHOT</version>
-                <scope>provided</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <repositories>
-        <repository>
-            <id>onap-public</id>
-            <url>${onap.nexus.public-url}</url>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>never</updatePolicy>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>onap-staging</id>
-            <url>${onap.nexus.staging-url}</url>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>never</updatePolicy>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>ecomp-release</id>
-            <name>onap-repository-releases</name>
-            <url>${onap.nexus.release-url}</url>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>never</updatePolicy>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>ecomp-snapshot</id>
-            <name>onap-repository-snapshots</name>
-            <url>${onap.nexus.snapshot-url}</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>opendaylight-mirror</id>
-            <name>opendaylight-mirror</name>
-            <url>${opendaylight.nexus.public-url}</url>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>never</updatePolicy>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>opendaylight-snapshot</id>
-            <name>opendaylight-snapshot</name>
-            <url>${opendaylight.nexus.snapshot-url}</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-
-    </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>onap-public</id>
-            <url>${onap.nexus.public-url}</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
-        <pluginRepository>
-            <id>onap-staging</id>
-            <url>${onap.nexus.staging-url}</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
-        <pluginRepository>
-            <id>onap-snapshot</id>
-            <url>${onap.nexus.snapshot-url}</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
-        <pluginRepository>
-            <id>opendaylight-mirror</id>
-            <name>opendaylight-mirror</name>
-            <url>${opendaylight.nexus.public-url}</url>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>never</updatePolicy>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-        <pluginRepository>
-            <id>opendaylight-snapshot</id>
-            <name>opendaylight-snapshot</name>
-            <url>${opendaylight.nexus.snapshot-url}</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
-        <!-- Black Duck plugin dependencies -->
-        <pluginRepository>
-            <id>JCenter</id>
-            <name>JCenter Repository</name>
-            <url>http://jcenter.bintray.com</url>
-        </pluginRepository>
-
-        <pluginRepository>
-            <id>Restlet</id>
-            <name>Restlet Repository</name>
-            <url>http://maven.restlet.com</url>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <!-- Plugins from ONAP version (parent of oparent) -->
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-deploy-plugin</artifactId>
-                    <!-- This version supports the "deployAtEnd" parameter -->
-                    <version>2.8</version>
-                    <configuration>
-                        <skip/>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-site-plugin</artifactId>
-                    <version>3.6</version>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.apache.maven.wagon</groupId>
-                            <artifactId>wagon-webdav-jackrabbit</artifactId>
-                            <version>2.10</version>
-                        </dependency>
-                    </dependencies>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>3.0.0-M2</version>
-                    <executions>
-                        <execution>
-                            <id>enforce-property</id>
-                            <goals>
-                                <goal>enforce</goal>
-                            </goals>
-                            <configuration>
-                                <rules>
-                                    <requireProperty>
-                                        <property>onap.nexus.url</property>
-                                        <message>You must set a onap.nexus.url property in your
-                                            ~/.m2/settings.xml. See oparent/settings.xml for an example.
-                                        </message>
-                                    </requireProperty>
-                                </rules>
-                                <fail>true</fail>
-                            </configuration>
-                        </execution>
-                        <execution>
-                            <id>enforce-no-snapshots</id>
-                            <goals>
-                                <goal>enforce</goal>
-                            </goals>
-                            <configuration>
-                                <rules>
-                                    <requireReleaseDeps>
-                                        <failWhenParentIsSnapshot>false</failWhenParentIsSnapshot>
-                                        <onlyWhenRelease>true</onlyWhenRelease>
-                                        <level>WARN</level>
-                                    </requireReleaseDeps>
-                                </rules>
-                            </configuration>
-                        </execution>
-                        <execution>
-                            <id>enforce-maven</id>
-                            <goals>
-                                <goal>enforce</goal>
-                            </goals>
-                            <configuration>
-                                <rules>
-                                    <requireJavaVersion>
-                                        <version>8</version>
-                                    </requireJavaVersion>
-                                    <requireMavenVersion>
-                                        <version>[3.5.0,)</version>
-                                    </requireMavenVersion>
-                                </rules>
-                            </configuration>
-                        </execution>
-                        <execution>
-                            <id>enforce-banned-dependencies</id>
-                            <goals>
-                                <goal>enforce</goal>
-                            </goals>
-                            <configuration>
-                                <rules>
-                                    <bannedDependencies>
-                                        <message>Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations</message>
-                                        <excludes>
-                                            <exclude>org.mockito:mockito-all</exclude>
-                <!--                     <exclude>com.google.code.findbugs:annotations</exclude> -->
-                                        </excludes>
-                                    </bannedDependencies>
-                                </rules>
-                                <fail>true</fail>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-                <!-- https://mvnrepository.com/artifact/org.sonarsource.scanner.maven/sonar-maven-plugin -->
-                <plugin>
-                    <groupId>org.sonarsource.scanner.maven</groupId>
-                    <artifactId>sonar-maven-plugin</artifactId>
-                    <version>${sonar.scanner.version}</version>
-                </plugin>
-                <!-- end of plugins from ONAP version (parent of oparent) -->
-
-                <!-- Plugins from ONAP oparent -->
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.22.0</version>
-                    <configuration>
-                        <!-- Sets the VM argument line used when unit tests are run. -->
-                        <argLine>${surefireArgLine}</argLine>
-                        <!-- Excludes integration tests when unit tests are run. -->
-                        <excludes>
-                            <exclude>**/IT*.java</exclude>
-                        </excludes>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-failsafe-plugin</artifactId>
-                    <version>2.22.0</version>
-                    <executions>
-                        <!-- Ensures that both integration-test and verify goals of the Failsafe
-                            Maven plugin are executed. -->
-                        <execution>
-                            <id>integration-tests</id>
-                            <goals>
-                                <goal>integration-test</goal>
-                                <goal>verify</goal>
-                            </goals>
-                            <configuration>
-                                <!-- Sets the VM argument line used when integration tests are run. -->
-                                <argLine>${failsafeArgLine}</argLine>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-
-                <!-- End of plugins from ONAP oparent -->
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>properties-maven-plugin</artifactId>
-                    <version>1.0.0</version>
-                    <executions>
-                        <execution>
-                            <goals>
-                                <goal>set-system-properties</goal>
-                            </goals>
-                            <configuration>
-                                <properties>
-                                    <property>
-                                        <name>maven.wagon.http.ssl.allowall</name>
-                                        <value>${ssl.allowall}</value>
-                                    </property>
-                                    <property>
-                                        <name>maven.wagon.http.ssl.insecure</name>
-                                        <value>${ssl.insecure}</value>
-                                    </property>
-                                </properties>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>versions-maven-plugin</artifactId>
-                    <version>2.5</version>
-                    <configuration>
-                        <processAllModules>true</processAllModules>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-scm-plugin</artifactId>
-                    <version>1.8.1</version>
-                    <configuration>
-                        <tag>${project.artifactId}-${project.version}</tag>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>com.github.ferstl</groupId>
-                    <artifactId>depgraph-maven-plugin</artifactId>
-                    <version>3.3.0</version>
-                    <configuration>
-                        <graphFormat>text</graphFormat>
-                        <outputFileName>${dependency-list.file}</outputFileName>
-                        <outputDirectory>${project.basedir}</outputDirectory>
-                        <transitiveExcludes>*</transitiveExcludes>
-                        <showVersions>true</showVersions>
-                        <showGroupIds>true</showGroupIds>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-        <plugins>
-
-            <!-- Plugins from oparent version (parent of oparent) -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-site-plugin</artifactId>
-            </plugin>
-            <!-- end of plugins from oparent version (parent of oparent) -->
-
-            <!-- Plugins from oparent -->
-            <plugin>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>2.17</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.onap.oparent</groupId>
-                        <artifactId>checkstyle</artifactId>
-                        <version>1.2.2</version>
-                    </dependency>
-                </dependencies>
-                <executions>
-                    <execution>
-                        <id>onap-license</id>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                        <phase>process-sources</phase>
-                        <configuration>
-                            <configLocation>onap-checkstyle/check-license.xml</configLocation>
-                            <includeResources>false</includeResources>
-                            <includeTestSourceDirectory>true</includeTestSourceDirectory>
-                            <includeTestResources>false</includeTestResources>
-                            <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
-                            <excludes>
-                            </excludes>
-                            <consoleOutput>true</consoleOutput>
-                            <failOnViolation>false</failOnViolation>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>onap-java-style</id>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                        <phase>process-sources</phase>
-                        <configuration>
-                            <!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml
-                                with minor changes -->
-                            <configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
-                            <!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory -->
-                            <sourceDirectory>${project.build.sourceDirectory}/src/main/java</sourceDirectory>
-                            <includeResources>true</includeResources>
-                            <includeTestSourceDirectory>true</includeTestSourceDirectory>
-                            <includeTestResources>true</includeTestResources>
-                            <excludes>
-                            </excludes>
-                            <consoleOutput>true</consoleOutput>
-                            <failOnViolation>false</failOnViolation>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.12</version>
-            </plugin>
-            <!-- Jacoco / Sonar -->
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <version>${jacoco.version}</version>
-                <executions>
-                    <execution>
-                        <id>pre-unit-test</id>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                        <configuration>
-                            <!-- Sets the path to the file which contains the execution data. -->
-                            <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
-                            <!-- Sets the name of the property containing the settings for JaCoCo runtime agent. -->
-                            <propertyName>surefireArgLine</propertyName>
-                        </configuration>
-                    </execution>
-                    <!-- Ensures that the code coverage report for unit tests is created after unit tests have been run. -->
-                    <execution>
-                        <id>post-unit-test</id>
-                        <phase>test</phase>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                        <configuration>
-                            <!-- Sets the path to the file which contains the execution data. -->
-                            <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
-                            <!-- Sets the output directory for the code coverage report. -->
-                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>pre-integration-test</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                        <configuration>
-                            <!-- Sets the path to the file which contains the execution data. -->
-                            <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
-                            <!-- Sets the name of the property containing the settings for JaCoCo runtime agent. -->
-                            <propertyName>failsafeArgLine</propertyName>
-                        </configuration>
-                    </execution>
-                    <!-- Ensures that the code coverage report for integration tests after integration tests have been run. -->
-                    <execution>
-                        <id>post-integration-test</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                        <configuration>
-                            <!-- Sets the path to the file which contains the execution data. -->
-                            <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
-                            <!-- Sets the output directory for the code coverage report. -->
-                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>default-prepare-agent</id>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>default-report</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>default-check</id>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <rule>
-                                    <element>PACKAGE</element>
-                                    <limits>
-                                        <limit>
-                                            <counter>COMPLEXITY</counter>
-                                            <value>COVEREDRATIO</value>
-                                            <minimum>0.0</minimum>
-                                        </limit>
-                                    </limits>
-                                </rule>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-failsafe-plugin</artifactId>
-            </plugin>
-            <!-- end of plugins from oparent -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.4</version>
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                        <configuration>
-                            <additionalparam>-Xdoclint:none</additionalparam>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.0.0-M2</version>
-                <executions>
-                    <execution>
-                        <id>enforce-property</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireProperty>
-                                    <property>onap.nexus.url</property>
-                                    <message>You must set a onap.nexus.url property in your
-                                        ~/.m2/settings.xml. See oparent/settings.xml for an example.</message>
-                                </requireProperty>
-                            </rules>
-                            <fail>true</fail>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>enforce-no-snapshots</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireReleaseDeps>
-                                    <failWhenParentIsSnapshot>false</failWhenParentIsSnapshot>
-                                    <onlyWhenRelease>true</onlyWhenRelease>
-                                    <level>WARN</level>
-                                </requireReleaseDeps>
-                            </rules>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>enforce-maven</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireJavaVersion>
-                                    <version>1.8.0</version>
-                                </requireJavaVersion>
-                                <requireMavenVersion>
-                                    <version>[3.5.0,)</version>
-                                </requireMavenVersion>
-                            </rules>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>enforce-banned-dependencies</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <bannedDependencies>
-                                    <message>Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations</message>
-                                    <excludes>
-                                        <exclude>org.mockito:mockito-all</exclude>
-<!--                                         <exclude>com.google.code.findbugs:annotations</exclude> -->
-                                    </excludes>
-                                </bannedDependencies>
-                            </rules>
-                            <fail>true</fail>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <reporting>
-        <plugins>
-            <plugin>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.4</version>
-                <configuration>
-                    <failOnError>false</failOnError>
-                    <additionalparam>-Xdoclint:none</additionalparam>
-                </configuration>
-            </plugin>
-        </plugins>
-    </reporting>
-
-    <profiles>
-        <!-- Profiles from ONAP oparent -->
-        <profile>
-            <id>generate-json</id>
-            <activation>
-                <file>
-                    <exists>${swagger-properties}</exists>
-                </file>
-                <property>
-                    <name>swagger-sdk.generate-json</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>properties-maven-plugin</artifactId>
-                        <version>1.0.0</version>
-                        <executions>
-                            <execution>
-                                <phase>initialize</phase>
-                                <goals>
-                                    <goal>read-project-properties</goal>
-                                </goals>
-                                <configuration>
-                                    <files>
-                                        <file>${basedir}/src/main/resources/swagger.properties</file>
-                                    </files>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>com.github.kongchen</groupId>
-                        <artifactId>swagger-maven-plugin</artifactId>
-                        <version>3.1.4</version>
-                        <configuration>
-                            <apiSources>
-                                <apiSource>
-                                    <locations>${api-rest-package}</locations>
-                                    <schemes>http,https</schemes>
-                                    <host>${api-host-ip}:${api-host-port}</host>
-                                    <basePath>${api-base-path}</basePath>
-                                    <info>
-                                        <title>${api-title}</title>
-                                        <version>${api-version}</version>
-                                        <description>${api-description}</description>
-                                        <license>
-                                            <name>${api-license}</name>
-                                        </license>
-                                    </info>
-                                    <swaggerDirectory>${basedir}/src/main/resources</swaggerDirectory>
-                                </apiSource>
-                            </apiSources>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <phase>compile</phase>
-                                <goals>
-                                    <goal>generate</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-install-plugin</artifactId>
-                        <version>2.3.1</version>
-                        <executions>
-                            <execution>
-                                <id>install-file-id</id>
-                                <phase>install</phase>
-                                <goals>
-                                    <goal>install-file</goal>
-                                </goals>
-                                <configuration>
-                                    <file>${basedir}/src/main/resources/swagger.json</file>
-                                    <groupId>${project.groupId}</groupId>
-                                    <artifactId>${project.artifactId}-swagger-schema</artifactId>
-                                    <version>${project.version}</version>
-                                    <packaging>json</packaging>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>generate-sdk</id>
-            <activation>
-                <file>
-                    <exists>${swagger-json}</exists>
-                </file>
-                <property>
-                    <name>swagger-sdk.generate-java-sdk</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <version>1.8</version>
-                        <executions>
-                            <execution>
-                                <phase>initialize</phase>
-                                <id>ant-create-script</id>
-                                <configuration>
-                                    <exportAntProperties>true</exportAntProperties>
-                                    <tasks>
-                                        <taskdef resource="net/sf/antcontrib/antlib.xml" classpathref="maven.plugin.classpath"/>
-                                        <condition property="is_windows" value="true">
-                                            <os family="windows"/>
-                                        </condition>
-                                        <condition property="isLinux" value="true">
-                                            <os family="unix"/>
-                                        </condition>
-                                        <if>
-                                            <equals arg1="${is_windows}" arg2="true"/>
-                                            <then>
-                                                <property name="swagger.sdk.script.file" value="generated-source-script.bat"/>
-                                                <echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true" message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
-                                                <echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true" message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
-                                            </then>
-                                            <else>
-                                                <property name="swagger.sdk.script.file" value="generated-source-script.sh"/>
-                                                <echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true" message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
-                                                <echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true" message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
-                                                <chmod file="${project.build.directory}${file.separator}generated-source-script.sh" perm="755"/>
-                                            </else>
-                                        </if>
-                                    </tasks>
-                                </configuration>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>ant-contrib</groupId>
-                                <artifactId>ant-contrib</artifactId>
-                                <version>1.0b3</version>
-                                <exclusions>
-                                    <exclusion>
-                                        <groupId>ant</groupId>
-                                        <artifactId>ant</artifactId>
-                                    </exclusion>
-                                </exclusions>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.swagger</groupId>
-                        <artifactId>swagger-codegen-maven-plugin</artifactId>
-                        <version>2.2.1</version>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>generate</goal>
-                                </goals>
-                                <configuration>
-                                    <inputSpec>${basedir}/src/main/resources/swagger.json</inputSpec>
-                                    <output>${project.build.directory}/generated-sources</output>
-                                    <language>java</language>
-                                    <configOptions>
-                                        <dateLibrary>joda</dateLibrary>
-                                    </configOptions>
-                                    <library>jersey2</library>
-                                    <groupId>${project.groupId}</groupId>
-                                    <artifactId>${project.artifactId}-java-sdk</artifactId>
-                                    <artifactVersion>${project.version}</artifactVersion>
-                                    <modelPackage>${project.groupId}.${project.artifactId}.client.model</modelPackage>
-                                    <apiPackage>${project.groupId}.${project.artifactId}.client.api</apiPackage>
-                                    <invokerPackage>${project.groupId}.${project.artifactId}.client.invoker</invokerPackage>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>exec-maven-plugin</artifactId>
-                        <version>1.5.0</version>
-                        <executions>
-                            <execution>
-                                <id>swagger-generate-sources</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>exec</goal>
-                                </goals>
-                                <configuration>
-                                    <executable>${project.build.directory}${file.separator}${swagger.sdk.script.file}</executable>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-clean-plugin</artifactId>
-                        <version>3.0.0</version>
-                        <executions>
-                            <execution>
-                                <id>clean-generated-files</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>clean</goal>
-                                </goals>
-                                <configuration>
-                                    <filesets>
-                                        <fileset>
-                                            <directory>${project.build.directory}/generated-sources</directory>
-                                        </fileset>
-                                    </filesets>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>org.onap.msb.swagger-sdk</groupId>
-                    <artifactId>swagger-sdk</artifactId>
-                    <version>1.0.0</version>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>sonar-jacoco-aggregate</id>
-            <activation>
-                <property>
-                    <name>onap.jacoco.aggregateFile</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.jacoco</groupId>
-                        <artifactId>jacoco-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>merge</id>
-                                <goals>
-                                    <goal>merge</goal>
-                                </goals>
-                                <phase>generate-resources</phase>
-                                <configuration>
-                                    <destFile>${onap.jacoco.aggregateFile}</destFile>
-                                    <fileSets>
-                                        <fileSet>
-                                            <directory>${project.basedir}</directory>
-                                            <includes>
-                                                <include>**/target/code-coverage/*.exec</include>
-                                            </includes>
-                                        </fileSet>
-                                    </fileSets>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <!-- End of profiles from ONAP oparent -->
-
-        <profile>
-            <id>yang-compile</id>
-            <activation>
-                <file>
-                    <exists>src/main/yang</exists>
-                </file>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.opendaylight.yangtools</groupId>
-                        <artifactId>yang-maven-plugin</artifactId>
-                        <version>3.0.11</version>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.opendaylight.mdsal</groupId>
-                                <artifactId>maven-sal-api-gen-plugin</artifactId>
-                                <version>${odl.mdsal.model.version}</version>
-                                <type>jar</type>
-                                <scope>compile</scope>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.opendaylight.netconf</groupId>
-                                <artifactId>sal-rest-docgen-maven</artifactId>
-                                <version>${odl.netconf.sal.rest.docgen.version}</version>
-                                <type>jar</type>
-                            </dependency>
-                        </dependencies>
-                        <executions>
-                            <execution>
-                                <id>binding</id>
-                                <goals>
-                                    <goal>generate-sources</goal>
-                                </goals>
-                                <configuration>
-                                    <yangFilesRootDir>${yang.file.directory}</yangFilesRootDir>
-                                    <codeGenerators>
-                                        <generator>
-                                            <codeGeneratorClass>org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
-                                            <outputBaseDir>${salGeneratorPath}</outputBaseDir>
-                                        </generator>
-                                        <generator>
-                                            <codeGeneratorClass>org.opendaylight.netconf.sal.rest.doc.maven.StaticDocGenerator</codeGeneratorClass>
-                                            <outputBaseDir>target/swagger</outputBaseDir>
-                                        </generator>
-                                    </codeGenerators>
-                                    <inspectDependencies>true</inspectDependencies>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-</project>
diff --git a/parent/dependencies-odl-bom/pom.xml b/parent/dependencies-odl-bom/pom.xml
deleted file mode 100644 (file)
index 9cb79e5..0000000
+++ /dev/null
@@ -1,310 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>odlparent</artifactId>
-        <version>5.0.7</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.o-ran-sc.oam.features.parent</groupId>
-    <artifactId>dependencies-odl-bom</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <distributionManagement>
-        <repository>
-            <id>ecomp-releases</id>
-            <url>https://nexus.onap.org/content/repositories/releases</url>
-        </repository>
-        <snapshotRepository>
-            <id>ecomp-snapshots</id>
-            <url>https://nexus.onap.org/content/repositories/snapshots</url>
-        </snapshotRepository>
-    </distributionManagement>
-
-    <!-- Note: maven properties do not work as expected in BOMs.  The property settings are
-    not imported - so if you use a property in the version below, the pom that imports your BOM is
-    expected to have that property set - defeating the whole point of a BOM.  Moral : use constants,
-    not properties, for versions in BOMs -->
-    <dependencyManagement>
-        <dependencies>
-            <!-- Preinstalled OpenDaylight artifacts -->
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>installed-odl-bom</artifactId>
-                <version>${project.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-
-            <!-- Other OpenDaylight dependencies -->
-            <dependency>
-                <groupId>org.opendaylight.bgpcep</groupId>
-                <artifactId>bgp-artifacts</artifactId>
-                <version>0.12.3</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>mdsal-artifacts</artifactId>
-                <version>1.10.3</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>sal-binding-broker-impl</artifactId>
-                <version>1.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>sal-binding-broker-impl</artifactId>
-                <version>1.10.3</version>
-                <type>test-jar</type>
-                <classifier>tests</classifier>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>sal-test-model</artifactId>
-                <version>1.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-artifacts</artifactId>
-                <version>4.0.14</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>netconf-artifacts</artifactId>
-                <version>1.7.3</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>restconf-artifacts</artifactId>
-                <version>1.10.3</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-
-            <!-- Other dependencies -->
-            <dependency>
-                <groupId>ch.qos.logback</groupId>
-                <artifactId>logback-classic</artifactId>
-                <version>1.2.3</version>
-            </dependency>
-            <dependency>
-                <groupId>ch.qos.logback</groupId>
-                <artifactId>logback-core</artifactId>
-                <version>1.2.3</version>
-            </dependency>
-            <dependency>
-                <groupId>ch.vorburger.mariaDB4j</groupId>
-                <artifactId>mariaDB4j</artifactId>
-                <version>2.4.0</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>com.att.eelf</groupId>
-                <artifactId>eelf-core</artifactId>
-                <version>1.0.0</version>
-            </dependency>
-            <dependency>
-                <groupId>com.carrotsearch</groupId>
-                <artifactId>hppc</artifactId>
-                <version>0.7.1</version>
-            </dependency>
-            <dependency>
-                <groupId>com.github.stefanbirkner</groupId>
-                <artifactId>system-rules</artifactId>
-                <version>1.19.0</version>
-            </dependency>
-            <dependency>
-                <groupId>com.github.tomakehurst</groupId>
-                <artifactId>wiremock</artifactId>
-                <version>2.25.1</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>com.google.protobuf</groupId>
-                <artifactId>protobuf-java</artifactId>
-                <version>3.10.0</version>
-            </dependency>
-            <dependency>
-                <groupId>com.google.protobuf</groupId>
-                <artifactId>protobuf-java-util</artifactId>
-                <version>3.10.0</version>
-            </dependency>
-            <dependency>
-                <groupId>com.jayway.jsonpath</groupId>
-                <artifactId>json-path</artifactId>
-                <version>2.4.0</version>
-            </dependency>
-            <dependency>
-                <groupId>com.ning</groupId>
-                <artifactId>compress-lzf</artifactId>
-                <version>1.0.2</version>
-            </dependency>
-             <dependency>
-                <groupId>commons-cli</groupId>
-                <artifactId>commons-cli</artifactId>
-                <version>1.3.1</version>
-            </dependency>
-            <dependency>
-                <groupId>dom4j</groupId>
-                <artifactId>dom4j</artifactId>
-                <version>1.6.1</version>
-            </dependency>
-            <!-- Indirect ODL constraint : should be compatible with io.netty version -->
-            <dependency>
-                <groupId>io.grpc</groupId>
-                <artifactId>grpc-bom</artifactId>
-                <version>1.21.1</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>jakarta-regexp</groupId>
-                <artifactId>jakarta-regexp</artifactId>
-                <version>1.4</version>
-            </dependency>
-            <dependency>
-                <groupId>javax</groupId>
-                <artifactId>javaee-api</artifactId>
-                <version>7.0</version>
-            </dependency>
-            <dependency>
-                <groupId>javax.servlet</groupId>
-                <artifactId>servlet-api</artifactId>
-                <version>2.5</version>
-            </dependency>
-            <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>4.12</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-io</artifactId>
-                <version>1.3.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.derby</groupId>
-                <artifactId>derby</artifactId>
-                <version>10.14.2.0</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.httpcomponents</groupId>
-                <artifactId>httpcore</artifactId>
-                <version>4.4.12</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.httpcomponents</groupId>
-                <artifactId>httpclient</artifactId>
-                <version>4.5.10</version>
-            </dependency>
-
-            <!-- There are newer major releases of lucene available -->
-           <dependency>
-                <groupId>org.apache.sling</groupId>
-                <artifactId>org.apache.sling.testing.osgi-mock</artifactId>
-                <version>2.3.10</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.tomcat</groupId>
-                <artifactId>tomcat-jdbc</artifactId>
-                <version>9.0.30</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.velocity</groupId>
-                <artifactId>velocity</artifactId>
-                <version>1.7</version>
-            </dependency>
-            <dependency>
-                <groupId>org.codehaus.jackson</groupId>
-                <artifactId>jackson-jaxrs</artifactId>
-                <version>1.9.13</version>
-            </dependency>
-            <dependency>
-                <groupId>org.codehaus.jettison</groupId>
-                <artifactId>jettison</artifactId>
-                <version>1.4.0</version>
-            </dependency>
-            <!-- Constrained by OpenDaylight -->
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-server</artifactId>
-                <version>9.4.12.v20180830</version>
-            </dependency>
-            <!-- Constrained by OpenDaylight -->
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-servlet</artifactId>
-                <version>9.4.12.v20180830</version>
-            </dependency>
-            <dependency>
-                <groupId>org.java-websocket</groupId>
-                <artifactId>Java-WebSocket</artifactId>
-                <version>1.4.0</version>
-            </dependency>
-            <dependency>
-                <groupId>net.bytebuddy</groupId>
-                <artifactId>byte-buddy</artifactId>
-                <version>1.9.10</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jsoup</groupId>
-                <artifactId>jsoup</artifactId>
-                <version>1.12.1</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.mariadb.jdbc</groupId>
-                <artifactId>mariadb-java-client</artifactId>
-                <version>2.4.4</version>
-            </dependency>
-            <dependency>
-                <groupId>org.powermock</groupId>
-                <artifactId>powermock-api-mockito2</artifactId>
-                <version>1.7.4</version>
-            </dependency>
-            <dependency>
-                <groupId>org.powermock</groupId>
-                <artifactId>powermock-module-junit4</artifactId>
-                <version>1.7.4</version>
-            </dependency>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>jcl-over-slf4j</artifactId>
-                <version>1.7.29</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-framework-bom</artifactId>
-                <version>4.3.25.RELEASE</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.testng</groupId>
-                <artifactId>testng</artifactId>
-                <version>6.14.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.yaml</groupId>
-                <artifactId>snakeyaml</artifactId>
-                <version>1.25</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-</project>
diff --git a/parent/installed-odl-bom/pom.xml b/parent/installed-odl-bom/pom.xml
deleted file mode 100644 (file)
index a5a444e..0000000
+++ /dev/null
@@ -1,3425 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>org.o-ran-sc.oam.features.parent</groupId>
-    <artifactId>installed-odl-bom</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <distributionManagement>
-        <repository>
-            <id>ecomp-releases</id>
-            <url>https://nexus.onap.org/content/repositories/releases</url>
-        </repository>
-        <snapshotRepository>
-            <id>ecomp-snapshots</id>
-            <url>https://nexus.onap.org/content/repositories/snapshots</url>
-        </snapshotRepository>
-    </distributionManagement>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>antlr</groupId>
-                <artifactId>antlr</artifactId>
-                <version>2.7.7</version>
-            </dependency>
-            <dependency>
-                <groupId>com.esotericsoftware</groupId>
-                <artifactId>kryo</artifactId>
-                <version>4.0.2</version>
-            </dependency>
-            <dependency>
-                <groupId>com.esotericsoftware</groupId>
-                <artifactId>minlog</artifactId>
-                <version>1.3.1</version>
-            </dependency>
-            <dependency>
-                <groupId>com.esotericsoftware</groupId>
-                <artifactId>reflectasm</artifactId>
-                <version>1.11.8</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fasterxml</groupId>
-                <artifactId>classmate</artifactId>
-                <version>1.3.4</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.core</groupId>
-                <artifactId>jackson-annotations</artifactId>
-                <version>2.9.10</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.core</groupId>
-                <artifactId>jackson-annotations</artifactId>
-                <version>2.9.6</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.core</groupId>
-                <artifactId>jackson-core</artifactId>
-                <version>2.9.10</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.core</groupId>
-                <artifactId>jackson-core</artifactId>
-                <version>2.9.6</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.core</groupId>
-                <artifactId>jackson-databind</artifactId>
-                <version>2.9.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.core</groupId>
-                <artifactId>jackson-databind</artifactId>
-                <version>2.9.6</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.dataformat</groupId>
-                <artifactId>jackson-dataformat-xml</artifactId>
-                <version>2.9.10</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.jaxrs</groupId>
-                <artifactId>jackson-jaxrs-base</artifactId>
-                <version>2.9.10</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.jaxrs</groupId>
-                <artifactId>jackson-jaxrs-json-provider</artifactId>
-                <version>2.9.10</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.module</groupId>
-                <artifactId>jackson-module-jaxb-annotations</artifactId>
-                <version>2.9.10</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fasterxml.woodstox</groupId>
-                <artifactId>woodstox-core</artifactId>
-                <version>5.3.0</version>
-            </dependency>
-            <dependency>
-                <groupId>com.github.ben-manes.caffeine</groupId>
-                <artifactId>caffeine</artifactId>
-                <version>2.7.0</version>
-            </dependency>
-            <dependency>
-                <groupId>com.github.ben-manes.caffeine</groupId>
-                <artifactId>guava</artifactId>
-                <version>2.7.0</version>
-            </dependency>
-            <dependency>
-                <groupId>com.github.mifmif</groupId>
-                <artifactId>generex</artifactId>
-                <version>1.0.2</version>
-            </dependency>
-            <dependency>
-                <groupId>com.github.spotbugs</groupId>
-                <artifactId>spotbugs-annotations</artifactId>
-                <version>3.1.12</version>
-            </dependency>
-            <dependency>
-                <groupId>com.google.code.gson</groupId>
-                <artifactId>gson</artifactId>
-                <version>2.8.5</version>
-            </dependency>
-            <dependency>
-                <groupId>com.google.errorprone</groupId>
-                <artifactId>error_prone_annotations</artifactId>
-                <version>2.3.3</version>
-            </dependency>
-            <dependency>
-                <groupId>com.google.guava</groupId>
-                <artifactId>failureaccess</artifactId>
-                <version>1.0.1</version>
-            </dependency>
-            <dependency>
-                <groupId>com.google.guava</groupId>
-                <artifactId>guava</artifactId>
-                <version>27.1-jre</version>
-            </dependency>
-            <dependency>
-                <groupId>com.google.guava</groupId>
-                <artifactId>listenablefuture</artifactId>
-                <version>9999.0-empty-to-avoid-conflict-with-guava</version>
-            </dependency>
-            <dependency>
-                <groupId>com.google.j2objc</groupId>
-                <artifactId>j2objc-annotations</artifactId>
-                <version>1.1</version>
-            </dependency>
-            <dependency>
-                <groupId>com.googlecode.json-simple</groupId>
-                <artifactId>json-simple</artifactId>
-                <version>1.1.1</version>
-            </dependency>
-            <dependency>
-                <groupId>com.h2database</groupId>
-                <artifactId>h2</artifactId>
-                <version>1.3.172</version>
-            </dependency>
-            <dependency>
-                <groupId>com.h2database</groupId>
-                <artifactId>h2</artifactId>
-                <version>1.4.200</version>
-            </dependency>
-            <dependency>
-                <groupId>com.lmax</groupId>
-                <artifactId>disruptor</artifactId>
-                <version>3.4.2</version>
-            </dependency>
-            <dependency>
-                <groupId>com.rabbitmq</groupId>
-                <artifactId>amqp-client</artifactId>
-                <version>4.4.1</version>
-            </dependency>
-            <dependency>
-                <groupId>com.thoughtworks.paranamer</groupId>
-                <artifactId>paranamer</artifactId>
-                <version>2.8</version>
-            </dependency>
-            <dependency>
-                <groupId>com.typesafe.akka</groupId>
-                <artifactId>akka-actor_2.12</artifactId>
-                <version>2.5.31</version>
-            </dependency>
-            <dependency>
-                <groupId>com.typesafe.akka</groupId>
-                <artifactId>akka-cluster_2.12</artifactId>
-                <version>2.5.31</version>
-            </dependency>
-            <dependency>
-                <groupId>com.typesafe.akka</groupId>
-                <artifactId>akka-osgi_2.12</artifactId>
-                <version>2.5.31</version>
-            </dependency>
-            <dependency>
-                <groupId>com.typesafe.akka</groupId>
-                <artifactId>akka-persistence_2.12</artifactId>
-                <version>2.5.31</version>
-            </dependency>
-            <dependency>
-                <groupId>com.typesafe.akka</groupId>
-                <artifactId>akka-protobuf_2.12</artifactId>
-                <version>2.5.31</version>
-            </dependency>
-            <dependency>
-                <groupId>com.typesafe.akka</groupId>
-                <artifactId>akka-remote_2.12</artifactId>
-                <version>2.5.31</version>
-            </dependency>
-            <dependency>
-                <groupId>com.typesafe.akka</groupId>
-                <artifactId>akka-slf4j_2.12</artifactId>
-                <version>2.5.31</version>
-            </dependency>
-            <dependency>
-                <groupId>com.typesafe.akka</groupId>
-                <artifactId>akka-stream_2.12</artifactId>
-                <version>2.5.31</version>
-            </dependency>
-            <dependency>
-                <groupId>com.typesafe</groupId>
-                <artifactId>config</artifactId>
-                <version>1.3.3</version>
-            </dependency>
-            <dependency>
-                <groupId>com.typesafe</groupId>
-                <artifactId>ssl-config-core_2.12</artifactId>
-                <version>0.3.8</version>
-            </dependency>
-            <dependency>
-                <groupId>com.zaxxer</groupId>
-                <artifactId>HikariCP-java7</artifactId>
-                <version>2.4.11</version>
-            </dependency>
-            <dependency>
-                <groupId>commons-beanutils</groupId>
-                <artifactId>commons-beanutils</artifactId>
-                <version>1.9.4</version>
-            </dependency>
-            <dependency>
-                <groupId>commons-codec</groupId>
-                <artifactId>commons-codec</artifactId>
-                <version>1.14</version>
-            </dependency>
-            <dependency>
-                <groupId>commons-collections</groupId>
-                <artifactId>commons-collections</artifactId>
-                <version>3.2.2</version>
-            </dependency>
-            <dependency>
-                <groupId>commons-dbcp</groupId>
-                <artifactId>commons-dbcp</artifactId>
-                <version>1.4</version>
-            </dependency>
-            <dependency>
-                <groupId>commons-io</groupId>
-                <artifactId>commons-io</artifactId>
-                <version>2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>commons-lang</groupId>
-                <artifactId>commons-lang</artifactId>
-                <version>2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>commons-logging</groupId>
-                <artifactId>commons-logging</artifactId>
-                <version>1.2</version>
-            </dependency>
-            <dependency>
-                <groupId>commons-net</groupId>
-                <artifactId>commons-net</artifactId>
-                <version>3.6</version>
-            </dependency>
-            <dependency>
-                <groupId>commons-pool</groupId>
-                <artifactId>commons-pool</artifactId>
-                <version>1.6</version>
-            </dependency>
-            <dependency>
-                <groupId>dk.brics</groupId>
-                <artifactId>automaton</artifactId>
-                <version>1.12-1</version>
-            </dependency>
-            <dependency>
-                <groupId>io.aeron</groupId>
-                <artifactId>aeron-client</artifactId>
-                <version>1.15.3</version>
-            </dependency>
-            <dependency>
-                <groupId>io.aeron</groupId>
-                <artifactId>aeron-driver</artifactId>
-                <version>1.15.3</version>
-            </dependency>
-            <dependency>
-                <groupId>io.dropwizard.metrics</groupId>
-                <artifactId>metrics-core</artifactId>
-                <version>4.0.5</version>
-            </dependency>
-            <dependency>
-                <groupId>io.dropwizard.metrics</groupId>
-                <artifactId>metrics-graphite</artifactId>
-                <version>4.0.5</version>
-            </dependency>
-            <dependency>
-                <groupId>io.dropwizard.metrics</groupId>
-                <artifactId>metrics-healthchecks</artifactId>
-                <version>4.0.5</version>
-            </dependency>
-            <dependency>
-                <groupId>io.dropwizard.metrics</groupId>
-                <artifactId>metrics-jmx</artifactId>
-                <version>4.0.5</version>
-            </dependency>
-            <dependency>
-                <groupId>io.dropwizard.metrics</groupId>
-                <artifactId>metrics-jvm</artifactId>
-                <version>4.0.5</version>
-            </dependency>
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-buffer</artifactId>
-                <version>4.1.49.Final</version>
-            </dependency>
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-codec-http</artifactId>
-                <version>4.1.49.Final</version>
-            </dependency>
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-codec</artifactId>
-                <version>4.1.49.Final</version>
-            </dependency>
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-common</artifactId>
-                <version>4.1.49.Final</version>
-            </dependency>
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-handler</artifactId>
-                <version>4.1.49.Final</version>
-            </dependency>
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-resolver</artifactId>
-                <version>4.1.49.Final</version>
-            </dependency>
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-transport-native-epoll</artifactId>
-                <version>4.1.49.Final</version>
-            </dependency>
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-transport-native-unix-common</artifactId>
-                <version>4.1.49.Final</version>
-            </dependency>
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-transport</artifactId>
-                <version>4.1.49.Final</version>
-            </dependency>
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty</artifactId>
-                <version>3.10.6.Final</version>
-            </dependency>
-            <dependency>
-                <groupId>io.undertow</groupId>
-                <artifactId>undertow-core</artifactId>
-                <version>1.4.23.Final</version>
-            </dependency>
-            <dependency>
-                <groupId>io.undertow</groupId>
-                <artifactId>undertow-servlet</artifactId>
-                <version>1.4.23.Final</version>
-            </dependency>
-            <dependency>
-                <groupId>io.undertow</groupId>
-                <artifactId>undertow-websockets-jsr</artifactId>
-                <version>1.4.23.Final</version>
-            </dependency>
-            <dependency>
-                <groupId>javax.annotation</groupId>
-                <artifactId>javax.annotation-api</artifactId>
-                <version>1.2</version>
-            </dependency>
-            <dependency>
-                <groupId>javax.annotation</groupId>
-                <artifactId>javax.annotation-api</artifactId>
-                <version>1.3</version>
-            </dependency>
-            <dependency>
-                <groupId>javax.el</groupId>
-                <artifactId>javax.el-api</artifactId>
-                <version>3.0.0</version>
-            </dependency>
-            <dependency>
-                <groupId>javax.enterprise</groupId>
-                <artifactId>cdi-api</artifactId>
-                <version>1.2</version>
-            </dependency>
-            <dependency>
-                <groupId>javax.interceptor</groupId>
-                <artifactId>javax.interceptor-api</artifactId>
-                <version>1.2</version>
-            </dependency>
-            <dependency>
-                <groupId>javax.jms</groupId>
-                <artifactId>javax.jms-api</artifactId>
-                <version>2.0.1</version>
-            </dependency>
-            <dependency>
-                <groupId>javax.mail</groupId>
-                <artifactId>mail</artifactId>
-                <version>1.4.7</version>
-            </dependency>
-            <dependency>
-                <groupId>javax.money</groupId>
-                <artifactId>money-api</artifactId>
-                <version>1.0.1</version>
-            </dependency>
-            <dependency>
-                <groupId>javax.persistence</groupId>
-                <artifactId>javax.persistence-api</artifactId>
-                <version>2.2</version>
-            </dependency>
-            <dependency>
-                <groupId>javax.security.auth.message</groupId>
-                <artifactId>javax.security.auth.message-api</artifactId>
-                <version>1.1</version>
-            </dependency>
-            <dependency>
-                <groupId>javax.servlet</groupId>
-                <artifactId>javax.servlet-api</artifactId>
-                <version>3.1.0</version>
-            </dependency>
-            <dependency>
-                <groupId>javax.transaction</groupId>
-                <artifactId>javax.transaction-api</artifactId>
-                <version>1.2</version>
-            </dependency>
-            <dependency>
-                <groupId>javax.validation</groupId>
-                <artifactId>validation-api</artifactId>
-                <version>1.1.0.Final</version>
-            </dependency>
-            <dependency>
-                <groupId>javax.validation</groupId>
-                <artifactId>validation-api</artifactId>
-                <version>2.0.1.Final</version>
-            </dependency>
-            <dependency>
-                <groupId>javax.websocket</groupId>
-                <artifactId>javax.websocket-api</artifactId>
-                <version>1.1</version>
-            </dependency>
-            <dependency>
-                <groupId>javax.ws.rs</groupId>
-                <artifactId>javax.ws.rs-api</artifactId>
-                <version>2.0.1</version>
-            </dependency>
-            <dependency>
-                <groupId>joda-time</groupId>
-                <artifactId>joda-time</artifactId>
-                <version>2.9.7</version>
-            </dependency>
-            <dependency>
-                <groupId>net.bytebuddy</groupId>
-                <artifactId>byte-buddy</artifactId>
-                <version>1.9.10</version>
-            </dependency>
-            <dependency>
-                <groupId>net.i2p.crypto</groupId>
-                <artifactId>eddsa</artifactId>
-                <version>0.3.0</version>
-            </dependency>
-            <dependency>
-                <groupId>net.java.dev.stax-utils</groupId>
-                <artifactId>stax-utils</artifactId>
-                <version>20070216</version>
-            </dependency>
-            <dependency>
-                <groupId>net.sf.ehcache</groupId>
-                <artifactId>ehcache</artifactId>
-                <version>2.10.6</version>
-            </dependency>
-            <dependency>
-                <groupId>net.sf.jung</groupId>
-                <artifactId>jung-algorithms</artifactId>
-                <version>2.1.1</version>
-            </dependency>
-            <dependency>
-                <groupId>net.sf.jung</groupId>
-                <artifactId>jung-api</artifactId>
-                <version>2.1.1</version>
-            </dependency>
-            <dependency>
-                <groupId>net.sf.jung</groupId>
-                <artifactId>jung-graph-impl</artifactId>
-                <version>2.1.1</version>
-            </dependency>
-            <dependency>
-                <groupId>net.sf.kxml</groupId>
-                <artifactId>kxml2</artifactId>
-                <version>2.2.2</version>
-            </dependency>
-            <dependency>
-                <groupId>net.sourceforge.jtds</groupId>
-                <artifactId>jtds</artifactId>
-                <version>1.3.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.agrona</groupId>
-                <artifactId>agrona</artifactId>
-                <version>0.9.33</version>
-            </dependency>
-            <dependency>
-                <groupId>org.antlr</groupId>
-                <artifactId>antlr4-runtime</artifactId>
-                <version>4.7.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.activemq</groupId>
-                <artifactId>activemq-osgi</artifactId>
-                <version>5.15.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.application</groupId>
-                <artifactId>org.apache.aries.application.api</artifactId>
-                <version>1.0.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.application</groupId>
-                <artifactId>org.apache.aries.application.default.local.platform</artifactId>
-                <version>1.0.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.application</groupId>
-                <artifactId>org.apache.aries.application.deployment.management</artifactId>
-                <version>1.0.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.application</groupId>
-                <artifactId>org.apache.aries.application.install</artifactId>
-                <version>1.0.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.application</groupId>
-                <artifactId>org.apache.aries.application.management</artifactId>
-                <version>1.0.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.application</groupId>
-                <artifactId>org.apache.aries.application.modeller</artifactId>
-                <version>1.0.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.application</groupId>
-                <artifactId>org.apache.aries.application.resolver.noop</artifactId>
-                <version>1.0.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.application</groupId>
-                <artifactId>org.apache.aries.application.resolver.obr</artifactId>
-                <version>1.0.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.application</groupId>
-                <artifactId>org.apache.aries.application.runtime</artifactId>
-                <version>1.0.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.application</groupId>
-                <artifactId>org.apache.aries.application.utils</artifactId>
-                <version>1.0.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.blueprint</groupId>
-                <artifactId>org.apache.aries.blueprint.api</artifactId>
-                <version>1.0.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.blueprint</groupId>
-                <artifactId>org.apache.aries.blueprint.cm</artifactId>
-                <version>1.3.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.blueprint</groupId>
-                <artifactId>org.apache.aries.blueprint.core.compatibility</artifactId>
-                <version>1.0.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.blueprint</groupId>
-                <artifactId>org.apache.aries.blueprint.core</artifactId>
-                <version>1.10.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.blueprint</groupId>
-                <artifactId>org.apache.aries.blueprint.webosgi</artifactId>
-                <version>1.0.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.jmx</groupId>
-                <artifactId>org.apache.aries.jmx.api</artifactId>
-                <version>1.1.5</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.jmx</groupId>
-                <artifactId>org.apache.aries.jmx.blueprint.api</artifactId>
-                <version>1.2.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.jmx</groupId>
-                <artifactId>org.apache.aries.jmx.blueprint.core</artifactId>
-                <version>1.2.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.jmx</groupId>
-                <artifactId>org.apache.aries.jmx.core</artifactId>
-                <version>1.1.8</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.jmx</groupId>
-                <artifactId>org.apache.aries.jmx.whiteboard</artifactId>
-                <version>1.2.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.jndi</groupId>
-                <artifactId>org.apache.aries.jndi.api</artifactId>
-                <version>1.1.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.jndi</groupId>
-                <artifactId>org.apache.aries.jndi.core</artifactId>
-                <version>1.0.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.jndi</groupId>
-                <artifactId>org.apache.aries.jndi.legacy.support</artifactId>
-                <version>1.0.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.jndi</groupId>
-                <artifactId>org.apache.aries.jndi.rmi</artifactId>
-                <version>1.0.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.jndi</groupId>
-                <artifactId>org.apache.aries.jndi.url</artifactId>
-                <version>1.1.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.jpa.javax.persistence</groupId>
-                <artifactId>javax.persistence_2.1</artifactId>
-                <version>2.7.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.jpa</groupId>
-                <artifactId>org.apache.aries.jpa.api</artifactId>
-                <version>2.7.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.jpa</groupId>
-                <artifactId>org.apache.aries.jpa.blueprint</artifactId>
-                <version>2.7.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.jpa</groupId>
-                <artifactId>org.apache.aries.jpa.container</artifactId>
-                <version>2.7.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.jpa</groupId>
-                <artifactId>org.apache.aries.jpa.eclipselink.adapter</artifactId>
-                <version>2.7.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.jpa</groupId>
-                <artifactId>org.apache.aries.jpa.support</artifactId>
-                <version>2.7.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries</groupId>
-                <artifactId>org.apache.aries.util</artifactId>
-                <version>1.1.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.proxy</groupId>
-                <artifactId>org.apache.aries.proxy</artifactId>
-                <version>1.1.4</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.proxy</groupId>
-                <artifactId>org.apache.aries.proxy</artifactId>
-                <version>1.1.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.quiesce</groupId>
-                <artifactId>org.apache.aries.quiesce.api</artifactId>
-                <version>1.0.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.spifly</groupId>
-                <artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId>
-                <version>1.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.subsystem</groupId>
-                <artifactId>org.apache.aries.subsystem.api</artifactId>
-                <version>2.0.10</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.subsystem</groupId>
-                <artifactId>org.apache.aries.subsystem.core</artifactId>
-                <version>2.0.10</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.transaction</groupId>
-                <artifactId>org.apache.aries.transaction.blueprint</artifactId>
-                <version>1.1.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.transaction</groupId>
-                <artifactId>org.apache.aries.transaction.blueprint</artifactId>
-                <version>2.2.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.transaction</groupId>
-                <artifactId>org.apache.aries.transaction.manager</artifactId>
-                <version>1.3.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-dbcp2</artifactId>
-                <version>2.1.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-lang3</artifactId>
-                <version>3.9</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-pool2</artifactId>
-                <version>2.5.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-pool2</artifactId>
-                <version>2.6.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-text</artifactId>
-                <version>1.8</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.deltaspike.core</groupId>
-                <artifactId>deltaspike-core-api</artifactId>
-                <version>1.8.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.deltaspike.core</groupId>
-                <artifactId>deltaspike-core-impl</artifactId>
-                <version>1.8.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.deltaspike.modules</groupId>
-                <artifactId>deltaspike-data-module-api</artifactId>
-                <version>1.8.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.deltaspike.modules</groupId>
-                <artifactId>deltaspike-data-module-impl</artifactId>
-                <version>1.8.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.deltaspike.modules</groupId>
-                <artifactId>deltaspike-jpa-module-api</artifactId>
-                <version>1.8.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.deltaspike.modules</groupId>
-                <artifactId>deltaspike-jpa-module-impl</artifactId>
-                <version>1.8.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.deltaspike.modules</groupId>
-                <artifactId>deltaspike-partial-bean-module-api</artifactId>
-                <version>1.8.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.deltaspike.modules</groupId>
-                <artifactId>deltaspike-partial-bean-module-impl</artifactId>
-                <version>1.8.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.deltaspike.modules</groupId>
-                <artifactId>deltaspike-proxy-module-api</artifactId>
-                <version>1.8.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.deltaspike.modules</groupId>
-                <artifactId>deltaspike-proxy-module-impl-asm5</artifactId>
-                <version>1.8.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.derby</groupId>
-                <artifactId>derby</artifactId>
-                <version>10.14.2.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.derby</groupId>
-                <artifactId>derbyclient</artifactId>
-                <version>10.14.2.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.bundlerepository</artifactId>
-                <version>2.0.10</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.configadmin</artifactId>
-                <version>1.9.14</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.coordinator</artifactId>
-                <version>1.0.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.dependencymanager</artifactId>
-                <version>4.4.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.fileinstall</artifactId>
-                <version>3.6.4</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.framework.security</artifactId>
-                <version>2.6.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.framework</artifactId>
-                <version>5.6.12</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.http.jetty</artifactId>
-                <version>4.0.8</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.http.servlet-api</artifactId>
-                <version>1.1.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.http.whiteboard</artifactId>
-                <version>4.0.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.httplite.complete</artifactId>
-                <version>0.1.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.inventory</artifactId>
-                <version>1.0.4</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.metatype</artifactId>
-                <version>1.2.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.scr</artifactId>
-                <version>2.1.16</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.webconsole.plugins.ds</artifactId>
-                <version>2.1.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.webconsole.plugins.event</artifactId>
-                <version>1.1.8</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.webconsole.plugins.memoryusage</artifactId>
-                <version>1.0.10</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>org.osgi.service.obr</artifactId>
-                <version>1.0.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.bundles</groupId>
-                <artifactId>commons-discovery</artifactId>
-                <version>0.4_1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.components</groupId>
-                <artifactId>geronimo-connector</artifactId>
-                <version>3.1.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.components</groupId>
-                <artifactId>geronimo-connector</artifactId>
-                <version>3.1.4</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-annotation_1.0_spec</artifactId>
-                <version>1.1.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-annotation_1.1_spec</artifactId>
-                <version>1.0.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-atinject_1.0_spec</artifactId>
-                <version>1.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-ejb_3.1_spec</artifactId>
-                <version>1.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-el_1.0_spec</artifactId>
-                <version>1.0.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-j2ee-connector_1.6_spec</artifactId>
-                <version>1.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
-                <version>1.0.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-jaspic_1.0_spec</artifactId>
-                <version>1.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
-                <version>2.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-jaxws_2.2_spec</artifactId>
-                <version>1.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-jms_1.1_spec</artifactId>
-                <version>1.1.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-jpa_2.0_spec</artifactId>
-                <version>1.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-jta_1.1_spec</artifactId>
-                <version>1.1.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-osgi-registry</artifactId>
-                <version>1.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-stax-api_1.2_spec</artifactId>
-                <version>1.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-validation_1.0_spec</artifactId>
-                <version>1.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.audit</groupId>
-                <artifactId>org.apache.karaf.audit.core</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.bundle</groupId>
-                <artifactId>org.apache.karaf.bundle.blueprintstate</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.bundle</groupId>
-                <artifactId>org.apache.karaf.bundle.core</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.config</groupId>
-                <artifactId>org.apache.karaf.config.core</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.deployer</groupId>
-                <artifactId>org.apache.karaf.deployer.blueprint</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.deployer</groupId>
-                <artifactId>org.apache.karaf.deployer.features</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.deployer</groupId>
-                <artifactId>org.apache.karaf.deployer.kar</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.deployer</groupId>
-                <artifactId>org.apache.karaf.deployer.wrap</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.diagnostic</groupId>
-                <artifactId>org.apache.karaf.diagnostic.boot</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.diagnostic</groupId>
-                <artifactId>org.apache.karaf.diagnostic.core</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.docker</groupId>
-                <artifactId>org.apache.karaf.docker.core</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.features</groupId>
-                <artifactId>org.apache.karaf.features.command</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.features</groupId>
-                <artifactId>org.apache.karaf.features.core</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.features</groupId>
-                <artifactId>org.apache.karaf.features.extension</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.http</groupId>
-                <artifactId>org.apache.karaf.http.core</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.instance</groupId>
-                <artifactId>org.apache.karaf.instance.core</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.jaas.blueprint</groupId>
-                <artifactId>org.apache.karaf.jaas.blueprint.config</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.jaas.blueprint</groupId>
-                <artifactId>org.apache.karaf.jaas.blueprint.jasypt</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.jaas</groupId>
-                <artifactId>org.apache.karaf.jaas.boot</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.jaas</groupId>
-                <artifactId>org.apache.karaf.jaas.command</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.jaas</groupId>
-                <artifactId>org.apache.karaf.jaas.config</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.jaas</groupId>
-                <artifactId>org.apache.karaf.jaas.jasypt</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.jaas</groupId>
-                <artifactId>org.apache.karaf.jaas.modules</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.jdbc</groupId>
-                <artifactId>org.apache.karaf.jdbc.core</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.jms</groupId>
-                <artifactId>org.apache.karaf.jms.core</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.jndi</groupId>
-                <artifactId>org.apache.karaf.jndi.core</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.kar</groupId>
-                <artifactId>org.apache.karaf.kar.core</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.log</groupId>
-                <artifactId>org.apache.karaf.log.core</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.management</groupId>
-                <artifactId>org.apache.karaf.management.server</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf</groupId>
-                <artifactId>manual</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.maven</groupId>
-                <artifactId>org.apache.karaf.maven.core</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.obr</groupId>
-                <artifactId>org.apache.karaf.obr.core</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf</groupId>
-                <artifactId>org.apache.karaf.client</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf</groupId>
-                <artifactId>org.apache.karaf.event</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.package</groupId>
-                <artifactId>org.apache.karaf.package.core</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.profile</groupId>
-                <artifactId>org.apache.karaf.profile.core</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.scheduler</groupId>
-                <artifactId>org.apache.karaf.scheduler.core</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.scr</groupId>
-                <artifactId>org.apache.karaf.scr.management</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.scr</groupId>
-                <artifactId>org.apache.karaf.scr.state</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.service</groupId>
-                <artifactId>org.apache.karaf.service.core</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.service</groupId>
-                <artifactId>org.apache.karaf.service.guard</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.services</groupId>
-                <artifactId>org.apache.karaf.services.coordinator</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.services</groupId>
-                <artifactId>org.apache.karaf.services.eventadmin</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.shell</groupId>
-                <artifactId>org.apache.karaf.shell.commands</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.shell</groupId>
-                <artifactId>org.apache.karaf.shell.console</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.shell</groupId>
-                <artifactId>org.apache.karaf.shell.core</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.shell</groupId>
-                <artifactId>org.apache.karaf.shell.ssh</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.shell</groupId>
-                <artifactId>org.apache.karaf.shell.table</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.subsystem</groupId>
-                <artifactId>org.apache.karaf.subsystem.core</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.system</groupId>
-                <artifactId>org.apache.karaf.system.core</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.tooling</groupId>
-                <artifactId>org.apache.karaf.tools.utils</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.web</groupId>
-                <artifactId>org.apache.karaf.web.core</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.webconsole</groupId>
-                <artifactId>org.apache.karaf.webconsole.console</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.webconsole</groupId>
-                <artifactId>org.apache.karaf.webconsole.features</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.webconsole</groupId>
-                <artifactId>org.apache.karaf.webconsole.gogo</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.webconsole</groupId>
-                <artifactId>org.apache.karaf.webconsole.http</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.webconsole</groupId>
-                <artifactId>org.apache.karaf.webconsole.instance</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.wrapper</groupId>
-                <artifactId>org.apache.karaf.wrapper.core</artifactId>
-                <version>4.2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.myfaces.core</groupId>
-                <artifactId>myfaces-api</artifactId>
-                <version>2.2.12</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.myfaces.core</groupId>
-                <artifactId>myfaces-impl</artifactId>
-                <version>2.2.12</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.openjpa</groupId>
-                <artifactId>openjpa</artifactId>
-                <version>3.0.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.openwebbeans</groupId>
-                <artifactId>openwebbeans-el22</artifactId>
-                <version>1.7.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.openwebbeans</groupId>
-                <artifactId>openwebbeans-impl</artifactId>
-                <version>1.7.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.openwebbeans</groupId>
-                <artifactId>openwebbeans-spi</artifactId>
-                <version>1.7.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.openwebbeans</groupId>
-                <artifactId>openwebbeans-web</artifactId>
-                <version>1.7.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.servicemix.bundles</groupId>
-                <artifactId>org.apache.servicemix.bundles.c3p0</artifactId>
-                <version>0.9.5.2_1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.servicemix.bundles</groupId>
-                <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
-                <version>3.2.4_1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.servicemix.bundles</groupId>
-                <artifactId>org.apache.servicemix.bundles.commons-digester</artifactId>
-                <version>1.8_4</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.servicemix.bundles</groupId>
-                <artifactId>org.apache.servicemix.bundles.jasypt-spring31</artifactId>
-                <version>1.9.2_1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.servicemix.bundles</groupId>
-                <artifactId>org.apache.servicemix.bundles.jasypt</artifactId>
-                <version>1.9.2_1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.servicemix.bundles</groupId>
-                <artifactId>org.apache.servicemix.bundles.javax-inject</artifactId>
-                <version>1_2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.servicemix.bundles</groupId>
-                <artifactId>org.apache.servicemix.bundles.jsr305</artifactId>
-                <version>1.3.9_1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.servicemix.bundles</groupId>
-                <artifactId>org.apache.servicemix.bundles.not-yet-commons-ssl</artifactId>
-                <version>0.3.11_1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.servicemix.bundles</groupId>
-                <artifactId>org.apache.servicemix.bundles.serp</artifactId>
-                <version>1.14.1_1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.servicemix.specs</groupId>
-                <artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
-                <version>2.9.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.servicemix.specs</groupId>
-                <artifactId>org.apache.servicemix.specs.java-persistence-api-2.0</artifactId>
-                <version>2.9.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.servicemix.specs</groupId>
-                <artifactId>org.apache.servicemix.specs.javamail-api-1.4</artifactId>
-                <version>2.9.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.servicemix.specs</groupId>
-                <artifactId>org.apache.servicemix.specs.jaxb-api-2.2</artifactId>
-                <version>2.9.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.servicemix.specs</groupId>
-                <artifactId>org.apache.servicemix.specs.jaxp-api-1.3</artifactId>
-                <version>2.9.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.servicemix.specs</groupId>
-                <artifactId>org.apache.servicemix.specs.jsr250-1.0</artifactId>
-                <version>2.9.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.servicemix.specs</groupId>
-                <artifactId>org.apache.servicemix.specs.jsr303-api-1.0.0</artifactId>
-                <version>2.9.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.servicemix.specs</groupId>
-                <artifactId>org.apache.servicemix.specs.saaj-api-1.3</artifactId>
-                <version>2.9.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.shiro</groupId>
-                <artifactId>shiro-core</artifactId>
-                <version>1.3.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.shiro</groupId>
-                <artifactId>shiro-web</artifactId>
-                <version>1.3.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.sshd</groupId>
-                <artifactId>sshd-core</artifactId>
-                <version>1.7.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.sshd</groupId>
-                <artifactId>sshd-netty</artifactId>
-                <version>2.3.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.sshd</groupId>
-                <artifactId>sshd-osgi</artifactId>
-                <version>2.3.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.xbean</groupId>
-                <artifactId>xbean-asm5-shaded</artifactId>
-                <version>4.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.xbean</groupId>
-                <artifactId>xbean-asm6-shaded</artifactId>
-                <version>4.9</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.xbean</groupId>
-                <artifactId>xbean-asm7-shaded</artifactId>
-                <version>4.12</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.xbean</groupId>
-                <artifactId>xbean-bundleutils</artifactId>
-                <version>4.12</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.xbean</groupId>
-                <artifactId>xbean-finder-shaded</artifactId>
-                <version>4.12</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.xbean</groupId>
-                <artifactId>xbean-finder</artifactId>
-                <version>4.12</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.xbean</groupId>
-                <artifactId>xbean-naming</artifactId>
-                <version>4.14</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.xbean</groupId>
-                <artifactId>xbean-reflect</artifactId>
-                <version>4.12</version>
-            </dependency>
-            <dependency>
-                <groupId>org.checkerframework</groupId>
-                <artifactId>checker-qual</artifactId>
-                <version>2.5.8</version>
-            </dependency>
-            <dependency>
-                <groupId>org.codehaus.groovy</groupId>
-                <artifactId>groovy-all</artifactId>
-                <version>2.4.12</version>
-            </dependency>
-            <dependency>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>animal-sniffer-annotations</artifactId>
-                <version>1.17</version>
-            </dependency>
-            <dependency>
-                <groupId>org.codehaus.woodstox</groupId>
-                <artifactId>stax2-api</artifactId>
-                <version>4.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.dom4j</groupId>
-                <artifactId>dom4j</artifactId>
-                <version>2.1.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jdt.core.compiler</groupId>
-                <artifactId>ecj</artifactId>
-                <version>4.5.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jdt</groupId>
-                <artifactId>org.eclipse.jdt.annotation</artifactId>
-                <version>2.2.100</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty.aggregate</groupId>
-                <artifactId>jetty-all-server</artifactId>
-                <version>8.1.14.v20131031</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty.alpn</groupId>
-                <artifactId>alpn-api</artifactId>
-                <version>1.1.2.v20150522</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty.http2</groupId>
-                <artifactId>http2-common</artifactId>
-                <version>9.4.18.v20190429</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty.http2</groupId>
-                <artifactId>http2-hpack</artifactId>
-                <version>9.4.18.v20190429</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty.http2</groupId>
-                <artifactId>http2-server</artifactId>
-                <version>9.4.18.v20190429</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-alpn-server</artifactId>
-                <version>9.4.18.v20190429</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-client</artifactId>
-                <version>9.4.18.v20190429</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-continuation</artifactId>
-                <version>9.4.18.v20190429</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-deploy</artifactId>
-                <version>9.4.18.v20190429</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-http</artifactId>
-                <version>9.4.18.v20190429</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-io</artifactId>
-                <version>9.4.18.v20190429</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-jaas</artifactId>
-                <version>9.4.18.v20190429</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-jaspi</artifactId>
-                <version>9.4.18.v20190429</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-jmx</artifactId>
-                <version>9.4.18.v20190429</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-jndi</artifactId>
-                <version>9.4.18.v20190429</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-plus</artifactId>
-                <version>9.4.18.v20190429</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-rewrite</artifactId>
-                <version>9.4.18.v20190429</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-security</artifactId>
-                <version>9.4.18.v20190429</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-server</artifactId>
-                <version>9.4.18.v20190429</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-servlet</artifactId>
-                <version>9.4.18.v20190429</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-servlets</artifactId>
-                <version>9.4.18.v20190429</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-util-ajax</artifactId>
-                <version>9.4.18.v20190429</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-util</artifactId>
-                <version>9.4.18.v20190429</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-webapp</artifactId>
-                <version>9.4.18.v20190429</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-xml</artifactId>
-                <version>9.4.18.v20190429</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty.osgi</groupId>
-                <artifactId>jetty-osgi-alpn</artifactId>
-                <version>9.4.18.v20190429</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty.websocket</groupId>
-                <artifactId>javax-websocket-client-impl</artifactId>
-                <version>9.4.18.v20190429</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty.websocket</groupId>
-                <artifactId>javax-websocket-server-impl</artifactId>
-                <version>9.4.18.v20190429</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty.websocket</groupId>
-                <artifactId>websocket-api</artifactId>
-                <version>9.4.18.v20190429</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty.websocket</groupId>
-                <artifactId>websocket-client</artifactId>
-                <version>9.4.18.v20190429</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty.websocket</groupId>
-                <artifactId>websocket-common</artifactId>
-                <version>9.4.18.v20190429</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty.websocket</groupId>
-                <artifactId>websocket-server</artifactId>
-                <version>9.4.18.v20190429</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty.websocket</groupId>
-                <artifactId>websocket-servlet</artifactId>
-                <version>9.4.18.v20190429</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.persistence</groupId>
-                <artifactId>javax.persistence</artifactId>
-                <version>2.1.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.persistence</groupId>
-                <artifactId>javax.persistence</artifactId>
-                <version>2.2.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.persistence</groupId>
-                <artifactId>org.eclipse.persistence.antlr</artifactId>
-                <version>2.7.4</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.persistence</groupId>
-                <artifactId>org.eclipse.persistence.asm</artifactId>
-                <version>2.7.4</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.persistence</groupId>
-                <artifactId>org.eclipse.persistence.core</artifactId>
-                <version>2.7.4</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.persistence</groupId>
-                <artifactId>org.eclipse.persistence.jpa.jpql</artifactId>
-                <version>2.7.4</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.persistence</groupId>
-                <artifactId>org.eclipse.persistence.jpa</artifactId>
-                <version>2.7.4</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.platform</groupId>
-                <artifactId>org.eclipse.osgi</artifactId>
-                <version>3.12.100</version>
-            </dependency>
-            <dependency>
-                <groupId>org.fusesource.hawtbuf</groupId>
-                <artifactId>hawtbuf</artifactId>
-                <version>1.11</version>
-            </dependency>
-            <dependency>
-                <groupId>org.fusesource.jansi</groupId>
-                <artifactId>jansi</artifactId>
-                <version>1.18</version>
-            </dependency>
-            <dependency>
-                <groupId>org.glassfish.hk2.external</groupId>
-                <artifactId>aopalliance-repackaged</artifactId>
-                <version>2.5.0-b32</version>
-            </dependency>
-            <dependency>
-                <groupId>org.glassfish.hk2.external</groupId>
-                <artifactId>javax.inject</artifactId>
-                <version>2.5.0-b32</version>
-            </dependency>
-            <dependency>
-                <groupId>org.glassfish.hk2</groupId>
-                <artifactId>hk2-api</artifactId>
-                <version>2.5.0-b32</version>
-            </dependency>
-            <dependency>
-                <groupId>org.glassfish.hk2</groupId>
-                <artifactId>hk2-locator</artifactId>
-                <version>2.5.0-b32</version>
-            </dependency>
-            <dependency>
-                <groupId>org.glassfish.hk2</groupId>
-                <artifactId>hk2-utils</artifactId>
-                <version>2.5.0-b32</version>
-            </dependency>
-            <dependency>
-                <groupId>org.glassfish.hk2</groupId>
-                <artifactId>osgi-resource-locator</artifactId>
-                <version>1.0.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.glassfish</groupId>
-                <artifactId>javax.el</artifactId>
-                <version>3.0.1-b09</version>
-            </dependency>
-            <dependency>
-                <groupId>org.glassfish.jersey.bundles.repackaged</groupId>
-                <artifactId>jersey-guava</artifactId>
-                <version>2.25.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.glassfish.jersey.containers</groupId>
-                <artifactId>jersey-container-servlet-core</artifactId>
-                <version>2.25.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.glassfish.jersey.containers</groupId>
-                <artifactId>jersey-container-servlet</artifactId>
-                <version>2.25.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.glassfish.jersey.core</groupId>
-                <artifactId>jersey-client</artifactId>
-                <version>2.25.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.glassfish.jersey.core</groupId>
-                <artifactId>jersey-common</artifactId>
-                <version>2.25.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.glassfish.jersey.core</groupId>
-                <artifactId>jersey-server</artifactId>
-                <version>2.25.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.glassfish.jersey.media</groupId>
-                <artifactId>jersey-media-jaxb</artifactId>
-                <version>2.25.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.hibernate.common</groupId>
-                <artifactId>hibernate-commons-annotations</artifactId>
-                <version>5.1.0.Final</version>
-            </dependency>
-            <dependency>
-                <groupId>org.hibernate</groupId>
-                <artifactId>hibernate-core</artifactId>
-                <version>5.4.2.Final</version>
-            </dependency>
-            <dependency>
-                <groupId>org.hibernate</groupId>
-                <artifactId>hibernate-envers</artifactId>
-                <version>5.4.2.Final</version>
-            </dependency>
-            <dependency>
-                <groupId>org.hibernate</groupId>
-                <artifactId>hibernate-osgi</artifactId>
-                <version>5.4.2.Final</version>
-            </dependency>
-            <dependency>
-                <groupId>org.hibernate.validator</groupId>
-                <artifactId>hibernate-validator</artifactId>
-                <version>6.0.16.Final</version>
-            </dependency>
-            <dependency>
-                <groupId>org.hsqldb</groupId>
-                <artifactId>hsqldb</artifactId>
-                <version>2.3.4</version>
-            </dependency>
-            <dependency>
-                <groupId>org.iq80.leveldb</groupId>
-                <artifactId>leveldb</artifactId>
-                <version>0.10</version>
-            </dependency>
-            <dependency>
-                <groupId>org.javamoney</groupId>
-                <artifactId>moneta</artifactId>
-                <version>1.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.javassist</groupId>
-                <artifactId>javassist</artifactId>
-                <version>3.24.0-GA</version>
-            </dependency>
-            <dependency>
-                <groupId>org.javassist</groupId>
-                <artifactId>javassist</artifactId>
-                <version>3.26.0-GA</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jboss.classfilewriter</groupId>
-                <artifactId>jboss-classfilewriter</artifactId>
-                <version>1.1.2.Final</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jboss</groupId>
-                <artifactId>jandex</artifactId>
-                <version>2.0.5.Final</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jboss.logging</groupId>
-                <artifactId>jboss-logging</artifactId>
-                <version>3.3.2.Final</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jboss.narayana.osgi</groupId>
-                <artifactId>narayana-osgi-jta</artifactId>
-                <version>5.8.2.Final</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jboss.spec.javax.transaction</groupId>
-                <artifactId>jboss-transaction-api_1.2_spec</artifactId>
-                <version>1.1.1.Final</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jboss.weld</groupId>
-                <artifactId>weld-osgi-bundle</artifactId>
-                <version>2.4.8.Final</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jboss.xnio</groupId>
-                <artifactId>xnio-api</artifactId>
-                <version>3.3.8.Final</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jboss.xnio</groupId>
-                <artifactId>xnio-nio</artifactId>
-                <version>3.3.8.Final</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jline</groupId>
-                <artifactId>jline-builtins</artifactId>
-                <version>3.11.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jline</groupId>
-                <artifactId>jline-reader</artifactId>
-                <version>3.11.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jline</groupId>
-                <artifactId>jline-terminal-jansi</artifactId>
-                <version>3.11.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jline</groupId>
-                <artifactId>jline-terminal</artifactId>
-                <version>3.11.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jline</groupId>
-                <artifactId>jline</artifactId>
-                <version>3.11.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jolokia</groupId>
-                <artifactId>jolokia-core</artifactId>
-                <version>1.6.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jolokia</groupId>
-                <artifactId>jolokia-jsr160</artifactId>
-                <version>1.6.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jolokia</groupId>
-                <artifactId>jolokia-osgi</artifactId>
-                <version>1.6.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.json</groupId>
-                <artifactId>json</artifactId>
-                <version>20131018</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jsoup</groupId>
-                <artifactId>jsoup</artifactId>
-                <version>1.8.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.mariadb.jdbc</groupId>
-                <artifactId>mariadb-java-client</artifactId>
-                <version>1.5.9</version>
-            </dependency>
-            <dependency>
-                <groupId>org.messaginghub</groupId>
-                <artifactId>pooled-jms</artifactId>
-                <version>1.0.5</version>
-            </dependency>
-            <dependency>
-                <groupId>org.objenesis</groupId>
-                <artifactId>objenesis</artifactId>
-                <version>2.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.aaa</groupId>
-                <artifactId>aaa-authn-api</artifactId>
-                <version>0.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.aaa</groupId>
-                <artifactId>aaa-cert</artifactId>
-                <version>0.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.aaa</groupId>
-                <artifactId>aaa-cli</artifactId>
-                <version>0.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.aaa</groupId>
-                <artifactId>aaa-encrypt-service-impl</artifactId>
-                <version>0.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.aaa</groupId>
-                <artifactId>aaa-encrypt-service</artifactId>
-                <version>0.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.aaa</groupId>
-                <artifactId>aaa-filterchain</artifactId>
-                <version>0.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.aaa</groupId>
-                <artifactId>aaa-password-service-api</artifactId>
-                <version>0.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.aaa</groupId>
-                <artifactId>aaa-password-service-impl</artifactId>
-                <version>0.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.aaa</groupId>
-                <artifactId>aaa-shiro-api</artifactId>
-                <version>0.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.aaa</groupId>
-                <artifactId>aaa-shiro</artifactId>
-                <version>0.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.aaa.web</groupId>
-                <artifactId>servlet-api</artifactId>
-                <version>0.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.aaa.web</groupId>
-                <artifactId>servlet-jersey2</artifactId>
-                <version>0.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.aaa.web</groupId>
-                <artifactId>web-api</artifactId>
-                <version>0.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.aaa.web</groupId>
-                <artifactId>web-osgi-impl</artifactId>
-                <version>0.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>benchmark-api</artifactId>
-                <version>1.8.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>blueprint</artifactId>
-                <version>0.11.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>cds-access-api</artifactId>
-                <version>1.6.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>cds-access-client</artifactId>
-                <version>1.6.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>cds-dom-api</artifactId>
-                <version>1.6.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>dsbenchmark</artifactId>
-                <version>1.8.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>mdsal-trace-api</artifactId>
-                <version>1.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>mdsal-trace-binding-impl</artifactId>
-                <version>1.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>mdsal-trace-cli</artifactId>
-                <version>1.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>mdsal-trace-dom-impl</artifactId>
-                <version>1.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>messagebus-api</artifactId>
-                <version>1.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>messagebus-impl</artifactId>
-                <version>1.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>messagebus-spi</artifactId>
-                <version>1.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>messagebus-util</artifactId>
-                <version>1.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller.model</groupId>
-                <artifactId>model-inventory</artifactId>
-                <version>1.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller.model</groupId>
-                <artifactId>model-topology</artifactId>
-                <version>1.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>netty-config-api</artifactId>
-                <version>0.11.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>netty-event-executor-config</artifactId>
-                <version>0.11.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>netty-threadgroup-config</artifactId>
-                <version>0.11.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>netty-timer-config</artifactId>
-                <version>0.11.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>ntfbenchmark</artifactId>
-                <version>1.8.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>rpcbenchmark</artifactId>
-                <version>1.8.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>sal-akka-raft</artifactId>
-                <version>1.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>sal-akka-segmented-journal</artifactId>
-                <version>1.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>sal-binding-api</artifactId>
-                <version>1.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>sal-binding-broker-impl</artifactId>
-                <version>1.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>sal-binding-util</artifactId>
-                <version>1.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>sal-broker-impl</artifactId>
-                <version>1.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>sal-cluster-admin-api</artifactId>
-                <version>1.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>sal-cluster-admin-impl</artifactId>
-                <version>1.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>sal-clustering-commons</artifactId>
-                <version>1.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>sal-common-api</artifactId>
-                <version>1.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>sal-common-impl</artifactId>
-                <version>1.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>sal-common-util</artifactId>
-                <version>1.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>sal-core-api</artifactId>
-                <version>1.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>sal-core-compat</artifactId>
-                <version>1.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>sal-core-spi</artifactId>
-                <version>1.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>sal-distributed-datastore</artifactId>
-                <version>1.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>sal-inmemory-datastore</artifactId>
-                <version>1.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>sal-remoterpc-connector</artifactId>
-                <version>1.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller.samples</groupId>
-                <artifactId>clustering-it-model</artifactId>
-                <version>1.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller.samples</groupId>
-                <artifactId>clustering-it-provider</artifactId>
-                <version>1.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller.samples</groupId>
-                <artifactId>sample-toaster-consumer</artifactId>
-                <version>1.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller.samples</groupId>
-                <artifactId>sample-toaster-provider</artifactId>
-                <version>1.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller.samples</groupId>
-                <artifactId>sample-toaster</artifactId>
-                <version>1.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>threadpool-config-api</artifactId>
-                <version>0.11.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>threadpool-config-impl</artifactId>
-                <version>0.11.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.daexim</groupId>
-                <artifactId>daexim-akka-infoprovider-impl</artifactId>
-                <version>1.6.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.daexim</groupId>
-                <artifactId>daexim-impl</artifactId>
-                <version>1.6.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.daexim</groupId>
-                <artifactId>daexim-model</artifactId>
-                <version>1.6.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.daexim</groupId>
-                <artifactId>daexim-spi</artifactId>
-                <version>1.6.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.infrautils</groupId>
-                <artifactId>infrautils-util</artifactId>
-                <version>1.6.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.infrautils</groupId>
-                <artifactId>ready-api</artifactId>
-                <version>1.6.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.infrautils</groupId>
-                <artifactId>ready-impl</artifactId>
-                <version>1.6.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-                <artifactId>rfc6991-ietf-inet-types</artifactId>
-                <version>2.0.14</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-                <artifactId>rfc6991-ietf-yang-types</artifactId>
-                <version>2.0.14</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-                <artifactId>rfc6991</artifactId>
-                <version>2.0.14</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-                <artifactId>rfc7895</artifactId>
-                <version>2.0.14</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-                <artifactId>rfc7952</artifactId>
-                <version>2.0.14</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-                <artifactId>rfc8342-ietf-datastores</artifactId>
-                <version>2.0.14</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-                <artifactId>rfc8342-ietf-origin</artifactId>
-                <version>2.0.14</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-                <artifactId>rfc8342</artifactId>
-                <version>2.0.14</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-binding-api</artifactId>
-                <version>4.0.14</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-binding-dom-adapter</artifactId>
-                <version>4.0.14</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-binding-dom-codec-osgi</artifactId>
-                <version>4.0.14</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-binding-dom-codec</artifactId>
-                <version>4.0.14</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-binding-generator-api</artifactId>
-                <version>2.0.14</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-binding-generator-impl</artifactId>
-                <version>2.0.14</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-binding-generator-util</artifactId>
-                <version>2.0.14</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-binding-spec-util</artifactId>
-                <version>2.0.14</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-binding-spi</artifactId>
-                <version>4.0.14</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-binding-util</artifactId>
-                <version>4.0.14</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-common-api</artifactId>
-                <version>4.0.14</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-common-util</artifactId>
-                <version>4.0.14</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-dom-api</artifactId>
-                <version>4.0.14</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-dom-broker</artifactId>
-                <version>4.0.14</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-dom-inmemory-datastore</artifactId>
-                <version>4.0.14</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-dom-schema-service-osgi</artifactId>
-                <version>4.0.14</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-dom-spi</artifactId>
-                <version>4.0.14</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-eos-binding-adapter</artifactId>
-                <version>4.0.14</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-eos-binding-api</artifactId>
-                <version>4.0.14</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-eos-common-api</artifactId>
-                <version>4.0.14</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-eos-common-spi</artifactId>
-                <version>4.0.14</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-eos-dom-api</artifactId>
-                <version>4.0.14</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-eos-dom-simple</artifactId>
-                <version>4.0.14</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-singleton-common-api</artifactId>
-                <version>4.0.14</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-singleton-dom-impl</artifactId>
-                <version>4.0.14</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>general-entity</artifactId>
-                <version>2.0.14</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>ietf-restconf</artifactId>
-                <version>2013.10.19.16.14</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>ietf-ted</artifactId>
-                <version>2013.10.21.16.14</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>ietf-topology-isis</artifactId>
-                <version>2013.10.21.16.14</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>ietf-topology-l3-unicast-igp</artifactId>
-                <version>2013.10.21.16.14</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>ietf-topology-ospf</artifactId>
-                <version>2013.10.21.16.14</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>ietf-topology</artifactId>
-                <version>2013.10.21.16.14</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>ietf-type-util</artifactId>
-                <version>3.0.14</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>yang-ext</artifactId>
-                <version>2013.09.07.16.14</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>yang-binding</artifactId>
-                <version>2.0.14</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>aaa-authn-odl-plugin</artifactId>
-                <version>1.7.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>callhome-model</artifactId>
-                <version>1.7.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>callhome-protocol</artifactId>
-                <version>1.7.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>callhome-provider</artifactId>
-                <version>1.7.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>ietf-netconf-monitoring-extension</artifactId>
-                <version>1.7.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>ietf-netconf-monitoring</artifactId>
-                <version>1.7.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>ietf-netconf-nmda</artifactId>
-                <version>1.7.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>ietf-netconf-notifications</artifactId>
-                <version>1.7.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>ietf-netconf-with-defaults</artifactId>
-                <version>1.7.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>ietf-netconf</artifactId>
-                <version>1.7.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>ietf-restconf-monitoring</artifactId>
-                <version>1.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>ietf-restconf</artifactId>
-                <version>1.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>mdsal-netconf-connector</artifactId>
-                <version>1.7.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>mdsal-netconf-impl</artifactId>
-                <version>1.7.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>mdsal-netconf-monitoring</artifactId>
-                <version>1.7.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>mdsal-netconf-notification</artifactId>
-                <version>1.7.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>mdsal-netconf-ssh</artifactId>
-                <version>1.7.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>mdsal-netconf-tcp</artifactId>
-                <version>1.7.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>mdsal-netconf-yang-library</artifactId>
-                <version>1.7.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>messagebus-netconf</artifactId>
-                <version>1.7.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>netconf-api</artifactId>
-                <version>1.7.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>netconf-auth</artifactId>
-                <version>1.7.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>netconf-client</artifactId>
-                <version>1.7.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>netconf-config</artifactId>
-                <version>1.7.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>netconf-console</artifactId>
-                <version>1.7.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>netconf-impl</artifactId>
-                <version>1.7.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>netconf-mapping-api</artifactId>
-                <version>1.7.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>netconf-netty-util</artifactId>
-                <version>1.7.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>netconf-notifications-api</artifactId>
-                <version>1.7.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>netconf-topology-config</artifactId>
-                <version>1.7.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>netconf-topology-singleton</artifactId>
-                <version>1.7.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>netconf-topology</artifactId>
-                <version>1.7.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>netconf-util</artifactId>
-                <version>1.7.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>restconf-common-models</artifactId>
-                <version>1.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>restconf-common</artifactId>
-                <version>1.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>restconf-nb-bierman02</artifactId>
-                <version>1.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>restconf-nb-rfc8040</artifactId>
-                <version>1.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>sal-netconf-connector</artifactId>
-                <version>1.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>sal-rest-docgen</artifactId>
-                <version>1.10.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>shaded-exificient</artifactId>
-                <version>1.7.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>shaded-sshd</artifactId>
-                <version>1.7.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>yanglib</artifactId>
-                <version>1.7.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.odlparent</groupId>
-                <artifactId>bcpkix-framework-ext</artifactId>
-                <version>5.0.7</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.odlparent</groupId>
-                <artifactId>bcprov-framework-ext</artifactId>
-                <version>5.0.7</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.odlparent</groupId>
-                <artifactId>karaf.branding</artifactId>
-                <version>5.0.7</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.odlparent</groupId>
-                <artifactId>leveldbjni-all</artifactId>
-                <version>5.0.7</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.odlparent</groupId>
-                <artifactId>logging-markers</artifactId>
-                <version>5.0.7</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>concepts</artifactId>
-                <version>3.0.11</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>odlext-model-api</artifactId>
-                <version>3.0.11</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>odlext-parser-support</artifactId>
-                <version>3.0.11</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>openconfig-model-api</artifactId>
-                <version>3.0.11</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>openconfig-parser-support</artifactId>
-                <version>3.0.11</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>rfc6241-model-api</artifactId>
-                <version>1.0.11</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>rfc6241-parser-support</artifactId>
-                <version>1.0.11</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>rfc6536-model-api</artifactId>
-                <version>3.0.11</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>rfc6536-parser-support</artifactId>
-                <version>3.0.11</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>rfc7952-data-api</artifactId>
-                <version>3.0.11</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>rfc7952-data-util</artifactId>
-                <version>3.0.11</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>rfc7952-model-api</artifactId>
-                <version>3.0.11</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>rfc7952-parser-support</artifactId>
-                <version>3.0.11</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>rfc8040-model-api</artifactId>
-                <version>3.0.11</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>rfc8040-parser-support</artifactId>
-                <version>3.0.11</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>rfc8528-data-api</artifactId>
-                <version>3.0.11</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>rfc8528-data-util</artifactId>
-                <version>3.0.11</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>rfc8528-model-api</artifactId>
-                <version>3.0.11</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>rfc8528-parser-support</artifactId>
-                <version>3.0.11</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>util</artifactId>
-                <version>3.0.11</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-common</artifactId>
-                <version>3.0.11</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-data-api</artifactId>
-                <version>3.0.11</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-data-codec-gson</artifactId>
-                <version>3.0.11</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-data-codec-xml</artifactId>
-                <version>3.0.11</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-data-impl</artifactId>
-                <version>3.0.11</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-data-transform</artifactId>
-                <version>3.0.11</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-data-util</artifactId>
-                <version>3.0.11</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-model-api</artifactId>
-                <version>3.0.11</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-model-export</artifactId>
-                <version>3.0.11</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-model-util</artifactId>
-                <version>3.0.11</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-parser-api</artifactId>
-                <version>3.0.11</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-parser-impl</artifactId>
-                <version>3.0.11</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-parser-reactor</artifactId>
-                <version>3.0.11</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-parser-rfc7950</artifactId>
-                <version>3.0.11</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-parser-spi</artifactId>
-                <version>3.0.11</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-xpath-api</artifactId>
-                <version>1.0.11</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-xpath-impl</artifactId>
-                <version>1.0.11</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.base</groupId>
-                <artifactId>ops4j-base</artifactId>
-                <version>1.5.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.cdi</groupId>
-                <artifactId>pax-cdi-api</artifactId>
-                <version>1.1.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.cdi</groupId>
-                <artifactId>pax-cdi-extender</artifactId>
-                <version>1.1.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.cdi</groupId>
-                <artifactId>pax-cdi-extension</artifactId>
-                <version>1.1.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.cdi</groupId>
-                <artifactId>pax-cdi-jetty-openwebbeans</artifactId>
-                <version>1.1.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.cdi</groupId>
-                <artifactId>pax-cdi-jetty-weld</artifactId>
-                <version>1.1.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.cdi</groupId>
-                <artifactId>pax-cdi-openwebbeans</artifactId>
-                <version>1.1.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.cdi</groupId>
-                <artifactId>pax-cdi-spi</artifactId>
-                <version>1.1.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.cdi</groupId>
-                <artifactId>pax-cdi-undertow-openwebbeans</artifactId>
-                <version>1.1.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.cdi</groupId>
-                <artifactId>pax-cdi-undertow-weld</artifactId>
-                <version>1.1.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.cdi</groupId>
-                <artifactId>pax-cdi-web</artifactId>
-                <version>1.1.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.cdi</groupId>
-                <artifactId>pax-cdi-weld</artifactId>
-                <version>1.1.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.jdbc</groupId>
-                <artifactId>pax-jdbc-config</artifactId>
-                <version>1.3.5</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.jdbc</groupId>
-                <artifactId>pax-jdbc-db2</artifactId>
-                <version>1.3.5</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.jdbc</groupId>
-                <artifactId>pax-jdbc-derby</artifactId>
-                <version>1.3.5</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.jdbc</groupId>
-                <artifactId>pax-jdbc-derbyclient</artifactId>
-                <version>1.3.5</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.jdbc</groupId>
-                <artifactId>pax-jdbc-hsqldb</artifactId>
-                <version>1.3.5</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.jdbc</groupId>
-                <artifactId>pax-jdbc-jtds</artifactId>
-                <version>1.3.5</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.jdbc</groupId>
-                <artifactId>pax-jdbc-mariadb</artifactId>
-                <version>1.3.5</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.jdbc</groupId>
-                <artifactId>pax-jdbc-mssql</artifactId>
-                <version>1.3.5</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.jdbc</groupId>
-                <artifactId>pax-jdbc-oracle</artifactId>
-                <version>1.3.5</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.jdbc</groupId>
-                <artifactId>pax-jdbc-pool-aries</artifactId>
-                <version>1.3.5</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.jdbc</groupId>
-                <artifactId>pax-jdbc-pool-c3p0</artifactId>
-                <version>1.3.5</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.jdbc</groupId>
-                <artifactId>pax-jdbc-pool-common</artifactId>
-                <version>1.3.5</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.jdbc</groupId>
-                <artifactId>pax-jdbc-pool-dbcp2</artifactId>
-                <version>1.3.5</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.jdbc</groupId>
-                <artifactId>pax-jdbc-pool-hikaricp</artifactId>
-                <version>1.3.5</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.jdbc</groupId>
-                <artifactId>pax-jdbc-pool-narayana</artifactId>
-                <version>1.3.5</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.jdbc</groupId>
-                <artifactId>pax-jdbc-pool-transx</artifactId>
-                <version>1.3.5</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.jdbc</groupId>
-                <artifactId>pax-jdbc-sqlite</artifactId>
-                <version>1.3.5</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.jdbc</groupId>
-                <artifactId>pax-jdbc-teradata</artifactId>
-                <version>1.3.5</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.jdbc</groupId>
-                <artifactId>pax-jdbc</artifactId>
-                <version>1.3.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.jdbc</groupId>
-                <artifactId>pax-jdbc</artifactId>
-                <version>1.3.5</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.jms</groupId>
-                <artifactId>pax-jms-activemq</artifactId>
-                <version>1.0.4</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.jms</groupId>
-                <artifactId>pax-jms-api</artifactId>
-                <version>1.0.4</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.jms</groupId>
-                <artifactId>pax-jms-artemis</artifactId>
-                <version>1.0.4</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.jms</groupId>
-                <artifactId>pax-jms-config</artifactId>
-                <version>1.0.4</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.jms</groupId>
-                <artifactId>pax-jms-ibmmq</artifactId>
-                <version>1.0.4</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.jms</groupId>
-                <artifactId>pax-jms-oracleaq</artifactId>
-                <version>1.0.4</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.jms</groupId>
-                <artifactId>pax-jms-pool-narayana</artifactId>
-                <version>1.0.4</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.jms</groupId>
-                <artifactId>pax-jms-pool-pooledjms</artifactId>
-                <version>1.0.4</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.jms</groupId>
-                <artifactId>pax-jms-pool-transx</artifactId>
-                <version>1.0.4</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.jpa</groupId>
-                <artifactId>pax-jpa</artifactId>
-                <version>0.3.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.logging</groupId>
-                <artifactId>pax-logging-api</artifactId>
-                <version>1.10.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.logging</groupId>
-                <artifactId>pax-logging-log4j2</artifactId>
-                <version>1.10.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.logging</groupId>
-                <artifactId>pax-logging-logback</artifactId>
-                <version>1.10.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.tipi</groupId>
-                <artifactId>org.ops4j.pax.tipi.tomcat-embed-core</artifactId>
-                <version>8.5.32.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.tipi</groupId>
-                <artifactId>org.ops4j.pax.tipi.tomcat-embed-websocket</artifactId>
-                <version>8.5.32.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.transx</groupId>
-                <artifactId>pax-transx-connector</artifactId>
-                <version>0.4.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.transx</groupId>
-                <artifactId>pax-transx-connector</artifactId>
-                <version>0.4.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.transx</groupId>
-                <artifactId>pax-transx-jdbc</artifactId>
-                <version>0.4.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.transx</groupId>
-                <artifactId>pax-transx-jdbc</artifactId>
-                <version>0.4.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.transx</groupId>
-                <artifactId>pax-transx-jms</artifactId>
-                <version>0.4.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.transx</groupId>
-                <artifactId>pax-transx-jms</artifactId>
-                <version>0.4.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.transx</groupId>
-                <artifactId>pax-transx-tm-api</artifactId>
-                <version>0.4.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.transx</groupId>
-                <artifactId>pax-transx-tm-api</artifactId>
-                <version>0.4.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.transx</groupId>
-                <artifactId>pax-transx-tm-atomikos</artifactId>
-                <version>0.4.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.transx</groupId>
-                <artifactId>pax-transx-tm-atomikos</artifactId>
-                <version>0.4.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.transx</groupId>
-                <artifactId>pax-transx-tm-geronimo</artifactId>
-                <version>0.4.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.transx</groupId>
-                <artifactId>pax-transx-tm-geronimo</artifactId>
-                <version>0.4.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.transx</groupId>
-                <artifactId>pax-transx-tm-narayana</artifactId>
-                <version>0.4.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.transx</groupId>
-                <artifactId>pax-transx-tm-narayana</artifactId>
-                <version>0.4.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.url</groupId>
-                <artifactId>pax-url-aether</artifactId>
-                <version>2.6.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.url</groupId>
-                <artifactId>pax-url-obr</artifactId>
-                <version>2.6.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.url</groupId>
-                <artifactId>pax-url-war</artifactId>
-                <version>2.6.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.url</groupId>
-                <artifactId>pax-url-wrap</artifactId>
-                <version>2.6.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.web</groupId>
-                <artifactId>pax-web-api</artifactId>
-                <version>7.2.10</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.web</groupId>
-                <artifactId>pax-web-deployer</artifactId>
-                <version>7.2.10</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.web</groupId>
-                <artifactId>pax-web-descriptor</artifactId>
-                <version>7.2.10</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.web</groupId>
-                <artifactId>pax-web-extender-war</artifactId>
-                <version>7.2.10</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.web</groupId>
-                <artifactId>pax-web-extender-whiteboard</artifactId>
-                <version>7.2.10</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.web</groupId>
-                <artifactId>pax-web-jetty</artifactId>
-                <version>7.2.10</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.web</groupId>
-                <artifactId>pax-web-jsp</artifactId>
-                <version>7.2.10</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.web</groupId>
-                <artifactId>pax-web-resources-extender</artifactId>
-                <version>7.2.10</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.web</groupId>
-                <artifactId>pax-web-resources-jsf</artifactId>
-                <version>7.2.10</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.web</groupId>
-                <artifactId>pax-web-runtime</artifactId>
-                <version>7.2.10</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.web</groupId>
-                <artifactId>pax-web-spi</artifactId>
-                <version>7.2.10</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.web</groupId>
-                <artifactId>pax-web-tomcat</artifactId>
-                <version>7.2.10</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.web</groupId>
-                <artifactId>pax-web-undertow</artifactId>
-                <version>7.2.10</version>
-            </dependency>
-            <dependency>
-                <groupId>org.osgi</groupId>
-                <artifactId>org.osgi.service.event</artifactId>
-                <version>1.3.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.osgi</groupId>
-                <artifactId>org.osgi.service.jdbc</artifactId>
-                <version>1.0.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.osgi</groupId>
-                <artifactId>org.osgi.util.function</artifactId>
-                <version>1.0.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.osgi</groupId>
-                <artifactId>org.osgi.util.promise</artifactId>
-                <version>1.0.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ow2.asm</groupId>
-                <artifactId>asm-analysis</artifactId>
-                <version>7.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ow2.asm</groupId>
-                <artifactId>asm-commons</artifactId>
-                <version>7.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ow2.asm</groupId>
-                <artifactId>asm-tree</artifactId>
-                <version>7.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ow2.asm</groupId>
-                <artifactId>asm-util</artifactId>
-                <version>7.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ow2.asm</groupId>
-                <artifactId>asm</artifactId>
-                <version>5.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ow2.asm</groupId>
-                <artifactId>asm</artifactId>
-                <version>7.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.postgresql</groupId>
-                <artifactId>postgresql</artifactId>
-                <version>9.4.1212.jre7</version>
-            </dependency>
-            <dependency>
-                <groupId>org.reactivestreams</groupId>
-                <artifactId>reactive-streams</artifactId>
-                <version>1.0.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.scala-lang.modules</groupId>
-                <artifactId>scala-java8-compat_2.12</artifactId>
-                <version>0.9.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.scala-lang.modules</groupId>
-                <artifactId>scala-parser-combinators_2.12</artifactId>
-                <version>1.1.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.scala-lang</groupId>
-                <artifactId>scala-library</artifactId>
-                <version>2.12.11</version>
-            </dependency>
-            <dependency>
-                <groupId>org.scala-lang</groupId>
-                <artifactId>scala-reflect</artifactId>
-                <version>2.12.11</version>
-            </dependency>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-                <version>1.7.12</version>
-            </dependency>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-                <version>1.7.25</version>
-            </dependency>
-            <dependency>
-                <groupId>org.xerial</groupId>
-                <artifactId>sqlite-jdbc</artifactId>
-                <version>3.16.1</version>
-            </dependency>
-            <dependency>
-                <groupId>tech.pantheon.triemap</groupId>
-                <artifactId>triemap</artifactId>
-                <version>1.1.0</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-</project>
diff --git a/parent/odlparent-lite/pom.xml b/parent/odlparent-lite/pom.xml
deleted file mode 100644 (file)
index 8966765..0000000
+++ /dev/null
@@ -1,1169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-################################################################################
-# Copyright 2019 highstreet technologies and others
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>5.0.7</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.o-ran-sc.oam.features.parent</groupId>
-    <artifactId>odlparent-lite</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <name>o-ran-sc features odlparent-lite</name>
-
-    <description>Root POM to be used in place of odlparent for CCSDK based projects</description>
-    <url>http://wiki.o-ran-sc.org</url>
-    <organization>
-        <name>O-RAN-SC</name>
-    </organization>
-
-    <issueManagement>
-        <system>JIRA</system>
-        <url>https://jira.o-ran-sc.org/</url>
-    </issueManagement>
-    <distributionManagement>
-        <repository>
-            <id>ecomp-releases</id>
-            <url>${onap.nexus.release-url}</url>
-        </repository>
-        <snapshotRepository>
-            <id>ecomp-snapshots</id>
-            <url>${onap.nexus.snapshot-url}</url>
-        </snapshotRepository>
-    </distributionManagement>
-    <properties>
-        <!-- Sonar properties -->
-        <sonar.scanner.version>3.7.0.1746</sonar.scanner.version>
-        <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
-        <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-        <!-- Default Sonar configuration -->
-        <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml,${project.reporting.outputDirectory}/jacoco-it/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
-        <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
-        <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
-
-        <!-- Jacoco properties -->
-        <jacoco.version>0.8.5</jacoco.version>
-
-        <!-- properties from oparent -->
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
-        <!-- sitePath may be overridden in the inheriting POM if desired -->
-        <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>
-
-        <!-- If following file exist, auto-generation of swagger.json will be done -->
-        <swagger-properties>${basedir}/src/main/resources/swagger.properties</swagger-properties>
-        <!-- If following file exist, auto-generation of sdk will be done -->
-        <swagger-json>${basedir}/src/main/resources/swagger.json</swagger-json>
-        <!-- end of properties from oparent -->
-
-        <!-- ONAP repositories -->
-        <onap.nexus.host>nexus.onap.org</onap.nexus.host>
-        <onap.nexus.port>443</onap.nexus.port>
-        <onap.nexus.protocol>https</onap.nexus.protocol>
-        <onap.nexus.public-url>https://nexus.onap.org/content/groups/public</onap.nexus.public-url>
-        <onap.nexus.staging-url>https://nexus.onap.org/content/groups/staging</onap.nexus.staging-url>
-        <onap.nexus.release-url>https://nexus.onap.org/content/repositories/releases</onap.nexus.release-url>
-        <onap.nexus.snapshot-url>https://nexus.onap.org/content/repositories/snapshots</onap.nexus.snapshot-url>
-        <onap.nexus.staging.server-id>ecomp-staging</onap.nexus.staging.server-id>
-        <onap.nexus.staging.profile-id>176c31dfe190a</onap.nexus.staging.profile-id>
-
-        <!-- OpenDaylight repositories -->
-        <opendaylight.nexus.public-url>https://nexus.opendaylight.org/content/repositories/public/</opendaylight.nexus.public-url>
-        <opendaylight.nexus.snapshot-url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</opendaylight.nexus.snapshot-url>
-
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version.source>8</java.version.source>
-        <java.version.target>8</java.version.target>
-        <bundle.plugin.version>2.5.0</bundle.plugin.version>
-        <maven.compile.plugin.version>2.5.1</maven.compile.plugin.version>
-        <features.file>features.xml</features.file>
-        <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
-        <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
-        <checkstyle.skip>true</checkstyle.skip>
-
-        <!-- logging-analytics versions -->
-        <logging-analytics.version>1.6.6</logging-analytics.version>
-
-        <!-- CCSDK component versions -->
-        <ccsdk.cds.version>1.0.0-SNAPSHOT</ccsdk.cds.version>
-        <ccsdk.features.version>1.0.0-SNAPSHOT</ccsdk.features.version>
-        <ccsdk.sli.core.version>1.0.0-SNAPSHOT</ccsdk.sli.core.version>
-        <ccsdk.sli.adaptors.version>1.0.0-SNAPSHOT</ccsdk.sli.adaptors.version>
-        <ccsdk.sli.northbound.version>1.0.0-SNAPSHOT</ccsdk.sli.northbound.version>
-        <ccsdk.sli.plugins.version>1.0.0-SNAPSHOT</ccsdk.sli.plugins.version>
-        <ccsdk.distribution.version>1.0.0-SNAPSHOT</ccsdk.distribution.version>
-        <sdnctl.sli.version>${ccsdk.sli.core.version}</sdnctl.sli.version>
-        <sdnctl.aai.service.version>${ccsdk.sli.adaptors.version}</sdnctl.aai.service.version>
-        <sdnctl.dblib.version>${ccsdk.sli.core.version}</sdnctl.dblib.version>
-        <sdnctl.mdsal.resource.version>${ccsdk.sli.adaptors.version}</sdnctl.mdsal.resource.version>
-        <sdnctl.slipluginutils.version>${ccsdk.sli.core.version}</sdnctl.slipluginutils.version>
-
-        <!-- Support libraries used by OpenDaylight -->
-        <odl.controller.mdsal.version>1.10.3</odl.controller.mdsal.version>
-        <odl.mdsal.version>4.0.14</odl.mdsal.version>
-        <odl.mdsal.model.version>2.0.14</odl.mdsal.model.version>
-        <odl.netconf.restconf.version>1.10.3</odl.netconf.restconf.version>
-        <odl.netconf.netconf.version>1.7.3</odl.netconf.netconf.version>
-        <odl.netconf.sal.rest.docgen.version>1.10.3</odl.netconf.sal.rest.docgen.version>
-
-        <!-- Used by aaa, vtn -->
-        <commons.codec.version>1.13</commons.codec.version>
-        <!-- Used by netconf, ovsdb -->
-        <commons.lang3.version>3.8.1</commons.lang3.version>
-        <!-- Used by sfc, snmp4sdn; see also affinity, toolkit -->
-        <commons.lang.version>2.6</commons.lang.version>
-        <!-- Used by neutron; see also controller, vtn -->
-        <commons.net.version>3.6</commons.net.version>
-        <!-- Used by neutron -->
-        <eclipse.persistence.version>2.7.4</eclipse.persistence.version>
-        <!-- Used by aaa -->
-        <felix.dependencymanager.version>4.4.1</felix.dependencymanager.version>
-        <!-- Used by lacp, netconf, ovsdb, sfc, toolkit; see also vtn -->
-        <gson.version>2.8.5</gson.version>
-        <!-- Used by aaa, dlux, persistence, snmp4sdn, sxp -->
-        <guava.version>25.1-jre</guava.version>
-        <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all,
-            integration/distribution, snmp4sdn, toolkit, ttp -->
-        <jackson.version>2.9.10</jackson.version>
-        <!-- Used by snmp4sdn, yangtools -->
-        <javassist.version>3.24.1-GA</javassist.version>
-
-        <!-- FIXME remove all dependencies for jersey 1.17 after migration all projects -->
-        <!-- Used by aaa, alto, netconf, neutron, sfc; see also affinity, defense4all, snmp4sdn, toolkit -->
-        <jersey.version>2.25.1</jersey.version>
-        <!-- Used by sfc -->
-        <jersey.client.version>2.25.1</jersey.client.version>
-
-        <!-- New packages for jersey migration 1.17 to 2.8 -->
-        <!-- appache.geronimo.bundle for DocGen -->
-        <!-- Used by aaa, iotdm, netconf, ovsdb, sfc -->
-        <org.json.version>20131018</org.json.version>
-
-        <!-- Used everywhere -->
-        <junit.version>4.12</junit.version>
-        <!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
-        <logback.version>1.2.3</logback.version>
-        <!-- Used by nic, sfc, sxp, tsdr -->
-        <mockito.version>1.10.19</mockito.version>
-        <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
-        <netty.version>4.1.42.Final</netty.version>
-        <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
-        <slf4j.version>1.7.25</slf4j.version>
-        <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp -->
-        <spring.version>4.3.25.RELEASE</spring.version>
-
-        <!-- Extra support libraries used by SDN-C -->
-        <jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version>
-        <antlr.version>4.7.2</antlr.version>
-
-        <eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
-
-        <!-- Managed dependency versions -->
-        <apache.httpcomponents.core.version>4.4.12</apache.httpcomponents.core.version>
-        <apache.httpcomponents.client.version>4.5.10</apache.httpcomponents.client.version>
-        <derby.version>10.14.2.0</derby.version>
-        <eelf.version>1.0.0</eelf.version>
-        <grpc.version>1.21.1</grpc.version>
-        <mariadb.connector.version>2.4.4</mariadb.connector.version>
-        <mariadb4j.version>2.4.0</mariadb4j.version>
-        <testng.version>6.14.3</testng.version>
-        <tomcat-jdbc.version>9.0.30</tomcat-jdbc.version>
-        <jetty.version>9.4.12.v20180830</jetty.version>
-        <skip.karaf.featureTest>true</skip.karaf.featureTest>
-        <dependency-list.file>direct-dependencies.txt</dependency-list.file>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <!-- Note: If value in BOM conflicts with value inherited from
-            parent pom, inherited value takes precedence.  This seems more like
-            a bug than a feature, but this is how maven 3.6 works -->
-            <dependency>
-                <groupId>org.o-ran-sc.oam.features.parent</groupId>
-                <artifactId>dependencies-odl-bom</artifactId>
-                <version>2.0.0-SNAPSHOT</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.onap.logging-analytics</groupId>
-                <artifactId>logging-slf4j</artifactId>
-                <version>${logging-analytics.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.onap.logging-analytics</groupId>
-                <artifactId>logging-filter-base</artifactId>
-                <version>${logging-analytics.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>${junit.version}</version>
-                <scope>test</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <repositories>
-        <repository>
-            <id>onap-public</id>
-            <url>${onap.nexus.public-url}</url>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>never</updatePolicy>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>onap-staging</id>
-            <url>${onap.nexus.staging-url}</url>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>never</updatePolicy>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>ecomp-release</id>
-            <name>onap-repository-releases</name>
-            <url>${onap.nexus.release-url}</url>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>never</updatePolicy>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>ecomp-snapshot</id>
-            <name>onap-repository-snapshots</name>
-            <url>${onap.nexus.snapshot-url}</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>opendaylight-mirror</id>
-            <name>opendaylight-mirror</name>
-            <url>${opendaylight.nexus.public-url}</url>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>never</updatePolicy>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>opendaylight-snapshot</id>
-            <name>opendaylight-snapshot</name>
-            <url>${opendaylight.nexus.snapshot-url}</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-
-    </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>onap-public</id>
-            <url>${onap.nexus.public-url}</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
-        <pluginRepository>
-            <id>onap-staging</id>
-            <url>${onap.nexus.staging-url}</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
-        <pluginRepository>
-            <id>onap-snapshot</id>
-            <url>${onap.nexus.snapshot-url}</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
-        <pluginRepository>
-            <id>opendaylight-mirror</id>
-            <name>opendaylight-mirror</name>
-            <url>${opendaylight.nexus.public-url}</url>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>never</updatePolicy>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-        <pluginRepository>
-            <id>opendaylight-snapshot</id>
-            <name>opendaylight-snapshot</name>
-            <url>${opendaylight.nexus.snapshot-url}</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
-        <!-- Black Duck plugin dependencies -->
-        <pluginRepository>
-            <id>JCenter</id>
-            <name>JCenter Repository</name>
-            <url>http://jcenter.bintray.com</url>
-        </pluginRepository>
-
-        <pluginRepository>
-            <id>Restlet</id>
-            <name>Restlet Repository</name>
-            <url>http://maven.restlet.com</url>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <!-- Plugins from ONAP version (parent of oparent) -->
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-deploy-plugin</artifactId>
-                    <!-- This version supports the "deployAtEnd" parameter -->
-                    <version>2.8</version>
-                    <configuration>
-                        <skip/>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-site-plugin</artifactId>
-                    <version>3.6</version>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.apache.maven.wagon</groupId>
-                            <artifactId>wagon-webdav-jackrabbit</artifactId>
-                            <version>2.10</version>
-                        </dependency>
-                    </dependencies>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>3.0.0-M2</version>
-                    <executions>
-                        <execution>
-                            <id>enforce-property</id>
-                            <goals>
-                                <goal>enforce</goal>
-                            </goals>
-                            <configuration>
-                                <rules>
-                                    <requireProperty>
-                                        <property>onap.nexus.url</property>
-                                        <message>You must set a onap.nexus.url property in your
-                                            ~/.m2/settings.xml. See oparent/settings.xml for an example.
-                                        </message>
-                                    </requireProperty>
-                                </rules>
-                                <fail>true</fail>
-                            </configuration>
-                        </execution>
-                        <execution>
-                            <id>enforce-no-snapshots</id>
-                            <goals>
-                                <goal>enforce</goal>
-                            </goals>
-                            <configuration>
-                                <rules>
-                                    <requireReleaseDeps>
-                                        <failWhenParentIsSnapshot>false</failWhenParentIsSnapshot>
-                                        <onlyWhenRelease>true</onlyWhenRelease>
-                                        <level>WARN</level>
-                                    </requireReleaseDeps>
-                                </rules>
-                            </configuration>
-                        </execution>
-                        <execution>
-                            <id>enforce-maven</id>
-                            <goals>
-                                <goal>enforce</goal>
-                            </goals>
-                            <configuration>
-                                <rules>
-                                    <requireJavaVersion>
-                                        <version>8</version>
-                                    </requireJavaVersion>
-                                    <requireMavenVersion>
-                                        <version>[3.5.0,)</version>
-                                    </requireMavenVersion>
-                                </rules>
-                            </configuration>
-                        </execution>
-                        <execution>
-                            <id>enforce-banned-dependencies</id>
-                            <goals>
-                                <goal>enforce</goal>
-                            </goals>
-                            <configuration>
-                                <rules>
-                                    <bannedDependencies>
-                                        <message>Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations</message>
-                                        <excludes>
-                                            <exclude>org.mockito:mockito-all</exclude>
-                <!--                     <exclude>com.google.code.findbugs:annotations</exclude> -->
-                                        </excludes>
-                                    </bannedDependencies>
-                                </rules>
-                                <fail>true</fail>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-                <!-- https://mvnrepository.com/artifact/org.sonarsource.scanner.maven/sonar-maven-plugin -->
-                <plugin>
-                    <groupId>org.sonarsource.scanner.maven</groupId>
-                    <artifactId>sonar-maven-plugin</artifactId>
-                    <version>${sonar.scanner.version}</version>
-                </plugin>
-                <!-- end of plugins from ONAP version (parent of oparent) -->
-
-                <!-- Plugins from ONAP oparent -->
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.22.0</version>
-                    <configuration>
-                        <!-- Sets the VM argument line used when unit tests are run. -->
-                        <argLine>${surefireArgLine}</argLine>
-                        <!-- Excludes integration tests when unit tests are run. -->
-                        <excludes>
-                            <exclude>**/IT*.java</exclude>
-                        </excludes>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-failsafe-plugin</artifactId>
-                    <version>2.22.0</version>
-                    <executions>
-                        <!-- Ensures that both integration-test and verify goals of the Failsafe
-                            Maven plugin are executed. -->
-                        <execution>
-                            <id>integration-tests</id>
-                            <goals>
-                                <goal>integration-test</goal>
-                                <goal>verify</goal>
-                            </goals>
-                            <configuration>
-                                <!-- Sets the VM argument line used when integration tests are run. -->
-                                <argLine>${failsafeArgLine}</argLine>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-
-                <!-- End of plugins from ONAP oparent -->
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>properties-maven-plugin</artifactId>
-                    <version>1.0.0</version>
-                    <executions>
-                        <execution>
-                            <goals>
-                                <goal>set-system-properties</goal>
-                            </goals>
-                            <configuration>
-                                <properties>
-                                    <property>
-                                        <name>maven.wagon.http.ssl.allowall</name>
-                                        <value>${ssl.allowall}</value>
-                                    </property>
-                                    <property>
-                                        <name>maven.wagon.http.ssl.insecure</name>
-                                        <value>${ssl.insecure}</value>
-                                    </property>
-                                </properties>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>versions-maven-plugin</artifactId>
-                    <version>2.5</version>
-                    <configuration>
-                        <processAllModules>true</processAllModules>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-scm-plugin</artifactId>
-                    <version>1.8.1</version>
-                    <configuration>
-                        <tag>${project.artifactId}-${project.version}</tag>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>com.github.ferstl</groupId>
-                    <artifactId>depgraph-maven-plugin</artifactId>
-                    <version>3.3.0</version>
-                    <configuration>
-                        <graphFormat>text</graphFormat>
-                        <outputFileName>${dependency-list.file}</outputFileName>
-                        <outputDirectory>${project.basedir}</outputDirectory>
-                        <transitiveExcludes>*</transitiveExcludes>
-                        <showVersions>true</showVersions>
-                        <showGroupIds>true</showGroupIds>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-        <plugins>
-
-            <!-- Plugins from oparent version (parent of oparent) -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-site-plugin</artifactId>
-            </plugin>
-            <!-- end of plugins from oparent version (parent of oparent) -->
-
-            <!-- Plugins from oparent -->
-            <plugin>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>2.17</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.onap.oparent</groupId>
-                        <artifactId>checkstyle</artifactId>
-                        <version>1.2.2</version>
-                    </dependency>
-                </dependencies>
-                <executions>
-                    <execution>
-                        <id>onap-license</id>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                        <phase>process-sources</phase>
-                        <configuration>
-                            <configLocation>onap-checkstyle/check-license.xml</configLocation>
-                            <includeResources>false</includeResources>
-                            <includeTestSourceDirectory>true</includeTestSourceDirectory>
-                            <includeTestResources>false</includeTestResources>
-                            <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
-                            <excludes>
-                            </excludes>
-                            <consoleOutput>true</consoleOutput>
-                            <failOnViolation>false</failOnViolation>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>onap-java-style</id>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                        <phase>process-sources</phase>
-                        <configuration>
-                            <!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml
-                                with minor changes -->
-                            <configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
-                            <!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory -->
-                            <sourceDirectory>${project.build.sourceDirectory}/src/main/java</sourceDirectory>
-                            <includeResources>true</includeResources>
-                            <includeTestSourceDirectory>true</includeTestSourceDirectory>
-                            <includeTestResources>true</includeTestResources>
-                            <excludes>
-                            </excludes>
-                            <consoleOutput>true</consoleOutput>
-                            <failOnViolation>false</failOnViolation>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.12</version>
-            </plugin>
-            <!-- Jacoco / Sonar -->
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <version>${jacoco.version}</version>
-                <executions>
-                    <execution>
-                        <id>pre-unit-test</id>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                        <configuration>
-                            <!-- Sets the path to the file which contains the execution data. -->
-                            <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
-                            <!-- Sets the name of the property containing the settings for JaCoCo runtime agent. -->
-                            <propertyName>surefireArgLine</propertyName>
-                        </configuration>
-                    </execution>
-                    <!-- Ensures that the code coverage report for unit tests is created after unit tests have been run. -->
-                    <execution>
-                        <id>post-unit-test</id>
-                        <phase>test</phase>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                        <configuration>
-                            <!-- Sets the path to the file which contains the execution data. -->
-                            <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
-                            <!-- Sets the output directory for the code coverage report. -->
-                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>pre-integration-test</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                        <configuration>
-                            <!-- Sets the path to the file which contains the execution data. -->
-                            <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
-                            <!-- Sets the name of the property containing the settings for JaCoCo runtime agent. -->
-                            <propertyName>failsafeArgLine</propertyName>
-                        </configuration>
-                    </execution>
-                    <!-- Ensures that the code coverage report for integration tests after integration tests have been run. -->
-                    <execution>
-                        <id>post-integration-test</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                        <configuration>
-                            <!-- Sets the path to the file which contains the execution data. -->
-                            <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
-                            <!-- Sets the output directory for the code coverage report. -->
-                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>default-prepare-agent</id>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>default-report</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>default-check</id>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <rule>
-                                    <element>PACKAGE</element>
-                                    <limits>
-                                        <limit>
-                                            <counter>COMPLEXITY</counter>
-                                            <value>COVEREDRATIO</value>
-                                            <minimum>0.0</minimum>
-                                        </limit>
-                                    </limits>
-                                </rule>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-failsafe-plugin</artifactId>
-            </plugin>
-            <!-- end of plugins from oparent -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.4</version>
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                        <configuration>
-                            <additionalparam>-Xdoclint:none</additionalparam>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.0.0-M2</version>
-                <executions>
-                    <execution>
-                        <id>enforce-property</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireProperty>
-                                    <property>onap.nexus.url</property>
-                                    <message>You must set a onap.nexus.url property in your
-                                        ~/.m2/settings.xml. See oparent/settings.xml for an example.</message>
-                                </requireProperty>
-                            </rules>
-                            <fail>true</fail>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>enforce-no-snapshots</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireReleaseDeps>
-                                    <failWhenParentIsSnapshot>false</failWhenParentIsSnapshot>
-                                    <onlyWhenRelease>true</onlyWhenRelease>
-                                    <level>WARN</level>
-                                </requireReleaseDeps>
-                            </rules>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>enforce-maven</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireJavaVersion>
-                                    <version>1.8.0</version>
-                                </requireJavaVersion>
-                                <requireMavenVersion>
-                                    <version>[3.5.0,)</version>
-                                </requireMavenVersion>
-                            </rules>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>enforce-banned-dependencies</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <bannedDependencies>
-                                    <message>Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations</message>
-                                    <excludes>
-                                        <exclude>org.mockito:mockito-all</exclude>
-<!--                                         <exclude>com.google.code.findbugs:annotations</exclude> -->
-                                    </excludes>
-                                </bannedDependencies>
-                            </rules>
-                            <fail>true</fail>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <reporting>
-        <plugins>
-            <plugin>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.4</version>
-                <configuration>
-                    <failOnError>false</failOnError>
-                    <additionalparam>-Xdoclint:none</additionalparam>
-                </configuration>
-            </plugin>
-        </plugins>
-    </reporting>
-
-    <profiles>
-        <!-- Profiles from ONAP oparent -->
-        <profile>
-            <id>generate-json</id>
-            <activation>
-                <file>
-                    <exists>${swagger-properties}</exists>
-                </file>
-                <property>
-                    <name>swagger-sdk.generate-json</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>properties-maven-plugin</artifactId>
-                        <version>1.0.0</version>
-                        <executions>
-                            <execution>
-                                <phase>initialize</phase>
-                                <goals>
-                                    <goal>read-project-properties</goal>
-                                </goals>
-                                <configuration>
-                                    <files>
-                                        <file>${basedir}/src/main/resources/swagger.properties</file>
-                                    </files>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>com.github.kongchen</groupId>
-                        <artifactId>swagger-maven-plugin</artifactId>
-                        <version>3.1.4</version>
-                        <configuration>
-                            <apiSources>
-                                <apiSource>
-                                    <locations>${api-rest-package}</locations>
-                                    <schemes>http,https</schemes>
-                                    <host>${api-host-ip}:${api-host-port}</host>
-                                    <basePath>${api-base-path}</basePath>
-                                    <info>
-                                        <title>${api-title}</title>
-                                        <version>${api-version}</version>
-                                        <description>${api-description}</description>
-                                        <license>
-                                            <name>${api-license}</name>
-                                        </license>
-                                    </info>
-                                    <swaggerDirectory>${basedir}/src/main/resources</swaggerDirectory>
-                                </apiSource>
-                            </apiSources>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <phase>compile</phase>
-                                <goals>
-                                    <goal>generate</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-install-plugin</artifactId>
-                        <version>2.3.1</version>
-                        <executions>
-                            <execution>
-                                <id>install-file-id</id>
-                                <phase>install</phase>
-                                <goals>
-                                    <goal>install-file</goal>
-                                </goals>
-                                <configuration>
-                                    <file>${basedir}/src/main/resources/swagger.json</file>
-                                    <groupId>${project.groupId}</groupId>
-                                    <artifactId>${project.artifactId}-swagger-schema</artifactId>
-                                    <version>${project.version}</version>
-                                    <packaging>json</packaging>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>generate-sdk</id>
-            <activation>
-                <file>
-                    <exists>${swagger-json}</exists>
-                </file>
-                <property>
-                    <name>swagger-sdk.generate-java-sdk</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <version>1.8</version>
-                        <executions>
-                            <execution>
-                                <phase>initialize</phase>
-                                <id>ant-create-script</id>
-                                <configuration>
-                                    <exportAntProperties>true</exportAntProperties>
-                                    <tasks>
-                                        <taskdef resource="net/sf/antcontrib/antlib.xml" classpathref="maven.plugin.classpath"/>
-                                        <condition property="is_windows" value="true">
-                                            <os family="windows"/>
-                                        </condition>
-                                        <condition property="isLinux" value="true">
-                                            <os family="unix"/>
-                                        </condition>
-                                        <if>
-                                            <equals arg1="${is_windows}" arg2="true"/>
-                                            <then>
-                                                <property name="swagger.sdk.script.file" value="generated-source-script.bat"/>
-                                                <echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true" message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
-                                                <echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true" message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
-                                            </then>
-                                            <else>
-                                                <property name="swagger.sdk.script.file" value="generated-source-script.sh"/>
-                                                <echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true" message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
-                                                <echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true" message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
-                                                <chmod file="${project.build.directory}${file.separator}generated-source-script.sh" perm="755"/>
-                                            </else>
-                                        </if>
-                                    </tasks>
-                                </configuration>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>ant-contrib</groupId>
-                                <artifactId>ant-contrib</artifactId>
-                                <version>1.0b3</version>
-                                <exclusions>
-                                    <exclusion>
-                                        <groupId>ant</groupId>
-                                        <artifactId>ant</artifactId>
-                                    </exclusion>
-                                </exclusions>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.swagger</groupId>
-                        <artifactId>swagger-codegen-maven-plugin</artifactId>
-                        <version>2.2.1</version>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>generate</goal>
-                                </goals>
-                                <configuration>
-                                    <inputSpec>${basedir}/src/main/resources/swagger.json</inputSpec>
-                                    <output>${project.build.directory}/generated-sources</output>
-                                    <language>java</language>
-                                    <configOptions>
-                                        <dateLibrary>joda</dateLibrary>
-                                    </configOptions>
-                                    <library>jersey2</library>
-                                    <groupId>${project.groupId}</groupId>
-                                    <artifactId>${project.artifactId}-java-sdk</artifactId>
-                                    <artifactVersion>${project.version}</artifactVersion>
-                                    <modelPackage>${project.groupId}.${project.artifactId}.client.model</modelPackage>
-                                    <apiPackage>${project.groupId}.${project.artifactId}.client.api</apiPackage>
-                                    <invokerPackage>${project.groupId}.${project.artifactId}.client.invoker</invokerPackage>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>exec-maven-plugin</artifactId>
-                        <version>1.5.0</version>
-                        <executions>
-                            <execution>
-                                <id>swagger-generate-sources</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>exec</goal>
-                                </goals>
-                                <configuration>
-                                    <executable>${project.build.directory}${file.separator}${swagger.sdk.script.file}</executable>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-clean-plugin</artifactId>
-                        <version>3.0.0</version>
-                        <executions>
-                            <execution>
-                                <id>clean-generated-files</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>clean</goal>
-                                </goals>
-                                <configuration>
-                                    <filesets>
-                                        <fileset>
-                                            <directory>${project.build.directory}/generated-sources</directory>
-                                        </fileset>
-                                    </filesets>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>org.onap.msb.swagger-sdk</groupId>
-                    <artifactId>swagger-sdk</artifactId>
-                    <version>1.0.0</version>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>sonar-jacoco-aggregate</id>
-            <activation>
-                <property>
-                    <name>onap.jacoco.aggregateFile</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.jacoco</groupId>
-                        <artifactId>jacoco-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>merge</id>
-                                <goals>
-                                    <goal>merge</goal>
-                                </goals>
-                                <phase>generate-resources</phase>
-                                <configuration>
-                                    <destFile>${onap.jacoco.aggregateFile}</destFile>
-                                    <fileSets>
-                                        <fileSet>
-                                            <directory>${project.basedir}</directory>
-                                            <includes>
-                                                <include>**/target/code-coverage/*.exec</include>
-                                            </includes>
-                                        </fileSet>
-                                    </fileSets>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <!-- End of profiles from ONAP oparent -->
-
-        <profile>
-            <id>yang-compile</id>
-            <activation>
-                <file>
-                    <exists>src/main/yang</exists>
-                </file>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.opendaylight.yangtools</groupId>
-                        <artifactId>yang-maven-plugin</artifactId>
-                        <version>3.0.11</version>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.opendaylight.mdsal</groupId>
-                                <artifactId>maven-sal-api-gen-plugin</artifactId>
-                                <version>${odl.mdsal.model.version}</version>
-                                <type>jar</type>
-                                <scope>compile</scope>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.opendaylight.netconf</groupId>
-                                <artifactId>sal-rest-docgen-maven</artifactId>
-                                <version>${odl.netconf.sal.rest.docgen.version}</version>
-                                <type>jar</type>
-                            </dependency>
-                        </dependencies>
-                        <executions>
-                            <execution>
-                                <id>binding</id>
-                                <goals>
-                                    <goal>generate-sources</goal>
-                                </goals>
-                                <configuration>
-                                    <yangFilesRootDir>${yang.file.directory}</yangFilesRootDir>
-                                    <codeGenerators>
-                                        <generator>
-                                            <codeGeneratorClass>org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
-                                            <outputBaseDir>${salGeneratorPath}</outputBaseDir>
-                                        </generator>
-                                        <generator>
-                                            <codeGeneratorClass>org.opendaylight.netconf.sal.rest.doc.maven.StaticDocGenerator</codeGeneratorClass>
-                                            <outputBaseDir>target/swagger</outputBaseDir>
-                                        </generator>
-                                    </codeGenerators>
-                                    <inspectDependencies>true</inspectDependencies>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/parent/pom.xml b/parent/pom.xml
deleted file mode 100644 (file)
index 4d4111a..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-################################################################################
-# Copyright 2020 highstreet technologies and others
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.o-ran-sc.oam.parent</groupId>
-  <artifactId>parent-top</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
-
-  <name>o-ran-sc parent top</name>
-
-  <modules>
-    <module>installed-odl-bom</module>
-    <module>dependencies-odl-bom</module>
-    <module>odlparent-lite</module>
-    <module>binding-parent</module>
-    <module>single-feature-parent</module>
-  </modules>
-
-</project>
diff --git a/parent/single-feature-parent/pom.xml b/parent/single-feature-parent/pom.xml
deleted file mode 100644 (file)
index feb20e9..0000000
+++ /dev/null
@@ -1,1168 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-################################################################################
-# Copyright 2019 highstreet technologies and others
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>single-feature-parent</artifactId>
-        <version>5.0.7</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.o-ran-sc.oam.features.parent</groupId>
-    <artifactId>single-feature-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <name>o-ran-sc features single-feature-parent</name>
-    <description>Root POM to be used in place of odlparent for CCSDK based projects</description>
-    <url>http://wiki.o-ran-sc.org</url>
-    <organization>
-        <name>O-RAN-SC</name>
-    </organization>
-
-    <issueManagement>
-        <system>JIRA</system>
-        <url>https://jira.o-ran-sc.org/</url>
-    </issueManagement>
-    <distributionManagement>
-        <repository>
-            <id>ecomp-releases</id>
-            <url>${onap.nexus.release-url}</url>
-        </repository>
-        <snapshotRepository>
-            <id>ecomp-snapshots</id>
-            <url>${onap.nexus.snapshot-url}</url>
-        </snapshotRepository>
-    </distributionManagement>
-
-    <properties>
-        <!-- Sonar properties -->
-        <sonar.scanner.version>3.7.0.1746</sonar.scanner.version>
-        <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
-        <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-        <!-- Default Sonar configuration -->
-        <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml,${project.reporting.outputDirectory}/jacoco-it/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
-        <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
-        <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
-
-        <!-- Jacoco properties -->
-        <jacoco.version>0.8.5</jacoco.version>
-
-        <!-- properties from oparent -->
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
-        <!-- sitePath may be overridden in the inheriting POM if desired -->
-        <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>
-
-        <!-- If following file exist, auto-generation of swagger.json will be done -->
-        <swagger-properties>${basedir}/src/main/resources/swagger.properties</swagger-properties>
-        <!-- If following file exist, auto-generation of sdk will be done -->
-        <swagger-json>${basedir}/src/main/resources/swagger.json</swagger-json>
-        <!-- end of properties from oparent -->
-
-        <!-- ONAP repositories -->
-        <onap.nexus.host>nexus.onap.org</onap.nexus.host>
-        <onap.nexus.port>443</onap.nexus.port>
-        <onap.nexus.protocol>https</onap.nexus.protocol>
-        <onap.nexus.public-url>https://nexus.onap.org/content/groups/public</onap.nexus.public-url>
-        <onap.nexus.staging-url>https://nexus.onap.org/content/groups/staging</onap.nexus.staging-url>
-        <onap.nexus.release-url>https://nexus.onap.org/content/repositories/releases</onap.nexus.release-url>
-        <onap.nexus.snapshot-url>https://nexus.onap.org/content/repositories/snapshots</onap.nexus.snapshot-url>
-        <onap.nexus.staging.server-id>ecomp-staging</onap.nexus.staging.server-id>
-        <onap.nexus.staging.profile-id>176c31dfe190a</onap.nexus.staging.profile-id>
-
-        <!-- OpenDaylight repositories -->
-        <opendaylight.nexus.public-url>https://nexus.opendaylight.org/content/repositories/public/</opendaylight.nexus.public-url>
-        <opendaylight.nexus.snapshot-url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</opendaylight.nexus.snapshot-url>
-
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version.source>8</java.version.source>
-        <java.version.target>8</java.version.target>
-        <bundle.plugin.version>2.5.0</bundle.plugin.version>
-        <maven.compile.plugin.version>2.5.1</maven.compile.plugin.version>
-        <features.file>features.xml</features.file>
-        <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
-        <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
-        <checkstyle.skip>true</checkstyle.skip>
-
-        <!-- logging-analytics versions -->
-        <logging-analytics.version>1.6.6</logging-analytics.version>
-
-        <!-- CCSDK component versions -->
-        <ccsdk.cds.version>1.0.0-SNAPSHOT</ccsdk.cds.version>
-        <ccsdk.features.version>1.0.0-SNAPSHOT</ccsdk.features.version>
-        <ccsdk.sli.core.version>1.0.0-SNAPSHOT</ccsdk.sli.core.version>
-        <ccsdk.sli.adaptors.version>1.0.0-SNAPSHOT</ccsdk.sli.adaptors.version>
-        <ccsdk.sli.northbound.version>1.0.0-SNAPSHOT</ccsdk.sli.northbound.version>
-        <ccsdk.sli.plugins.version>1.0.0-SNAPSHOT</ccsdk.sli.plugins.version>
-        <ccsdk.distribution.version>1.0.0-SNAPSHOT</ccsdk.distribution.version>
-        <sdnctl.sli.version>${ccsdk.sli.core.version}</sdnctl.sli.version>
-        <sdnctl.aai.service.version>${ccsdk.sli.adaptors.version}</sdnctl.aai.service.version>
-        <sdnctl.dblib.version>${ccsdk.sli.core.version}</sdnctl.dblib.version>
-        <sdnctl.mdsal.resource.version>${ccsdk.sli.adaptors.version}</sdnctl.mdsal.resource.version>
-        <sdnctl.slipluginutils.version>${ccsdk.sli.core.version}</sdnctl.slipluginutils.version>
-
-        <!-- Support libraries used by OpenDaylight -->
-        <odl.controller.mdsal.version>1.10.3</odl.controller.mdsal.version>
-        <odl.mdsal.version>4.0.14</odl.mdsal.version>
-        <odl.mdsal.model.version>2.0.14</odl.mdsal.model.version>
-        <odl.netconf.restconf.version>1.10.3</odl.netconf.restconf.version>
-        <odl.netconf.netconf.version>1.7.3</odl.netconf.netconf.version>
-        <odl.netconf.sal.rest.docgen.version>1.10.3</odl.netconf.sal.rest.docgen.version>
-
-        <!-- Used by aaa, vtn -->
-        <commons.codec.version>1.13</commons.codec.version>
-        <!-- Used by netconf, ovsdb -->
-        <commons.lang3.version>3.8.1</commons.lang3.version>
-        <!-- Used by sfc, snmp4sdn; see also affinity, toolkit -->
-        <commons.lang.version>2.6</commons.lang.version>
-        <!-- Used by neutron; see also controller, vtn -->
-        <commons.net.version>3.6</commons.net.version>
-        <!-- Used by neutron -->
-        <eclipse.persistence.version>2.7.4</eclipse.persistence.version>
-        <!-- Used by aaa -->
-        <felix.dependencymanager.version>4.4.1</felix.dependencymanager.version>
-        <!-- Used by lacp, netconf, ovsdb, sfc, toolkit; see also vtn -->
-        <gson.version>2.8.5</gson.version>
-        <!-- Used by aaa, dlux, persistence, snmp4sdn, sxp -->
-        <guava.version>25.1-jre</guava.version>
-        <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all,
-            integration/distribution, snmp4sdn, toolkit, ttp -->
-        <jackson.version>2.9.10</jackson.version>
-        <!-- Used by snmp4sdn, yangtools -->
-        <javassist.version>3.24.1-GA</javassist.version>
-
-        <!-- FIXME remove all dependencies for jersey 1.17 after migration all projects -->
-        <!-- Used by aaa, alto, netconf, neutron, sfc; see also affinity, defense4all, snmp4sdn, toolkit -->
-        <jersey.version>2.25.1</jersey.version>
-        <!-- Used by sfc -->
-        <jersey.client.version>2.25.1</jersey.client.version>
-
-        <!-- New packages for jersey migration 1.17 to 2.8 -->
-        <!-- appache.geronimo.bundle for DocGen -->
-        <!-- Used by aaa, iotdm, netconf, ovsdb, sfc -->
-        <org.json.version>20131018</org.json.version>
-
-        <!-- Used everywhere -->
-        <junit.version>4.12</junit.version>
-        <!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
-        <logback.version>1.2.3</logback.version>
-        <!-- Used by nic, sfc, sxp, tsdr -->
-        <mockito.version>1.10.19</mockito.version>
-        <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
-        <netty.version>4.1.42.Final</netty.version>
-        <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
-        <slf4j.version>1.7.25</slf4j.version>
-        <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp -->
-        <spring.version>4.3.25.RELEASE</spring.version>
-
-        <!-- Extra support libraries used by SDN-C -->
-        <jvnet.jaxb2.version>0.6.4</jvnet.jaxb2.version>
-        <antlr.version>4.7.2</antlr.version>
-
-        <eelf.maven.plugin.version>1.0.0</eelf.maven.plugin.version>
-
-        <!-- Managed dependency versions -->
-        <apache.httpcomponents.core.version>4.4.12</apache.httpcomponents.core.version>
-        <apache.httpcomponents.client.version>4.5.10</apache.httpcomponents.client.version>
-        <derby.version>10.14.2.0</derby.version>
-        <eelf.version>1.0.0</eelf.version>
-        <grpc.version>1.21.1</grpc.version>
-        <mariadb.connector.version>2.4.4</mariadb.connector.version>
-        <mariadb4j.version>2.4.0</mariadb4j.version>
-        <testng.version>6.14.3</testng.version>
-        <tomcat-jdbc.version>9.0.30</tomcat-jdbc.version>
-        <jetty.version>9.4.12.v20180830</jetty.version>
-        <skip.karaf.featureTest>true</skip.karaf.featureTest>
-        <dependency-list.file>direct-dependencies.txt</dependency-list.file>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <!-- Note: If value in BOM conflicts with value inherited from
-            parent pom, inherited value takes precedence.  This seems more like
-            a bug than a feature, but this is how maven 3.6 works -->
-            <dependency>
-                <groupId>org.o-ran-sc.oam.features.parent</groupId>
-                <artifactId>dependencies-odl-bom</artifactId>
-                <version>2.0.0-SNAPSHOT</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.onap.logging-analytics</groupId>
-                <artifactId>logging-slf4j</artifactId>
-                <version>${logging-analytics.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.onap.logging-analytics</groupId>
-                <artifactId>logging-filter-base</artifactId>
-                <version>${logging-analytics.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>${junit.version}</version>
-                <scope>test</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <repositories>
-        <repository>
-            <id>onap-public</id>
-            <url>${onap.nexus.public-url}</url>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>never</updatePolicy>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>onap-staging</id>
-            <url>${onap.nexus.staging-url}</url>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>never</updatePolicy>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>ecomp-release</id>
-            <name>onap-repository-releases</name>
-            <url>${onap.nexus.release-url}</url>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>never</updatePolicy>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>ecomp-snapshot</id>
-            <name>onap-repository-snapshots</name>
-            <url>${onap.nexus.snapshot-url}</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>opendaylight-mirror</id>
-            <name>opendaylight-mirror</name>
-            <url>${opendaylight.nexus.public-url}</url>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>never</updatePolicy>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>opendaylight-snapshot</id>
-            <name>opendaylight-snapshot</name>
-            <url>${opendaylight.nexus.snapshot-url}</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-
-    </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>onap-public</id>
-            <url>${onap.nexus.public-url}</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
-        <pluginRepository>
-            <id>onap-staging</id>
-            <url>${onap.nexus.staging-url}</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
-        <pluginRepository>
-            <id>onap-snapshot</id>
-            <url>${onap.nexus.snapshot-url}</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
-        <pluginRepository>
-            <id>opendaylight-mirror</id>
-            <name>opendaylight-mirror</name>
-            <url>${opendaylight.nexus.public-url}</url>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>never</updatePolicy>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-        <pluginRepository>
-            <id>opendaylight-snapshot</id>
-            <name>opendaylight-snapshot</name>
-            <url>${opendaylight.nexus.snapshot-url}</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
-        <!-- Black Duck plugin dependencies -->
-        <pluginRepository>
-            <id>JCenter</id>
-            <name>JCenter Repository</name>
-            <url>http://jcenter.bintray.com</url>
-        </pluginRepository>
-
-        <pluginRepository>
-            <id>Restlet</id>
-            <name>Restlet Repository</name>
-            <url>http://maven.restlet.com</url>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <!-- Plugins from ONAP version (parent of oparent) -->
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-deploy-plugin</artifactId>
-                    <!-- This version supports the "deployAtEnd" parameter -->
-                    <version>2.8</version>
-                    <configuration>
-                        <skip/>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-site-plugin</artifactId>
-                    <version>3.6</version>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.apache.maven.wagon</groupId>
-                            <artifactId>wagon-webdav-jackrabbit</artifactId>
-                            <version>2.10</version>
-                        </dependency>
-                    </dependencies>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>3.0.0-M2</version>
-                    <executions>
-                        <execution>
-                            <id>enforce-property</id>
-                            <goals>
-                                <goal>enforce</goal>
-                            </goals>
-                            <configuration>
-                                <rules>
-                                    <requireProperty>
-                                        <property>onap.nexus.url</property>
-                                        <message>You must set a onap.nexus.url property in your
-                                            ~/.m2/settings.xml. See oparent/settings.xml for an example.
-                                        </message>
-                                    </requireProperty>
-                                </rules>
-                                <fail>true</fail>
-                            </configuration>
-                        </execution>
-                        <execution>
-                            <id>enforce-no-snapshots</id>
-                            <goals>
-                                <goal>enforce</goal>
-                            </goals>
-                            <configuration>
-                                <rules>
-                                    <requireReleaseDeps>
-                                        <failWhenParentIsSnapshot>false</failWhenParentIsSnapshot>
-                                        <onlyWhenRelease>true</onlyWhenRelease>
-                                        <level>WARN</level>
-                                    </requireReleaseDeps>
-                                </rules>
-                            </configuration>
-                        </execution>
-                        <execution>
-                            <id>enforce-maven</id>
-                            <goals>
-                                <goal>enforce</goal>
-                            </goals>
-                            <configuration>
-                                <rules>
-                                    <requireJavaVersion>
-                                        <version>8</version>
-                                    </requireJavaVersion>
-                                    <requireMavenVersion>
-                                        <version>[3.5.0,)</version>
-                                    </requireMavenVersion>
-                                </rules>
-                            </configuration>
-                        </execution>
-                        <execution>
-                            <id>enforce-banned-dependencies</id>
-                            <goals>
-                                <goal>enforce</goal>
-                            </goals>
-                            <configuration>
-                                <rules>
-                                    <bannedDependencies>
-                                        <message>Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations</message>
-                                        <excludes>
-                                            <exclude>org.mockito:mockito-all</exclude>
-                <!--                     <exclude>com.google.code.findbugs:annotations</exclude> -->
-                                        </excludes>
-                                    </bannedDependencies>
-                                </rules>
-                                <fail>true</fail>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-                <!-- https://mvnrepository.com/artifact/org.sonarsource.scanner.maven/sonar-maven-plugin -->
-                <plugin>
-                    <groupId>org.sonarsource.scanner.maven</groupId>
-                    <artifactId>sonar-maven-plugin</artifactId>
-                    <version>${sonar.scanner.version}</version>
-                </plugin>
-                <!-- end of plugins from ONAP version (parent of oparent) -->
-
-                <!-- Plugins from ONAP oparent -->
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.22.0</version>
-                    <configuration>
-                        <!-- Sets the VM argument line used when unit tests are run. -->
-                        <argLine>${surefireArgLine}</argLine>
-                        <!-- Excludes integration tests when unit tests are run. -->
-                        <excludes>
-                            <exclude>**/IT*.java</exclude>
-                        </excludes>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-failsafe-plugin</artifactId>
-                    <version>2.22.0</version>
-                    <executions>
-                        <!-- Ensures that both integration-test and verify goals of the Failsafe
-                            Maven plugin are executed. -->
-                        <execution>
-                            <id>integration-tests</id>
-                            <goals>
-                                <goal>integration-test</goal>
-                                <goal>verify</goal>
-                            </goals>
-                            <configuration>
-                                <!-- Sets the VM argument line used when integration tests are run. -->
-                                <argLine>${failsafeArgLine}</argLine>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-
-                <!-- End of plugins from ONAP oparent -->
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>properties-maven-plugin</artifactId>
-                    <version>1.0.0</version>
-                    <executions>
-                        <execution>
-                            <goals>
-                                <goal>set-system-properties</goal>
-                            </goals>
-                            <configuration>
-                                <properties>
-                                    <property>
-                                        <name>maven.wagon.http.ssl.allowall</name>
-                                        <value>${ssl.allowall}</value>
-                                    </property>
-                                    <property>
-                                        <name>maven.wagon.http.ssl.insecure</name>
-                                        <value>${ssl.insecure}</value>
-                                    </property>
-                                </properties>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>versions-maven-plugin</artifactId>
-                    <version>2.5</version>
-                    <configuration>
-                        <processAllModules>true</processAllModules>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-scm-plugin</artifactId>
-                    <version>1.8.1</version>
-                    <configuration>
-                        <tag>${project.artifactId}-${project.version}</tag>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>com.github.ferstl</groupId>
-                    <artifactId>depgraph-maven-plugin</artifactId>
-                    <version>3.3.0</version>
-                    <configuration>
-                        <graphFormat>text</graphFormat>
-                        <outputFileName>${dependency-list.file}</outputFileName>
-                        <outputDirectory>${project.basedir}</outputDirectory>
-                        <transitiveExcludes>*</transitiveExcludes>
-                        <showVersions>true</showVersions>
-                        <showGroupIds>true</showGroupIds>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-        <plugins>
-
-            <!-- Plugins from oparent version (parent of oparent) -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-site-plugin</artifactId>
-            </plugin>
-            <!-- end of plugins from oparent version (parent of oparent) -->
-
-            <!-- Plugins from oparent -->
-            <plugin>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>2.17</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.onap.oparent</groupId>
-                        <artifactId>checkstyle</artifactId>
-                        <version>1.2.2</version>
-                    </dependency>
-                </dependencies>
-                <executions>
-                    <execution>
-                        <id>onap-license</id>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                        <phase>process-sources</phase>
-                        <configuration>
-                            <configLocation>onap-checkstyle/check-license.xml</configLocation>
-                            <includeResources>false</includeResources>
-                            <includeTestSourceDirectory>true</includeTestSourceDirectory>
-                            <includeTestResources>false</includeTestResources>
-                            <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
-                            <excludes>
-                            </excludes>
-                            <consoleOutput>true</consoleOutput>
-                            <failOnViolation>false</failOnViolation>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>onap-java-style</id>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                        <phase>process-sources</phase>
-                        <configuration>
-                            <!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml
-                                with minor changes -->
-                            <configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
-                            <!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory -->
-                            <sourceDirectory>${project.build.sourceDirectory}/src/main/java</sourceDirectory>
-                            <includeResources>true</includeResources>
-                            <includeTestSourceDirectory>true</includeTestSourceDirectory>
-                            <includeTestResources>true</includeTestResources>
-                            <excludes>
-                            </excludes>
-                            <consoleOutput>true</consoleOutput>
-                            <failOnViolation>false</failOnViolation>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.12</version>
-            </plugin>
-            <!-- Jacoco / Sonar -->
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <version>${jacoco.version}</version>
-                <executions>
-                    <execution>
-                        <id>pre-unit-test</id>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                        <configuration>
-                            <!-- Sets the path to the file which contains the execution data. -->
-                            <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
-                            <!-- Sets the name of the property containing the settings for JaCoCo runtime agent. -->
-                            <propertyName>surefireArgLine</propertyName>
-                        </configuration>
-                    </execution>
-                    <!-- Ensures that the code coverage report for unit tests is created after unit tests have been run. -->
-                    <execution>
-                        <id>post-unit-test</id>
-                        <phase>test</phase>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                        <configuration>
-                            <!-- Sets the path to the file which contains the execution data. -->
-                            <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
-                            <!-- Sets the output directory for the code coverage report. -->
-                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>pre-integration-test</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                        <configuration>
-                            <!-- Sets the path to the file which contains the execution data. -->
-                            <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
-                            <!-- Sets the name of the property containing the settings for JaCoCo runtime agent. -->
-                            <propertyName>failsafeArgLine</propertyName>
-                        </configuration>
-                    </execution>
-                    <!-- Ensures that the code coverage report for integration tests after integration tests have been run. -->
-                    <execution>
-                        <id>post-integration-test</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                        <configuration>
-                            <!-- Sets the path to the file which contains the execution data. -->
-                            <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
-                            <!-- Sets the output directory for the code coverage report. -->
-                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>default-prepare-agent</id>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>default-report</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>default-check</id>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <rule>
-                                    <element>PACKAGE</element>
-                                    <limits>
-                                        <limit>
-                                            <counter>COMPLEXITY</counter>
-                                            <value>COVEREDRATIO</value>
-                                            <minimum>0.0</minimum>
-                                        </limit>
-                                    </limits>
-                                </rule>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-failsafe-plugin</artifactId>
-            </plugin>
-            <!-- end of plugins from oparent -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.4</version>
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                        <configuration>
-                            <additionalparam>-Xdoclint:none</additionalparam>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.0.0-M2</version>
-                <executions>
-                    <execution>
-                        <id>enforce-property</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireProperty>
-                                    <property>onap.nexus.url</property>
-                                    <message>You must set a onap.nexus.url property in your
-                                        ~/.m2/settings.xml. See oparent/settings.xml for an example.</message>
-                                </requireProperty>
-                            </rules>
-                            <fail>true</fail>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>enforce-no-snapshots</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireReleaseDeps>
-                                    <failWhenParentIsSnapshot>false</failWhenParentIsSnapshot>
-                                    <onlyWhenRelease>true</onlyWhenRelease>
-                                    <level>WARN</level>
-                                </requireReleaseDeps>
-                            </rules>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>enforce-maven</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireJavaVersion>
-                                    <version>1.8.0</version>
-                                </requireJavaVersion>
-                                <requireMavenVersion>
-                                    <version>[3.5.0,)</version>
-                                </requireMavenVersion>
-                            </rules>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>enforce-banned-dependencies</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <bannedDependencies>
-                                    <message>Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations</message>
-                                    <excludes>
-                                        <exclude>org.mockito:mockito-all</exclude>
-<!--                                         <exclude>com.google.code.findbugs:annotations</exclude> -->
-                                    </excludes>
-                                </bannedDependencies>
-                            </rules>
-                            <fail>true</fail>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <reporting>
-        <plugins>
-            <plugin>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.4</version>
-                <configuration>
-                    <failOnError>false</failOnError>
-                    <additionalparam>-Xdoclint:none</additionalparam>
-                </configuration>
-            </plugin>
-        </plugins>
-    </reporting>
-
-    <profiles>
-        <!-- Profiles from ONAP oparent -->
-        <profile>
-            <id>generate-json</id>
-            <activation>
-                <file>
-                    <exists>${swagger-properties}</exists>
-                </file>
-                <property>
-                    <name>swagger-sdk.generate-json</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>properties-maven-plugin</artifactId>
-                        <version>1.0.0</version>
-                        <executions>
-                            <execution>
-                                <phase>initialize</phase>
-                                <goals>
-                                    <goal>read-project-properties</goal>
-                                </goals>
-                                <configuration>
-                                    <files>
-                                        <file>${basedir}/src/main/resources/swagger.properties</file>
-                                    </files>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>com.github.kongchen</groupId>
-                        <artifactId>swagger-maven-plugin</artifactId>
-                        <version>3.1.4</version>
-                        <configuration>
-                            <apiSources>
-                                <apiSource>
-                                    <locations>${api-rest-package}</locations>
-                                    <schemes>http,https</schemes>
-                                    <host>${api-host-ip}:${api-host-port}</host>
-                                    <basePath>${api-base-path}</basePath>
-                                    <info>
-                                        <title>${api-title}</title>
-                                        <version>${api-version}</version>
-                                        <description>${api-description}</description>
-                                        <license>
-                                            <name>${api-license}</name>
-                                        </license>
-                                    </info>
-                                    <swaggerDirectory>${basedir}/src/main/resources</swaggerDirectory>
-                                </apiSource>
-                            </apiSources>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <phase>compile</phase>
-                                <goals>
-                                    <goal>generate</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-install-plugin</artifactId>
-                        <version>2.3.1</version>
-                        <executions>
-                            <execution>
-                                <id>install-file-id</id>
-                                <phase>install</phase>
-                                <goals>
-                                    <goal>install-file</goal>
-                                </goals>
-                                <configuration>
-                                    <file>${basedir}/src/main/resources/swagger.json</file>
-                                    <groupId>${project.groupId}</groupId>
-                                    <artifactId>${project.artifactId}-swagger-schema</artifactId>
-                                    <version>${project.version}</version>
-                                    <packaging>json</packaging>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>generate-sdk</id>
-            <activation>
-                <file>
-                    <exists>${swagger-json}</exists>
-                </file>
-                <property>
-                    <name>swagger-sdk.generate-java-sdk</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <version>1.8</version>
-                        <executions>
-                            <execution>
-                                <phase>initialize</phase>
-                                <id>ant-create-script</id>
-                                <configuration>
-                                    <exportAntProperties>true</exportAntProperties>
-                                    <tasks>
-                                        <taskdef resource="net/sf/antcontrib/antlib.xml" classpathref="maven.plugin.classpath"/>
-                                        <condition property="is_windows" value="true">
-                                            <os family="windows"/>
-                                        </condition>
-                                        <condition property="isLinux" value="true">
-                                            <os family="unix"/>
-                                        </condition>
-                                        <if>
-                                            <equals arg1="${is_windows}" arg2="true"/>
-                                            <then>
-                                                <property name="swagger.sdk.script.file" value="generated-source-script.bat"/>
-                                                <echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true" message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
-                                                <echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true" message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
-                                            </then>
-                                            <else>
-                                                <property name="swagger.sdk.script.file" value="generated-source-script.sh"/>
-                                                <echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true" message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
-                                                <echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true" message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
-                                                <chmod file="${project.build.directory}${file.separator}generated-source-script.sh" perm="755"/>
-                                            </else>
-                                        </if>
-                                    </tasks>
-                                </configuration>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>ant-contrib</groupId>
-                                <artifactId>ant-contrib</artifactId>
-                                <version>1.0b3</version>
-                                <exclusions>
-                                    <exclusion>
-                                        <groupId>ant</groupId>
-                                        <artifactId>ant</artifactId>
-                                    </exclusion>
-                                </exclusions>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.swagger</groupId>
-                        <artifactId>swagger-codegen-maven-plugin</artifactId>
-                        <version>2.2.1</version>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>generate</goal>
-                                </goals>
-                                <configuration>
-                                    <inputSpec>${basedir}/src/main/resources/swagger.json</inputSpec>
-                                    <output>${project.build.directory}/generated-sources</output>
-                                    <language>java</language>
-                                    <configOptions>
-                                        <dateLibrary>joda</dateLibrary>
-                                    </configOptions>
-                                    <library>jersey2</library>
-                                    <groupId>${project.groupId}</groupId>
-                                    <artifactId>${project.artifactId}-java-sdk</artifactId>
-                                    <artifactVersion>${project.version}</artifactVersion>
-                                    <modelPackage>${project.groupId}.${project.artifactId}.client.model</modelPackage>
-                                    <apiPackage>${project.groupId}.${project.artifactId}.client.api</apiPackage>
-                                    <invokerPackage>${project.groupId}.${project.artifactId}.client.invoker</invokerPackage>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>exec-maven-plugin</artifactId>
-                        <version>1.5.0</version>
-                        <executions>
-                            <execution>
-                                <id>swagger-generate-sources</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>exec</goal>
-                                </goals>
-                                <configuration>
-                                    <executable>${project.build.directory}${file.separator}${swagger.sdk.script.file}</executable>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-clean-plugin</artifactId>
-                        <version>3.0.0</version>
-                        <executions>
-                            <execution>
-                                <id>clean-generated-files</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>clean</goal>
-                                </goals>
-                                <configuration>
-                                    <filesets>
-                                        <fileset>
-                                            <directory>${project.build.directory}/generated-sources</directory>
-                                        </fileset>
-                                    </filesets>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>org.onap.msb.swagger-sdk</groupId>
-                    <artifactId>swagger-sdk</artifactId>
-                    <version>1.0.0</version>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>sonar-jacoco-aggregate</id>
-            <activation>
-                <property>
-                    <name>onap.jacoco.aggregateFile</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.jacoco</groupId>
-                        <artifactId>jacoco-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>merge</id>
-                                <goals>
-                                    <goal>merge</goal>
-                                </goals>
-                                <phase>generate-resources</phase>
-                                <configuration>
-                                    <destFile>${onap.jacoco.aggregateFile}</destFile>
-                                    <fileSets>
-                                        <fileSet>
-                                            <directory>${project.basedir}</directory>
-                                            <includes>
-                                                <include>**/target/code-coverage/*.exec</include>
-                                            </includes>
-                                        </fileSet>
-                                    </fileSets>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <!-- End of profiles from ONAP oparent -->
-
-        <profile>
-            <id>yang-compile</id>
-            <activation>
-                <file>
-                    <exists>src/main/yang</exists>
-                </file>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.opendaylight.yangtools</groupId>
-                        <artifactId>yang-maven-plugin</artifactId>
-                        <version>3.0.11</version>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.opendaylight.mdsal</groupId>
-                                <artifactId>maven-sal-api-gen-plugin</artifactId>
-                                <version>${odl.mdsal.model.version}</version>
-                                <type>jar</type>
-                                <scope>compile</scope>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.opendaylight.netconf</groupId>
-                                <artifactId>sal-rest-docgen-maven</artifactId>
-                                <version>${odl.netconf.sal.rest.docgen.version}</version>
-                                <type>jar</type>
-                            </dependency>
-                        </dependencies>
-                        <executions>
-                            <execution>
-                                <id>binding</id>
-                                <goals>
-                                    <goal>generate-sources</goal>
-                                </goals>
-                                <configuration>
-                                    <yangFilesRootDir>${yang.file.directory}</yangFilesRootDir>
-                                    <codeGenerators>
-                                        <generator>
-                                            <codeGeneratorClass>org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
-                                            <outputBaseDir>${salGeneratorPath}</outputBaseDir>
-                                        </generator>
-                                        <generator>
-                                            <codeGeneratorClass>org.opendaylight.netconf.sal.rest.doc.maven.StaticDocGenerator</codeGeneratorClass>
-                                            <outputBaseDir>target/swagger</outputBaseDir>
-                                        </generator>
-                                    </codeGenerators>
-                                    <inspectDependencies>true</inspectDependencies>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-</project>
index 4ed94b6..af9e81b 100644 (file)
@@ -19,5 +19,5 @@ VES_TEST_COLLECTOR_IMAGE_NAME=hightec/ves-testcollector
 VES_TEST_COLLECTOR_IMAGE_TAG=latest
 EXT_VES_PORT=3000
 VES_API=7
-VES_FORMAT_FILE=CommonEventFormat_30.0.1.json
+VES_FORMAT_FILE=CommonEventFormat_30.2.1_ONAP.json
 LOCAL_VES_MOUNT=/var/tmp/VES
index 7c92a57..40acdef 100644 (file)
@@ -9,7 +9,7 @@ define within '.env' file
 ```
 EXT_VES_PORT=30007
 VES_API=7
-VES_FORMAT_FILE=CommonEventFormat_30.1_ONAP.json
+VES_FORMAT_FILE=CommonEventFormat_30.2.1_ONAP.json
 LOCAL_VES_MOUNT=/var/tmp/ves-v7
 ```
 
@@ -17,7 +17,7 @@ this would mean:
 
  *  ves-testcollector URL is <ip_host>:30007/eventListener/v7
  *  logs are stored on docker host  /var/tmp/VES.V7/logs
- *  VES format file is 'CommonEventFormat_30.1_ONAP.json'
+ *  VES format file is 'CommonEventFormat_30.2.1_ONAP.json'
  *  
  ## USAGE
 
index fc0b059..fbb5ed2 100644 (file)
@@ -1,6 +1,6 @@
-# O-RAN Components interfaceing with VES-Collector
+# O-RAN Components interfacing with VES-Collector
 
-Test scripts for interfaceing with DCAE.
+Test scripts for interfacing with DCAE.
 
 For ONAP Frankfurt the interface definition with DCAE is: [CommonEventFormat_30.1_ONAP.json](./json/schema/CommonEventFormat_30.1_ONAP.json).
 The ONAP VES version are described in [ONAP documentation](https://onap.readthedocs.io/en/latest/submodules/vnfrqts/requirements.git/docs/Chapter8/ves7_1spec.html).
@@ -9,25 +9,17 @@ For ONAP Frankfurt the interface definition with A&AI is: [add link when known](
 
 ## Prerequisites
 
-This git project must be cloned on a ubuntu maschine in order to execute the bash scripts.
+This git project must be cloned on a ubuntu machine in order to execute the bash scripts.
 DCAE provide REST interfaces. In order to perform HTTP request [cURL](https://curl.haxx.se/) is used. 
 
 In case cURL needs to be please use the following command in a terminal.
 
 ```
-sudo apt-get install curl 
+sudo apt install curl 
 ```
 
-For interfacing with cert (https) and key must be extracted acoording to
-https://wiki.web.att.com/pages/viewpage.action?spaceKey=SDNCDEV&title=Query+AAI+Using+Postman.
-```
-./_extractCertAndKey.sh
-```
-You will be ask to enter the "Input Password". 
-The password must not be shared here, please ask your admin.
-
-It is nessary to configure the DCAE servers for valid excecution of the bash scripts.
-Please update the varables in [config](-/config) accordintly to the test enviroment.
+It is necessary to configure the DCAE servers for valid execution of the bash scripts.
+Please update the variables in [config](-/config) accordingly to the test environment.
 
 ```
 urlVes=http://localhost:8443/eventListener/v7
@@ -36,14 +28,14 @@ basicAuthVes=ves:ves
 
 ## Concept
 
-Several tests scripts are avialable in the root of this project. 
+Several tests scripts are available in the root of this project. 
 The bash scripts will perform a cURL command to send a REST request to the A&AI or DCAE server.
 
 ![SDN-R NBIs](images/sndr-nbis.png "SDN-R NBIs" )
 
 ## Scripts
 
-This chapter descibes the several test scripts its usage and functions.
+This chapter describes the several test scripts its usage and functions.
 
 ### _example
 
@@ -53,23 +45,23 @@ This scripts calls all the other scripts in order to give valid examples and to
 ./_example.sh 
 ```
 
-Please see valid examples using the followfing command (or continue reading):
+Please see valid examples using the following command (or continue reading):
 
 ```
 cat _example.sh 
 ```
 
-### createPnf
+### pnfRegistration
 
 The script creates a PNF object in A&AI. The script requires one input parameter. This parameter defines the equipment type. Valid equipment types for 1806 and 1810 are [1234, FYNG, R2D2, 7DEV, nSky, 1OSF] according to document "295672 SDN-R System Requirements".
 
 ```
-./createPnf.sh 7DEV
+./pnfRegister.sh 7DEV
 ```
 
 ### sendHeartbeat
 
-The script sends a "heardbeat" from SDN-R to DCAE.
+The script sends a "heartbeat" from SDN-R to DCAE VES-Collector.
 
 The following example show the usage of this script:
 ```
@@ -87,7 +79,7 @@ This script send a VES message of domain "fault" to DCAE. It requires three comm
 
 3. **severity**: The severity of tha alarm as defined by [VES schema](./json/schema/CommonEventFormat_30.1_ONAP.json). 
 
-The following example show the usage of this script. The alarm "lossOfSignal" for equipment type "nSky" with severtiy "CRITICAL" will be send.
+The following example show the usage of this script. The alarm "lossOfSignal" for equipment type "nSky" with severity "CRITICAL" will be send.
 
 ```
 ./sendFault.sh nSky lossOfSignal CRITICAL
@@ -129,7 +121,7 @@ This script send a VES message of domain "fault" AND "heartbeat" as event list t
 
 3. **severity**: The severity of tha alarm as defined by [VES schema](./json/schema/CommonEventFormat_30.1_ONAP.json). 
 
-The following example show the usage of this script. The alarm "lossOfSignal" for equipment type "nSky" with severtiy "CRITICAL" will be send.
+The following example show the usage of this script. The alarm "lossOfSignal" for equipment type "nSky" with severity "CRITICAL" will be send.
 
 ```
 ./sendEventList.sh 1234 lossOfSignal CRITICAL
diff --git a/solution/dev/ves-test-collector/client-scripts-ves-v7/READMEpy.md b/solution/dev/ves-test-collector/client-scripts-ves-v7/READMEpy.md
new file mode 100644 (file)
index 0000000..1dcb524
--- /dev/null
@@ -0,0 +1,98 @@
+# VES Events
+
+VES: Virtual Event Streaming (HTTP1.1/json-schema)
+
+This document describes sending of VES events according to 
+[VES 7.2.1](https://gerrit.onap.org/r/gitweb?p=dcaegen2/collectors/ves.git;a=blob;f=etc/CommonEventFormat_30.2.1_ONAP.json) 
+as expected by O-RAN Operation and Maintenance Interface Specification. 
+
+## Prerequisites
+
+Python3 is expected to run the scripts.
+
+```
+pip3 install requests
+```
+
+## VES Domains
+
+The syntax of a single VES event is devices into a common header and an event
+specific body.
+
+The event specific bodies are are identified by the VES domain.
+
+### VES Domain "fault"
+
+tbd.
+
+### VES Domain "heartbeat",
+
+The script simulates a VES event of domain "heartbeat" from SDN-R to DCAE VES-Collector.
+
+The following example show the usage of this script:
+
+```
+python3 sendVesHeartbeat.py
+```
+
+### VES Domain "measurement",
+
+tbd.
+
+### VES Domain "mobileFlow",
+
+tbd.
+
+### VES Domain "notification",
+
+The script simulates a VES event of domain "notification" from a physical 
+network-function to DCAE VES-Collector.
+
+The following example show the usage of this script:
+
+```
+python3 sendVesNotification.py --pnfId nSky
+```
+
+### VES Domain "other",
+
+tbd.
+
+### VES Domain "perf3gpp",
+
+tbd.
+
+### VES Domain "pnfRegistration",
+
+tbd.
+
+### VES Domain "sipSignaling",
+
+tbd.
+
+### VES Domain "stateChange",
+
+The script simulates a VES event of domain "stateChange" from a physical 
+network-function to DCAE VES-Collector.
+
+The following example show the usage of this script:
+
+```
+python3 sendVesStateChange.py --pnfId nSky
+```
+
+### VES Domain "stndDefined",
+
+tbd.
+
+### VES Domain "syslog",
+
+tbd.
+
+### VES Domain "thresholdCrossingAlert",
+
+tbd.
+
+### VES Domain "voiceQuality"
+
+tbd.
index d11dc5c..a5ffe77 100644 (file)
@@ -1,6 +1,5 @@
 ################################################################################
-#
-# Copyright 2019 highstreet technologies GmbH and others
+# Copyright 2021 highstreet technologies GmbH and others
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 
 ################################################################################
 # DCAE VES Collector communication end point 
-urlVes=http://localhost:30007/eventListener/v7
-basicAuthVes=will:pill
+urlVes=https://localhost:8443/eventListener/v7
+basicAuthVes=sample1:sample1
 
 ################################################################################
 # common generated event settings, please dont touch
-timestamp=$(date -u +%s%3N)
-timeInS=${timestamp:0:$((${#timestamp}-3))}
-timeMs=${timestamp:(-3)}
+timestamp=$(date -u +%s%6N)
+timeInS=${timestamp:0:$((${#timestamp}-6))}
+timeMs=${timestamp:(-6)}
 eventTime=$(date -u -d @$timeInS +'%Y-%m-%dT%H:%M:%S').$timeMs"Z"
 eventType="O_RAN_COMPONENT"
 
@@ -59,7 +58,7 @@ pnfIdByType=(
     [fyng]=LKCYFL79Q01M01FYNG01 
     [r2d2]=MMTSIL02Q01M01R2D201 
     [7dev]=PRTNILACQ01M017DEV01 
-    [nsky]=SEDNKSAHQ01M01nSky01 
+    [nsky]=O-RAN-FH-IPv6-01 
     [1OSF]=SNSNFLR0Q01M011OSF01
 
     [no5g]=MMTSIL02Q01M01NO5G01 
diff --git a/solution/dev/ves-test-collector/client-scripts-ves-v7/config.yml b/solution/dev/ves-test-collector/client-scripts-ves-v7/config.yml
new file mode 100644 (file)
index 0000000..4ba069b
--- /dev/null
@@ -0,0 +1,109 @@
+################################################################################
+# Copyright 2021 highstreet technologies GmbH
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+################################################################################
+# Configuration for interface tests 
+
+################################################################################
+# DCAE VES Collector communication end point
+vesEndpoint:
+  url: https://localhost:8443/eventListener/v7
+  username: sample1
+  password: sample1
+  verify: False
+
+################################################################################
+# common generated event settings, please don't touch
+
+settings:
+  eventType: O_RAN_COMPONENT
+  sequence: 357
+
+################################################################################
+# Information from document: SDN-R System Requirements
+#
+# a. VendorA   1234 BestInClass    (1234)
+# b. VendorA   FancyNextGeneration (FYNG)
+# c. VendorB   R2D2 NewFuture      (R2D2)
+# d. VendorB   7200DEV             (7DEV)
+# e. VendorC   TheSkyIsTheLimit    (nSky)
+# f. VendorC   OpenSourceFirst     (1OSF)
+
+# g. VendorA   PNF5G               (NO5G)
+# h. VendorB   PNF5G               (VB5G)
+# i. VendorC   NGCell              (NGCE)  
+# j. VendorC   O-RU                (SCRU)
+#
+# z. SDN-R     Controller itself   (SDNR)
+
+pnfType:
+  a234: 
+    id: f2030d4a-8f0e-11eb-8dcd-0242ac130003
+    model: "a234 BestInClass" 
+    oamIpv4: 10.10.10.11
+    vendor: VendorA 
+  fyng: 
+    id: f2030f70-8f0e-11eb-8dcd-0242ac130003 
+    model: FancyNextGeneration 
+    oamIpv4: 10.10.10.11
+    vendor: VendorA 
+  r2d2: 
+    id: f203111e-8f0e-11eb-8dcd-0242ac130003 
+    model: R2D2 NewFuture 
+    oamIpv4: 10.10.10.11
+    vendor: VendorB
+  7dev: 
+    id: f203136c-8f0e-11eb-8dcd-0242ac130003 
+    model: 7200DEV 
+    oamIpv4: 10.10.10.11
+    vendor: VendorB
+  nsky: 
+    id: f203143e-8f0e-11eb-8dcd-0242ac130003 
+    model: TheSkyIsTheLimit 
+    oamIpv4: 10.10.10.11
+    vendor: VendorC
+  1OSF: 
+    id: f20317e0-8f0e-11eb-8dcd-0242ac130003
+    model: OpenSourceFirst 
+    oamIpv4: 10.10.10.11
+    vendor: VendorC
+  no5g: 
+    id: f20318b2-8f0e-11eb-8dcd-0242ac130003 
+    model: PNF5G 
+    oamIpv4: 10.10.10.11
+    vendor: VendorA 
+  vb5g: 
+    id: f2031966-8f0e-11eb-8dcd-0242ac130003 
+    model: PNF5G 
+    oamIpv4: 10.10.10.11
+    vendor: VendorB
+  ngce: 
+    id: f2031a2e-8f0e-11eb-8dcd-0242ac130003 
+    model: NGCell
+    oamIpv4: 10.10.10.11
+    vendor: VendorC
+  scru: 
+    id: 4365333e-8f0f-11eb-8dcd-0242ac130003
+    model: O-RU
+    oamIpv4: 10.10.10.11
+    vendor: VendorC
+    interface: LP-MWPS-RADIO
+  sdnr: 
+    id: 4365360e-8f0f-11eb-8dcd-0242ac130003
+    model: "ONAP SDN Controller for Radio" 
+    oamIpv4: 127.0.0.1
+    vendor: ONAP
+    interface: northbound-interface
diff --git a/solution/dev/ves-test-collector/client-scripts-ves-v7/globalVesEventEmitter.py b/solution/dev/ves-test-collector/client-scripts-ves-v7/globalVesEventEmitter.py
new file mode 100644 (file)
index 0000000..1776b96
--- /dev/null
@@ -0,0 +1,66 @@
+#!/usr/bin/env python
+################################################################################
+# Copyright 2021 highstreet technologies GmbH
+#
+# Licensed under the Apache License, Version 2.0 (the 'License');
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an 'AS IS' BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+################################################################################
+# A selection of common methods
+
+import datetime
+import json
+import os
+import socket
+import yaml
+from pathlib import Path
+
+def getInitData(domain):
+  currentTime = datetime.datetime.utcnow()
+  dir = os.path.dirname(os.path.realpath(__file__))
+
+  result = {}
+  result['domain']= domain
+  result['directory']= dir
+  result['outdir']= dir + '/json/examples'
+  result['fqdn']= socket.getfqdn()
+  result['timestamp']= int(currentTime.timestamp()*1000000)
+  result['eventTime']= currentTime.isoformat() + 'Z'
+  result['interface']= "urn:ietf:params:xml:ns:yang:ietf-interfaces:interfaces/interface/name='O-RAN-SC-OAM'"
+
+  # Read config
+  with open('config.yml', 'r') as stream:
+    try:
+        result['config']= yaml.safe_load(stream)
+    except yaml.YAMLError as exc:
+        print(exc)
+
+  # Read template body
+  templateFileName = dir + '/json/templates/' + domain + '.json'
+  with open(templateFileName) as f:
+    result['body']= json.load(f)
+
+  
+  Path(result["outdir"]).mkdir(parents=True, exist_ok=True)
+  return result
+
+def saveExample(data):
+  if 'directory' in data and 'domain' in data and 'body' in data:
+    name = data['domain']
+    if 'pnfId' in data: name = '-'.join( (data['pnfId'], data['domain']) )
+    outputFileName = data['directory'] + '/json/examples/' + name + '.json'
+    with open(outputFileName, 'w') as f:
+      json.dump(data['body'], f, indent=2, sort_keys=True)
+  else:
+    print("Example could not been saved:\n" + json.dump(data, f, indent=2, sort_keys=True)) 
+  
\ No newline at end of file
@@ -3,10 +3,13 @@
     "title": "VES Event Listener Common Event Format",
     "type": "object",
     "properties": {
-        "event": {"$ref": "#/definitions/event"},
-        "eventList": {"$ref": "#/definitions/eventList"}
+        "event": {
+            "$ref": "#/definitions/event"
+        },
+        "eventList": {
+            "$ref": "#/definitions/eventList"
+        }
     },
-    
     "definitions": {
         "schemaHeaderBlock": {
             "description": "schema date, version, author and associated API",
                     "type": "string"
                 },
                 "lastUpdatedBy": {
-                    "description": "re2947",
+                    "description": "damian.nowak@nokia.com",
                     "type": "string"
                 },
                 "schemaDate": {
-                    "description": "December 4, 2018",
+                    "description": "Jan 04, 2021",
                     "type": "string"
                 },
                 "schemaVersion": {
-                    "description": "30.1",
+                    "description": "30.2.1",
                     "type": "number"
                 }
             }
         },
         "schemaLicenseAndCopyrightNotice": {
-            "description": "Copyright (c) 2018, AT&T Intellectual Property.  All rights reserved",
+            "description": "Copyright (c) 2020, AT&T Intellectual Property.  All rights reserved. Modification Copyright (c) 2021, Nokia Solutions and Networks.",
             "type": "object",
             "properties": {
                 "apacheLicense2.0": {
             "description": "number of times an identified codec was used over the measurementInterval",
             "type": "object",
             "properties": {
-                "codecIdentifier": { "type": "string" },
-                "numberInUse": { "type": "integer" }
+                "codecIdentifier": {
+                    "type": "string"
+                },
+                "numberInUse": {
+                    "type": "integer"
+                }
             },
             "additionalProperties": false,
-            "required": [ "codecIdentifier", "numberInUse" ]
+            "required": [
+                "codecIdentifier",
+                "numberInUse"
+            ]
         },
         "commonEventHeader": {
             "description": "fields common to all events",
                         "pnfRegistration",
                         "sipSignaling",
                         "stateChange",
+                        "stndDefined",
                         "syslog",
                         "thresholdCrossingAlert",
                         "voiceQuality"
                     "description": "for example - applicationNf, guestOS, hostOS, platform",
                     "type": "string"
                 },
-                "internalHeaderFields": { "$ref": "#/definitions/internalHeaderFields" },
+                "internalHeaderFields": {
+                    "$ref": "#/definitions/internalHeaderFields"
+                },
                 "lastEpochMicrosec": {
                     "description": "the latest unix time aka epoch time associated with the event from any component--as microseconds elapsed since 1 Jan 1970 not including leap seconds",
                     "type": "number"
                     "description": "the earliest unix time aka epoch time associated with the event from any component--as microseconds elapsed since 1 Jan 1970 not including leap seconds",
                     "type": "number"
                 },
+                "stndDefinedNamespace": {
+                    "description": "Standards organization defined event namespace; expected usage includes event routing by the event listener",
+                    "type": "string"
+                },
                 "timeZoneOffset": {
                     "description": "UTC offset for the local time zone of the device as UTC+/-hh.mm",
                     "type": "string"
                 "version": {
                     "description": "version of the event header",
                     "type": "string",
-                    "enum": [ "4.0", "4.0.1", "4.1" ]
+                    "enum": [
+                        "4.0",
+                        "4.0.1",
+                        "4.1"
+                    ]
                 },
                 "vesEventListenerVersion": {
                     "description": "version of the VES Event Listener API",
                     "type": "string",
-                    "enum": [ "7.0", "7.0.1", "7.1" ]
+                    "enum": [
+                        "7.0",
+                        "7.0.1",
+                        "7.1",
+                        "7.1.1",
+                        "7.2",
+                        "7.2.1"
+                    ]
                 }
             },
             "additionalProperties": false,
-            "required": [ "domain", "eventId", "eventName", "lastEpochMicrosec",
-                          "priority", "reportingEntityName", "sequence", "sourceName",
-                          "startEpochMicrosec", "version", "vesEventListenerVersion" ]
+            "required": [
+                "domain",
+                "eventId",
+                "eventName",
+                "lastEpochMicrosec",
+                "priority",
+                "reportingEntityName",
+                "sequence",
+                "sourceName",
+                "startEpochMicrosec",
+                "version",
+                "vesEventListenerVersion"
+            ]
         },
         "counter": {
             "description": "performance counter",
             "type": "object",
             "properties": {
-                "criticality": { "type": "string", "enum": [ "CRIT", "MAJ" ] },
-                "hashMap": { "$ref": "#/definitions/hashMap" },
-                "thresholdCrossed": { "type": "string" }
+                "criticality": {
+                    "type": "string",
+                    "enum": [
+                        "CRIT",
+                        "MAJ"
+                    ]
+                },
+                "hashMap": {
+                    "$ref": "#/definitions/hashMap"
+                },
+                "thresholdCrossed": {
+                    "type": "string"
+                }
             },
             "additionalProperties": false,
-            "required": [ "criticality", "hashMap", "thresholdCrossed" ]
+            "required": [
+                "criticality",
+                "hashMap",
+                "thresholdCrossed"
+            ]
         },
         "cpuUsage": {
             "description": "usage of an identified CPU",
                 }
             },
             "additionalProperties": false,
-            "required": [ "cpuIdentifier", "percentUsage" ]
+            "required": [
+                "cpuIdentifier",
+                "percentUsage"
+            ]
         },
         "diskUsage": {
             "description": "usage of an identified disk",
                     "type": "string"
                 },
                 "diskIoTimeAvg": {
-                    "description": "milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms matches 100% load; provide the average over the measurement interval",
+                    "description": "milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms  matches 100% load; provide the average over the measurement interval",
                     "type": "number"
                 },
                 "diskIoTimeLast": {
-                    "description": "milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms matches 100% load; provide the last value measurement within the measurement interval",
+                    "description": "milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms  matches 100% load; provide the last value measurement within the measurement interval",
                     "type": "number"
                 },
                 "diskIoTimeMax": {
-                    "description": "milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms matches 100% load; provide the maximum value measurement within the measurement interval",
+                    "description": "milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms  matches 100% load; provide the maximum value measurement within the measurement interval",
                     "type": "number"
                 },
                 "diskIoTimeMin": {
-                    "description": "milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms matches 100% load; provide the minimum value measurement within the measurement interval",
+                    "description": "milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms  matches 100% load; provide the minimum value measurement within the measurement interval",
                     "type": "number"
                 },
                 "diskMergedReadAvg": {
                 }
             },
             "additionalProperties": false,
-            "required": [ "diskIdentifier" ]
+            "required": [
+                "diskIdentifier"
+            ]
         },
         "endOfCallVqmSummaries": {
             "description": "provides end of call voice quality metrics",
                 "endpointDescription": {
                     "description": "either Caller or Callee",
                     "type": "string",
-                    "enum": ["Caller", "Callee"]
+                    "enum": [
+                        "Caller",
+                        "Callee"
+                    ]
                 },
                 "endpointMaxJitter": {
                     "description": "endpoint maximum jitter",
                     "type": "number"
                 },
                 "packetLossPercent": {
-                    "description" : "Calculated percentage packet loss based on Endpoint RTP packets lost (as reported in RTCP) and Local RTP packets sent. Direction is based on Endpoint description (Caller, Callee). Decimal (2 dp)",
+                    "description": "Calculated percentage packet loss based on Endpoint RTP packets lost (as reported in RTCP) and Local RTP packets sent. Direction is based on Endpoint description (Caller, Callee). Decimal (2 dp)",
                     "type": "number"
                 },
                 "rFactor": {
                 }
             },
             "additionalProperties": false,
-            "required": [ "adjacencyName", "endpointDescription" ]
+            "required": [
+                "adjacencyName",
+                "endpointDescription"
+            ]
         },
         "event": {
             "description": "the root level of the common event format",
             "type": "object",
             "properties": {
-                "commonEventHeader": { "$ref": "#/definitions/commonEventHeader" },
-                "faultFields": { "$ref": "#/definitions/faultFields" },
-                "heartbeatFields": { "$ref": "#/definitions/heartbeatFields" },
-                "measurementFields": { "$ref": "#/definitions/measurementFields" },
-                "mobileFlowFields": { "$ref": "#/definitions/mobileFlowFields" },
-                "notificationFields": { "$ref": "#/definitions/notificationFields" },
-                "otherFields": { "$ref": "#/definitions/otherFields" },
-                "perf3gppFields": { "$ref": "#/definitions/perf3gppFields" },
-                "pnfRegistrationFields": { "$ref": "#/definitions/pnfRegistrationFields" },
-                "sipSignalingFields": { "$ref": "#/definitions/sipSignalingFields" },
-                "stateChangeFields": { "$ref": "#/definitions/stateChangeFields" },
-                "syslogFields": { "$ref": "#/definitions/syslogFields" },
-                "thresholdCrossingAlertFields": { "$ref": "#/definitions/thresholdCrossingAlertFields" },
-                "voiceQualityFields": { "$ref": "#/definitions/voiceQualityFields" }
+                "commonEventHeader": {
+                    "$ref": "#/definitions/commonEventHeader"
+                },
+                "faultFields": {
+                    "$ref": "#/definitions/faultFields"
+                },
+                "heartbeatFields": {
+                    "$ref": "#/definitions/heartbeatFields"
+                },
+                "measurementFields": {
+                    "$ref": "#/definitions/measurementFields"
+                },
+                "mobileFlowFields": {
+                    "$ref": "#/definitions/mobileFlowFields"
+                },
+                "notificationFields": {
+                    "$ref": "#/definitions/notificationFields"
+                },
+                "otherFields": {
+                    "$ref": "#/definitions/otherFields"
+                },
+                "perf3gppFields": {
+                    "$ref": "#/definitions/perf3gppFields"
+                },
+                "pnfRegistrationFields": {
+                    "$ref": "#/definitions/pnfRegistrationFields"
+                },
+                "sipSignalingFields": {
+                    "$ref": "#/definitions/sipSignalingFields"
+                },
+                "stateChangeFields": {
+                    "$ref": "#/definitions/stateChangeFields"
+                },
+                "stndDefinedFields": {
+                    "$ref": "#/definitions/stndDefinedFields"
+                },
+                "syslogFields": {
+                    "$ref": "#/definitions/syslogFields"
+                },
+                "thresholdCrossingAlertFields": {
+                    "$ref": "#/definitions/thresholdCrossingAlertFields"
+                },
+                "voiceQualityFields": {
+                    "$ref": "#/definitions/voiceQualityFields"
+                }
             },
             "additionalProperties": false,
-            "required": [ "commonEventHeader" ]
+            "required": [
+                "commonEventHeader"
+            ]
         },
         "eventList": {
             "description": "array of events",
             "description": "fields specific to fault events",
             "type": "object",
             "properties": {
-                "alarmAdditionalInformation": { "$ref": "#/definitions/hashMap" },
+                "alarmAdditionalInformation": {
+                    "$ref": "#/definitions/hashMap"
+                },
                 "alarmCondition": {
                     "description": "alarm condition reported by the device",
                     "type": "string"
                 "faultFieldsVersion": {
                     "description": "version of the faultFields block",
                     "type": "string",
-                    "enum": [ "4.0" ]
+                    "enum": [
+                        "4.0"
+                    ]
                 },
                 "specificProblem": {
                     "description": "short description of the alarm or problem",
                 }
             },
             "additionalProperties": false,
-            "required": [ "alarmCondition", "eventSeverity", "eventSourceType",
-                          "faultFieldsVersion", "specificProblem", "vfStatus" ]
+            "required": [
+                "alarmCondition",
+                "eventSeverity",
+                "eventSourceType",
+                "faultFieldsVersion",
+                "specificProblem",
+                "vfStatus"
+            ]
         },
         "filesystemUsage": {
             "description": "disk usage of an identified virtual machine in gigabytes and/or gigabytes per second",
             "type": "object",
             "properties": {
-                "blockConfigured": { "type": "number" },
-                "blockIops": { "type": "number" },
-                "blockUsed": { "type": "number" },
-                "ephemeralConfigured": { "type": "number" },
-                "ephemeralIops": { "type": "number" },
-                "ephemeralUsed": { "type": "number" },
-                "filesystemName": { "type": "string" }
+                "blockConfigured": {
+                    "type": "number"
+                },
+                "blockIops": {
+                    "type": "number"
+                },
+                "blockUsed": {
+                    "type": "number"
+                },
+                "ephemeralConfigured": {
+                    "type": "number"
+                },
+                "ephemeralIops": {
+                    "type": "number"
+                },
+                "ephemeralUsed": {
+                    "type": "number"
+                },
+                "filesystemName": {
+                    "type": "string"
+                }
             },
             "additionalProperties": false,
-            "required": [ "blockConfigured", "blockIops", "blockUsed", "ephemeralConfigured",
-                          "ephemeralIops", "ephemeralUsed", "filesystemName" ]
+            "required": [
+                "blockConfigured",
+                "blockIops",
+                "blockUsed",
+                "ephemeralConfigured",
+                "ephemeralIops",
+                "ephemeralUsed",
+                "filesystemName"
+            ]
         },
         "gtpPerFlowMetrics": {
             "description": "Mobility GTP Protocol per flow metrics",
                     "type": "string"
                 },
                 "gtpTunnelStatus": {
-                    "description": "Current tunnel state at reporting time",
+                    "description": "Current tunnel state  at reporting time",
                     "type": "string"
                 },
-                "ipTosCountList": { "$ref": "#/definitions/hashMap" },
+                "ipTosCountList": {
+                    "$ref": "#/definitions/hashMap"
+                },
                 "ipTosList": {
                     "description": "Array of unique IP Type-of-Service values observed in the flow where values range from '0' to '255'",
                     "type": "array",
                     "description": "maximum transmit bit rate",
                     "type": "number"
                 },
-                "mobileQciCosCountList": { "$ref": "#/definitions/hashMap" },
+                "mobileQciCosCountList": {
+                    "$ref": "#/definitions/hashMap"
+                },
                 "mobileQciCosList": {
                     "description": "Array of unique LTE QCI or UMTS class-of-service values observed in the flow",
                     "type": "array",
                     "description": "round trip time",
                     "type": "number"
                 },
-                "tcpFlagCountList": { "$ref": "#/definitions/hashMap" },
+                "tcpFlagCountList": {
+                    "$ref": "#/definitions/hashMap"
+                },
                 "tcpFlagList": {
                     "description": "Array of unique TCP Flags observed in the flow",
                     "type": "array",
                 }
             },
             "additionalProperties": false,
-            "required": [ "avgBitErrorRate", "avgPacketDelayVariation", "avgPacketLatency",
-                          "avgReceiveThroughput", "avgTransmitThroughput",
-                          "flowActivationEpoch", "flowActivationMicrosec",
-                          "flowDeactivationEpoch", "flowDeactivationMicrosec",
-                          "flowDeactivationTime", "flowStatus",
-                          "maxPacketDelayVariation", "numActivationFailures",
-                          "numBitErrors", "numBytesReceived", "numBytesTransmitted",
-                          "numDroppedPackets", "numL7BytesReceived",
-                          "numL7BytesTransmitted", "numLostPackets",
-                          "numOutOfOrderPackets", "numPacketErrors",
-                          "numPacketsReceivedExclRetrans",
-                          "numPacketsReceivedInclRetrans",
-                          "numPacketsTransmittedInclRetrans",
-                          "numRetries", "numTimeouts", "numTunneledL7BytesReceived",
-                          "roundTripTime", "timeToFirstByte"
+            "required": [
+                "avgBitErrorRate",
+                "avgPacketDelayVariation",
+                "avgPacketLatency",
+                "avgReceiveThroughput",
+                "avgTransmitThroughput",
+                "flowActivationEpoch",
+                "flowActivationMicrosec",
+                "flowDeactivationEpoch",
+                "flowDeactivationMicrosec",
+                "flowDeactivationTime",
+                "flowStatus",
+                "maxPacketDelayVariation",
+                "numActivationFailures",
+                "numBitErrors",
+                "numBytesReceived",
+                "numBytesTransmitted",
+                "numDroppedPackets",
+                "numL7BytesReceived",
+                "numL7BytesTransmitted",
+                "numLostPackets",
+                "numOutOfOrderPackets",
+                "numPacketErrors",
+                "numPacketsReceivedExclRetrans",
+                "numPacketsReceivedInclRetrans",
+                "numPacketsTransmittedInclRetrans",
+                "numRetries",
+                "numTimeouts",
+                "numTunneledL7BytesReceived",
+                "roundTripTime",
+                "timeToFirstByte"
             ]
         },
         "hashMap": {
             "description": "an associative array which is an array of key:value pairs",
             "type": "object",
-            "additionalProperties": { "type": "string" },
+            "additionalProperties": {
+                "type": "string"
+            },
             "default": {}
         },
         "heartbeatFields": {
             "description": "optional field block for fields specific to heartbeat events",
             "type": "object",
             "properties": {
-                "additionalFields": { "$ref": "#/definitions/hashMap" },
+                "additionalFields": {
+                    "$ref": "#/definitions/hashMap"
+                },
                 "heartbeatFieldsVersion": {
                     "description": "version of the heartbeatFields block",
                     "type": "string",
-                    "enum": [ "3.0" ]
+                    "enum": [
+                        "3.0"
+                    ]
                 },
                 "heartbeatInterval": {
                     "description": "current heartbeat interval in seconds",
                 }
             },
             "additionalProperties": false,
-            "required": [ "heartbeatFieldsVersion", "heartbeatInterval" ]
+            "required": [
+                "heartbeatFieldsVersion",
+                "heartbeatInterval"
+            ]
         },
         "hugePages": {
             "description": "metrics on system hugepages",
                 }
             },
             "additionalProperties": false,
-            "required": [ "hugePagesIdentifier" ]
+            "required": [
+                "hugePagesIdentifier"
+            ]
         },
         "internalHeaderFields": {
             "description": "enrichment fields for internal VES Event Listener service use only, not supplied by event sources",
                 }
             },
             "additionalProperties": false,
-            "required": [ "baseboardTemperatureIdentifier" ]
+            "required": [
+                "baseboardTemperatureIdentifier"
+            ]
         },
         "ipmiBaseboardVoltageRegulator": {
             "description": "intelligent platform management interface (ipmi) baseboard voltage regulator metrics",
                 }
             },
             "additionalProperties": false,
-            "required": [ "baseboardVoltageRegulatorIdentifier" ]
+            "required": [
+                "baseboardVoltageRegulatorIdentifier"
+            ]
         },
         "ipmiBattery": {
             "description": "intelligent platform management interface (ipmi) battery metrics",
                 }
             },
             "additionalProperties": false,
-            "required": [ "batteryIdentifier" ]
+            "required": [
+                "batteryIdentifier"
+            ]
         },
         "ipmiFan": {
             "description": "intelligent platform management interface (ipmi) fan metrics",
                 }
             },
             "additionalProperties": false,
-            "required": [ "fanIdentifier" ]
+            "required": [
+                "fanIdentifier"
+            ]
         },
         "ipmiGlobalAggregateTemperatureMargin": {
             "description": "intelligent platform management interface (ipmi) global aggregate temperature margin",
                 }
             },
             "additionalProperties": false,
-            "required": [ "globalAggregateTemperatureMarginIdentifier", "globalAggregateTemperatureMargin" ]
+            "required": [
+                "globalAggregateTemperatureMarginIdentifier",
+                "globalAggregateTemperatureMargin"
+            ]
         },
         "ipmiHsbp": {
             "description": "intelligent platform management interface (ipmi) hot swap backplane power metrics",
                 }
             },
             "additionalProperties": false,
-            "required": [ "hsbpIdentifier" ]
+            "required": [
+                "hsbpIdentifier"
+            ]
         },
         "ipmiNic": {
             "description": "intelligent platform management interface (ipmi) network interface control card (nic) metrics",
                 }
             },
             "additionalProperties": false,
-            "required": [ "nicIdentifier" ]
+            "required": [
+                "nicIdentifier"
+            ]
         },
         "ipmiPowerSupply": {
             "description": "intelligent platform management interface (ipmi) power supply metrics",
                 }
             },
             "additionalProperties": false,
-            "required": [ "powerSupplyIdentifier" ]
+            "required": [
+                "powerSupplyIdentifier"
+            ]
         },
         "ipmiProcessor": {
             "description": "intelligent platform management interface processor metrics",
                     "type": "array",
                     "items": {
                         "$ref": "#/definitions/processorDimmAggregateThermalMargin"
-                    }                }
+                    }
+                }
             },
             "additionalProperties": false,
-            "required": [ "processorIdentifier" ]
+            "required": [
+                "processorIdentifier"
+            ]
         },
         "jsonObject": {
             "description": "json object schema, name and other meta-information along with one or more object instances",
                 }
             },
             "additionalProperties": false,
-            "required": [ "objectInstances", "objectName" ]
+            "required": [
+                "objectInstances",
+                "objectName"
+            ]
         },
         "jsonObjectInstance": {
             "description": "meta-information about an instance of a jsonObject along with the actual object instance",
             "type": "object",
             "properties": {
-                "jsonObject": { "$ref": "#/definitions/jsonObject" },
+                "jsonObject": {
+                    "$ref": "#/definitions/jsonObject"
+                },
                 "objectInstance": {
                     "description": "an instance conforming to the jsonObject objectSchema",
                     "type": "object"
                 }
             },
             "additionalProperties": false,
-            "required": [ "keyName" ]
+            "required": [
+                "keyName"
+            ]
         },
         "latencyBucketMeasure": {
             "description": "number of counts falling within a defined latency bucket",
             "type": "object",
             "properties": {
-                "countsInTheBucket": { "type": "number" },
-                "highEndOfLatencyBucket": { "type": "number" },
-                "lowEndOfLatencyBucket": { "type": "number" }
+                "countsInTheBucket": {
+                    "type": "number"
+                },
+                "highEndOfLatencyBucket": {
+                    "type": "number"
+                },
+                "lowEndOfLatencyBucket": {
+                    "type": "number"
+                }
             },
             "additionalProperties": false,
-            "required": [ "countsInTheBucket" ]
+            "required": [
+                "countsInTheBucket"
+            ]
         },
         "load": {
             "description": "/proc/loadavg cpu utilization and io utilization metrics",
                 }
             },
             "additionalProperties": false,
-            "required": [ "vmIdentifier" ]
+            "required": [
+                "vmIdentifier"
+            ]
         },
-               "measDataCollection": {
-                       "description": "3GPP measurement collection structure aligned with 3GPP PM format",
-                       "type": "object",
-                       "properties": {
+        "measDataCollection": {
+            "description": "3GPP measurement collection structure aligned with 3GPP PM format",
+            "type": "object",
+            "properties": {
                 "formatVersion": {
                     "description": "3gpp PM reporting file format version from pre-standard TS 28.550 v2.0.0",
                     "type": "string"
                 "measInfoList": {
                     "description": "array of measurements",
                     "type": "array",
-                    "items": { "$ref": "#/definitions/measInfo" }
+                    "items": {
+                        "$ref": "#/definitions/measInfo"
+                    }
                 },
                 "measObjInstIdList": {
                     "description": "array of monitored object local distinguished name ids per 3GPP TS 32.300",
                     "type": "array",
-                    "items": { "type": "string" }
+                    "items": {
+                        "type": "string"
+                    }
                 },
                 "measuredEntityDn": {
                     "description": "distinguished name per 3GPP TS 28.550",
                 }
             },
             "additionalProperties": false,
-            "required": [ "granularityPeriod", "measInfoList", "measuredEntityDn" ]
-        },
-               "measInfo": {
-                       "description": "measurement information.",
-                       "type": "object",
-                       "properties": {
-                               "jobId": {
-                                       "description": "name of the measurement job",
-                                       "type": "string"
-                               },
-                               "measInfoId": {
-                                       "description": "measurement group identifier",
-                                       "oneOf": [
-                                           { "$ref": "#/definitions/measInfoIdInteger" },
-                                               { "$ref": "#/definitions/measInfoIdString" }
-                                       ]
-                               },
-                               "measTypes": {
-                                       "oneOf": [
-                                           { "$ref": "#/definitions/measTypesInteger" },
-                                               { "$ref": "#/definitions/measTypesString" }
-                                       ]
-                               },
-                               "measValuesList": {
-                                       "description": "an array of measurement values",
-                                       "type": "array",
-                                       "items": {
-                                               "$ref": "#/definitions/measValues"
-                                       }
-                               }
-                       },
-                       "additionalProperties": false,
-                       "required": ["measTypes", "measValues"]
-               },
-               "measInfoIdInteger": {
-                       "description": "integer measurement group identifier",
-                       "type": "object",
-                       "properties": {
-                               "iMeasInfoId": { "type": "integer" }
-                       },
-                       "additionalProperties": false,
-                       "required": ["iMeasInfoId"]
-               },
-               "measInfoIdString": {
-                       "description": "string measurement group identifier",
-                       "type": "object",
-                       "properties": {
-                               "sMeasInfoId": { "type": "string" }
-                       },
-                       "additionalProperties": false,
-                       "required": ["sMeasInfoId"]
-               },
-               "measResultInteger": {
-                       "description": "integer 3GPP PM measurement result",
-                       "type": "object",
-                       "properties": {
-                               "p": {
-                                       "description": "integer reference to the counter",
-                                       "type": "integer"
-                               },
-                               "iValue": {
-                                       "description": "integer counter value",
-                                       "type": "integer"
-                               }
-                       },
-                       "additionalProperties": false,
-                       "required": ["p", "iValue"]
-               },
-               "measResultNull": {
-                       "description": "null 3GPP PM measurement result",
-                       "type": "object",
-                       "properties": {
-                               "p": {
-                                       "description": "integer reference to the counter",
-                                       "type": "integer"
-                               },
-                               "isNull": {
-                                       "description": "true if the counter has no value",
-                                       "type": "string",
-                                       "enum": [ "true", "false" ]
-                               }
-                       },
-                       "additionalProperties": false,
-                       "required": ["p", "isNull"]
-               },
-               "measResultNumber": {
-                       "description": "number 3GPP PM measurement result",
-                       "type": "object",
-                       "properties": {
-                               "p": {
-                                       "description": "integer reference to the counter",
-                                       "type": "integer"
-                               },
-                               "rValue": {
-                                       "description": "numeric counter value",
-                                       "type": "number"
-                               }
-                       },
-                       "additionalProperties": false,
-                       "required": ["p", "rValue"]
-               },
-               "measResultString": {
-                       "description": "string 3GPP PM measurement result",
-                       "type": "object",
-                       "properties": {
-                               "p": {
-                                       "description": "integer reference to the counter",
-                                       "type": "integer"
-                               },
-                               "sValue": {
-                                       "description": "string counter value",
-                                       "type": "string"
-                               }
-                       },
-                       "additionalProperties": false,
-                       "required": ["p", "sValue"]
-               },
-               "measTypesInteger": {
-                       "description": "object containing an array of integer measurement identifiers associated with the measurement results",
-                       "type": "object",
-                       "properties": {
-                               "iMeasTypesList": {
-                                   "type": "array",
-                    "items": { "type": "integer" }
-                               }
-                       },
-                       "additionalProperties": false,
-                       "required": ["iMeasTypesList"]
-               },
-               "measTypesString": {
-                       "description": "object containing an array of string measurement identifiers associated with the measurement results",
-                       "type": "object",
-                       "properties": {
-                               "sMeasTypesList": {
-                                   "type": "array",
-                    "items": { "type": "string" }
-                               }
-                       },
-                       "additionalProperties": false,
-                       "required": ["iMeasTypesList"]
-               },
+            "required": [
+                "granularityPeriod",
+                "measInfoList",
+                "measuredEntityDn"
+            ]
+        },
+        "measInfo": {
+            "description": "measurement information.",
+            "type": "object",
+            "properties": {
+                "jobId": {
+                    "description": "name of the measurement job",
+                    "type": "string"
+                },
+                "measInfoId": {
+                    "description": "measurement group identifier",
+                    "oneOf": [{
+                            "$ref": "#/definitions/measInfoIdInteger"
+                        },
+                        {
+                            "$ref": "#/definitions/measInfoIdString"
+                        }
+                    ]
+                },
+                "measTypes": {
+                    "oneOf": [{
+                            "$ref": "#/definitions/measTypesInteger"
+                        },
+                        {
+                            "$ref": "#/definitions/measTypesString"
+                        }
+                    ]
+                },
+                "measValuesList": {
+                    "description": "an array of measurement values",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/measValues"
+                    }
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "measTypes",
+                "measValuesList"
+            ]
+        },
+        "measInfoIdInteger": {
+            "description": "integer measurement group identifier",
+            "type": "object",
+            "properties": {
+                "iMeasInfoId": {
+                    "type": "integer"
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "iMeasInfoId"
+            ]
+        },
+        "measInfoIdString": {
+            "description": "string measurement group identifier",
+            "type": "object",
+            "properties": {
+                "sMeasInfoId": {
+                    "type": "string"
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "sMeasInfoId"
+            ]
+        },
+        "measResultInteger": {
+            "description": "integer 3GPP PM measurement result",
+            "type": "object",
+            "properties": {
+                "p": {
+                    "description": "integer reference to the counter",
+                    "type": "integer"
+                },
+                "iValue": {
+                    "description": "integer counter value",
+                    "type": "integer"
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "p",
+                "iValue"
+            ]
+        },
+        "measResultNull": {
+            "description": "null 3GPP PM measurement result",
+            "type": "object",
+            "properties": {
+                "p": {
+                    "description": "integer reference to the counter",
+                    "type": "integer"
+                },
+                "isNull": {
+                    "description": "true if the counter has no value",
+                    "type": "string",
+                    "enum": [
+                        "true",
+                        "false"
+                    ]
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "p",
+                "isNull"
+            ]
+        },
+        "measResultNumber": {
+            "description": "number 3GPP PM measurement result",
+            "type": "object",
+            "properties": {
+                "p": {
+                    "description": "integer reference to the counter",
+                    "type": "integer"
+                },
+                "rValue": {
+                    "description": "numeric counter value",
+                    "type": "number"
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "p",
+                "rValue"
+            ]
+        },
+        "measResultString": {
+            "description": "string 3GPP PM measurement result",
+            "type": "object",
+            "properties": {
+                "p": {
+                    "description": "integer reference to the counter",
+                    "type": "integer"
+                },
+                "sValue": {
+                    "description": "string counter value",
+                    "type": "string"
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "p",
+                "sValue"
+            ]
+        },
+        "measTypesInteger": {
+            "description": "object containing an array of integer measurement identifiers associated with the measurement results",
+            "type": "object",
+            "properties": {
+                "iMeasTypesList": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "iMeasTypesList"
+            ]
+        },
+        "measTypesString": {
+            "description": "object containing an array of string measurement identifiers associated with the measurement results",
+            "type": "object",
+            "properties": {
+                "sMeasTypesList": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "sMeasTypesList"
+            ]
+        },
         "measurementFields": {
             "description": "measurement fields",
             "type": "object",
             "properties": {
-                "additionalFields": { "$ref": "#/definitions/hashMap" },
-                "additionalMeasurements": {"$ref": "#/definitions/arrayOfNamedHashMap"},
-                "additionalObjects": {"$ref": "#/definitions/arrayOfJsonObject"},
+                "additionalFields": {
+                    "$ref": "#/definitions/hashMap"
+                },
+                "additionalMeasurements": {
+                    "$ref": "#/definitions/arrayOfNamedHashMap"
+                },
+                "additionalObjects": {
+                    "$ref": "#/definitions/arrayOfJsonObject"
+                },
                 "codecUsageArray": {
                     "description": "array of codecs in use",
                     "type": "array",
                         "$ref": "#/definitions/diskUsage"
                     }
                 },
-                "featureUsageArray": { "$ref": "#/definitions/hashMap" },
+                "featureUsageArray": {
+                    "$ref": "#/definitions/hashMap"
+                },
                 "filesystemUsageArray": {
                     "description": "filesystem usage of the VM on which the xNFC reporting the event is running",
                     "type": "array",
                         "$ref": "#/definitions/hugePages"
                     }
                 },
-                "ipmi": { "$ref": "#/definitions/ipmi" },
+                "ipmi": {
+                    "$ref": "#/definitions/ipmi"
+                },
                 "latencyDistribution": {
                     "description": "array of integers representing counts of requests whose latency in milliseconds falls within per-xNF configured ranges",
                     "type": "array",
                 "measurementFieldsVersion": {
                     "description": "version of the measurementFields block",
                     "type": "string",
-                    "enum": [ "4.0" ]
+                    "enum": [
+                        "4.0"
+                    ]
                 },
                 "memoryUsageArray": {
                     "description": "memory usage of an array of VMs",
                 }
             },
             "additionalProperties": false,
-            "required": [ "measurementInterval", "measurementFieldsVersion" ]
-        },
-               "measValues": {
-                       "description": "3GPP measurement values",
-                       "type": "object",
-                       "properties": {
-                               "measObjAddlFlds": {
-                                       "$ref": "#/definitions/hashMap"
-                               },
-                               "measObjInstId": {
-                                       "description": "monitored object local distinguished name per 3GPP TS 32.300 and 3GPP TS 32.432",
-                                       "type": "string"
-                               },
-                               "measResults": {
-                                       "description": "array of results",
-                                       "type": "array",
-                                       "items": {
-                                               "oneOf": [
-                                                   { "$ref": "#/definitions/measResultInteger" },
-                                                       { "$ref": "#/definitions/measResultNull" },
-                                                       { "$ref": "#/definitions/measResultNumber" },
-                                                       { "$ref": "#/definitions/measResultString"      }
-                                               ]
-                                       }
-                               },
-                               "suspectFlag": {
-                                       "description": "indicates if the values are suspect",
-                                       "type": "string",
-                                       "enum": [ "true", "false" ]
-                               }
-                       },
-                       "additionalProperties": false,
-                       "required": ["measObjInstId", "measResults"]
-               },
+            "required": [
+                "measurementInterval",
+                "measurementFieldsVersion"
+            ]
+        },
+        "measValues": {
+            "description": "3GPP measurement values",
+            "type": "object",
+            "properties": {
+                "measObjAddlFlds": {
+                    "$ref": "#/definitions/hashMap"
+                },
+                "measObjInstId": {
+                    "description": "monitored object local distinguished name per 3GPP TS 32.300 and 3GPP TS 32.432",
+                    "type": "string"
+                },
+                "measResults": {
+                    "description": "array of results",
+                    "type": "array",
+                    "items": {
+                        "oneOf": [{
+                                "$ref": "#/definitions/measResultInteger"
+                            },
+                            {
+                                "$ref": "#/definitions/measResultNull"
+                            },
+                            {
+                                "$ref": "#/definitions/measResultNumber"
+                            },
+                            {
+                                "$ref": "#/definitions/measResultString"
+                            }
+                        ]
+                    }
+                },
+                "suspectFlag": {
+                    "description": "indicates if the values are suspect",
+                    "type": "string",
+                    "enum": [
+                        "true",
+                        "false"
+                    ]
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "measObjInstId",
+                "measResults"
+            ]
+        },
         "memoryUsage": {
             "description": "memory usage of an identified virtual machine",
             "type": "object",
                 }
             },
             "additionalProperties": false,
-            "required": [ "memoryFree", "memoryUsed", "vmIdentifier" ]
+            "required": [
+                "memoryFree",
+                "memoryUsed",
+                "vmIdentifier"
+            ]
         },
         "mobileFlowFields": {
             "description": "mobileFlow fields",
             "type": "object",
             "properties": {
-                "additionalFields": { "$ref": "#/definitions/hashMap" },
+                "additionalFields": {
+                    "$ref": "#/definitions/hashMap"
+                },
                 "applicationType": {
                     "description": "Application type inferred",
                     "type": "string"
                     "description": "Flow direction, indicating if the reporting node is the source of the flow or destination for the flow",
                     "type": "string"
                 },
-                "gtpPerFlowMetrics": { "$ref": "#/definitions/gtpPerFlowMetrics" },
+                "gtpPerFlowMetrics": {
+                    "$ref": "#/definitions/gtpPerFlowMetrics"
+                },
                 "gtpProtocolType": {
                     "description": "GTP protocol",
                     "type": "string"
                 "mobileFlowFieldsVersion": {
                     "description": "version of the mobileFlowFields block",
                     "type": "string",
-                    "enum": [ "4.0" ]
+                    "enum": [
+                        "4.0"
+                    ]
                 },
                 "msisdn": {
                     "description": "MSISDN for the subscriber UE used in this flow, as an integer, if the flow connects to a mobile device",
                 }
             },
             "additionalProperties": false,
-            "required": [ "flowDirection", "gtpPerFlowMetrics", "ipProtocolType", "ipVersion",
-                          "mobileFlowFieldsVersion", "otherEndpointIpAddress", "otherEndpointPort",
-                          "reportingEndpointIpAddr", "reportingEndpointPort" ]
+            "required": [
+                "flowDirection",
+                "gtpPerFlowMetrics",
+                "ipProtocolType",
+                "ipVersion",
+                "mobileFlowFieldsVersion",
+                "otherEndpointIpAddress",
+                "otherEndpointPort",
+                "reportingEndpointIpAddr",
+                "reportingEndpointPort"
+            ]
         },
         "namedHashMap": {
             "description": "a hashMap which is associated with and described by a name",
             "type": "object",
             "properties": {
-                "name": { "type": "string" },
-                "hashMap": { "$ref": "#/definitions/hashMap" }
+                "name": {
+                    "type": "string"
+                },
+                "hashMap": {
+                    "$ref": "#/definitions/hashMap"
+                }
             },
             "additionalProperties": false,
-            "required": [ "name", "hashMap" ]
+            "required": [
+                "name",
+                "hashMap"
+            ]
         },
         "nicPerformance": {
             "description": "describes the performance and errors of an identified network interface card",
                 "administrativeState": {
                     "description": "administrative state",
                     "type": "string",
-                    "enum": [ "inService", "outOfService" ]
+                    "enum": [
+                        "inService",
+                        "outOfService"
+                    ]
                 },
                 "nicIdentifier": {
                     "description": "nic identification",
                 "operationalState": {
                     "description": "operational state",
                     "type": "string",
-                    "enum": [ "inService", "outOfService" ]
+                    "enum": [
+                        "inService",
+                        "outOfService"
+                    ]
                 },
                 "receivedBroadcastPacketsAccumulated": {
                     "description": "Cumulative count of broadcast packets received as read at the end of the measurement interval",
                 "valuesAreSuspect": {
                     "description": "Indicates whether vNicPerformance values are likely inaccurate due to counter overflow or other condtions",
                     "type": "string",
-                    "enum": [ "true", "false" ]
+                    "enum": [
+                        "true",
+                        "false"
+                    ]
                 }
             },
             "additionalProperties": false,
-            "required": [ "nicIdentifier", "valuesAreSuspect" ]
+            "required": [
+                "nicIdentifier",
+                "valuesAreSuspect"
+            ]
         },
         "notificationFields": {
             "description": "notification fields",
             "type": "object",
             "properties": {
-                "additionalFields": { "$ref": "#/definitions/hashMap" },
-                "arrayOfNamedHashMap": {"$ref": "#/definitions/arrayOfNamedHashMap"},
+                "additionalFields": {
+                    "$ref": "#/definitions/hashMap"
+                },
+                "arrayOfNamedHashMap": {
+                    "$ref": "#/definitions/arrayOfNamedHashMap"
+                },
                 "changeContact": {
                     "description": "identifier for a contact related to the change",
                     "type": "string"
                 "notificationFieldsVersion": {
                     "description": "version of the notificationFields block",
                     "type": "string",
-                    "enum": [ "2.0" ]
+                    "enum": [
+                        "2.0"
+                    ]
                 },
                 "stateInterface": {
                     "description": "card or port name of the entity that changed state",
                 }
             },
             "additionalProperties": false,
-            "required": [ "changeIdentifier", "changeType", "notificationFieldsVersion" ]
+            "required": [
+                "changeIdentifier",
+                "changeType",
+                "notificationFieldsVersion"
+            ]
         },
         "otherFields": {
             "description": "fields for events belonging to the 'other' domain of the commonEventHeader domain enumeration",
             "type": "object",
             "properties": {
-                "arrayOfNamedHashMap": {"$ref": "#/definitions/arrayOfNamedHashMap"},
-                "hashMap": {"$ref": "#/definitions/hashMap"},
-                "jsonObjects": {"$ref": "#/definitions/arrayOfJsonObject"},
+                "arrayOfNamedHashMap": {
+                    "$ref": "#/definitions/arrayOfNamedHashMap"
+                },
+                "hashMap": {
+                    "$ref": "#/definitions/hashMap"
+                },
+                "jsonObjects": {
+                    "$ref": "#/definitions/arrayOfJsonObject"
+                },
                 "otherFieldsVersion": {
                     "description": "version of the otherFields block",
                     "type": "string",
-                    "enum": [ "3.0" ]
+                    "enum": [
+                        "3.0"
+                    ]
                 }
             },
             "additionalProperties": false,
-            "required": [ "otherFieldsVersion" ]
+            "required": [
+                "otherFieldsVersion"
+            ]
         },
         "perf3gppFields": {
             "description": "fields for 3GPP PM format events, based on 3GPP TS 28.550, belonging to the 'perf3gpp' domain of the commonEventHeader domain enumeration",
             "type": "object",
             "properties": {
-                "eventAddlFields": {"$ref": "#/definitions/hashMap"},
-                "measDataCollection": {"$ref": "#/definitions/measDataCollection"},
+                "eventAddlFields": {
+                    "$ref": "#/definitions/hashMap"
+                },
+                "measDataCollection": {
+                    "$ref": "#/definitions/measDataCollection"
+                },
                 "perf3gppFieldsVersion": {
                     "description": "version of the perf3gppFields block",
                     "type": "string",
-                    "enum": [ "1.0" ]
+                    "enum": [
+                        "1.0",
+                        "1.0.1"
+                    ]
                 }
-                       },
+            },
             "additionalProperties": false,
-            "required": [ "measDataCollection", "perf3gppFieldsVersion" ]
+            "required": [
+                "measDataCollection",
+                "perf3gppFieldsVersion"
+            ]
         },
         "pnfRegistrationFields": {
             "description": "hardware device registration fields",
             "type": "object",
             "properties": {
-                "additionalFields": { "$ref": "#/definitions/hashMap" },
+                "additionalFields": {
+                    "$ref": "#/definitions/hashMap"
+                },
                 "lastServiceDate": {
                     "description": "TS 32.692 dateOfLastService = date of last service; e.g. 15022017",
                     "type": "string"
                 },
                 "oamV4IpAddress": {
                     "description": "IPv4 m-plane IP address to be used by the manager to contact the PNF",
-                    "type": "string"
+                    "type": "string",
+                    "format": "ipv4"
                 },
                 "oamV6IpAddress": {
                     "description": "IPv6 m-plane IP address to be used by the manager to contact the PNF",
-                    "type": "string"
+                    "type": "string",
+                    "format": "ipv6"
                 },
                 "pnfRegistrationFieldsVersion": {
                     "description": "version of the pnfRegistrationFields block",
                     "type": "string",
-                    "enum": [ "2.0" ]
+                    "enum": [
+                        "2.0",
+                        "2.1"
+                    ]
                 },
                 "serialNumber": {
                     "description": "TS 32.692 serialNumber = serial number of the unit; e.g. 6061ZW3",
                 }
             },
             "additionalProperties": false,
-            "required": [ "pnfRegistrationFieldsVersion" ]
+            "required": [
+                "pnfRegistrationFieldsVersion"
+            ]
         },
         "processorDimmAggregateThermalMargin": {
             "description": "intelligent platform management interface (ipmi) processor dual inline memory module aggregate thermal margin metrics",
                 }
             },
             "additionalProperties": false,
-            "required": [ "processorDimmAggregateThermalMarginIdentifier", "thermalMargin" ]
+            "required": [
+                "processorDimmAggregateThermalMarginIdentifier",
+                "thermalMargin"
+            ]
         },
         "processStats": {
             "description": "metrics on system processes",
                 }
             },
             "additionalProperties": false,
-            "required": [ "processIdentifier" ]
+            "required": [
+                "processIdentifier"
+            ]
         },
         "requestError": {
             "description": "standard request error data structure",
                 }
             },
             "additionalProperties": false,
-            "required": [ "messageId", "text" ]
+            "required": [
+                "messageId",
+                "text"
+            ]
         },
         "sipSignalingFields": {
             "description": "sip signaling fields",
             "type": "object",
             "properties": {
-                "additionalInformation": { "$ref": "#/definitions/hashMap"},
+                "additionalInformation": {
+                    "$ref": "#/definitions/hashMap"
+                },
                 "compressedSip": {
                     "description": "the full SIP request/response including headers and bodies",
                     "type": "string"
                 "sipSignalingFieldsVersion": {
                     "description": "version of the sipSignalingFields block",
                     "type": "string",
-                    "enum": [ "3.0" ]
+                    "enum": [
+                        "3.0"
+                    ]
                 },
                 "summarySip": {
                     "description": "the SIP Method or Response ('INVITE', '200 OK', 'BYE', etc)",
                 }
             },
             "additionalProperties": false,
-            "required": [ "correlator", "localIpAddress", "localPort", "remoteIpAddress",
-                          "remotePort", "sipSignalingFieldsVersion", "vendorNfNameFields" ]
+            "required": [
+                "correlator",
+                "localIpAddress",
+                "localPort",
+                "remoteIpAddress",
+                "remotePort",
+                "sipSignalingFieldsVersion",
+                "vendorNfNameFields"
+            ]
         },
         "stateChangeFields": {
             "description": "stateChange fields",
             "type": "object",
             "properties": {
-                "additionalFields": { "$ref": "#/definitions/hashMap" },
+                "additionalFields": {
+                    "$ref": "#/definitions/hashMap"
+                },
                 "newState": {
                     "description": "new state of the entity",
                     "type": "string",
                 "stateChangeFieldsVersion": {
                     "description": "version of the stateChangeFields block",
                     "type": "string",
-                    "enum": [ "4.0" ]
+                    "enum": [
+                        "4.0"
+                    ]
                 },
                 "stateInterface": {
                     "description": "card or port name of the entity that changed state",
                 }
             },
             "additionalProperties": false,
-            "required": [ "newState", "oldState", "stateChangeFieldsVersion", "stateInterface" ]
+            "required": [
+                "newState",
+                "oldState",
+                "stateChangeFieldsVersion",
+                "stateInterface"
+            ]
+        },
+        "stndDefinedFields": {
+            "description": "stndDefined fields",
+            "type": "object",
+            "properties": {
+                "schemaReference": {
+                    "description": "a uri of a standards-defined JSON object schema; used to valide the stndDefinedFields.data property contents",
+                    "type": "string",
+                    "format": "uri"
+                },
+                "data": {
+                    "description": "a native standards-defined JSON notification",
+                    "type": "object"
+                },
+                "stndDefinedFieldsVersion": {
+                    "description": "version of stndDefinedFields block",
+                    "type": "string",
+                    "enum": [
+                        "1.0"
+                    ]
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "data",
+                "stndDefinedFieldsVersion"
+            ]
         },
         "syslogFields": {
             "description": "sysLog fields",
             "type": "object",
             "properties": {
-                "additionalFields": { "$ref": "#/definitions/hashMap" },
+                "additionalFields": {
+                    "$ref": "#/definitions/hashMap"
+                },
                 "eventSourceHost": {
                     "description": "hostname of the device",
                     "type": "string"
                 "syslogFieldsVersion": {
                     "description": "version of the syslogFields block",
                     "type": "string",
-                    "enum": [ "4.0" ]
+                    "enum": [
+                        "4.0"
+                    ]
                 },
                 "syslogMsg": {
                     "description": "syslog message",
                     "type": "string"
                 },
                 "syslogSev": {
-                    "description": "numerical Code for severity derived from syslogPri as remaider of syslogPri / 8",
+                    "description": "numerical Code for  severity derived from syslogPri as remaider of syslogPri / 8",
                     "type": "string",
                     "enum": [
                         "Alert",
                 }
             },
             "additionalProperties": false,
-            "required": [ "eventSourceType", "syslogFieldsVersion", "syslogMsg", "syslogTag" ]
+            "required": [
+                "eventSourceType",
+                "syslogFieldsVersion",
+                "syslogMsg",
+                "syslogTag"
+            ]
         },
         "thresholdCrossingAlertFields": {
             "description": "fields specific to threshold crossing alert events",
             "type": "object",
             "properties": {
-                "additionalFields": { "$ref": "#/definitions/hashMap"},
+                "additionalFields": {
+                    "$ref": "#/definitions/hashMap"
+                },
                 "additionalParameters": {
                     "description": "performance counters",
                     "type": "array",
                 "associatedAlertIdList": {
                     "description": "List of eventIds associated with the event being reported",
                     "type": "array",
-                    "items": { "type": "string" }
+                    "items": {
+                        "type": "string"
+                    }
                 },
                 "collectionTimestamp": {
                     "description": "Time when the performance collector picked up the data; with RFC 2822 compliant format: Sat, 13 Mar 2010 11:29:05 -0800",
                 "thresholdCrossingFieldsVersion": {
                     "description": "version of the thresholdCrossingAlertFields block",
                     "type": "string",
-                    "enum": [ "4.0" ]
+                    "enum": [
+                        "4.0"
+                    ]
                 }
             },
             "additionalProperties": false,
                 }
             },
             "additionalProperties": false,
-            "required": [ "vendorName" ]
+            "required": [
+                "vendorName"
+            ]
         },
         "voiceQualityFields": {
             "description": "provides statistics related to customer facing voice products",
             "type": "object",
             "properties": {
-                "additionalInformation": { "$ref": "#/definitions/hashMap"},
+                "additionalInformation": {
+                    "$ref": "#/definitions/hashMap"
+                },
                 "calleeSideCodec": {
                     "description": "callee codec for the call",
                     "type": "string"
                 "voiceQualityFieldsVersion": {
                     "description": "version of the voiceQualityFields block",
                     "type": "string",
-                    "enum": [ "4.0" ]
+                    "enum": [
+                        "4.0"
+                    ]
                 }
             },
             "additionalProperties": false,
-            "required": [ "calleeSideCodec", "callerSideCodec", "correlator", "midCallRtcp",
-                          "vendorNfNameFields", "voiceQualityFieldsVersion" ]
+            "required": [
+                "calleeSideCodec",
+                "callerSideCodec",
+                "correlator",
+                "midCallRtcp",
+                "vendorNfNameFields",
+                "voiceQualityFieldsVersion"
+            ]
         }
     }
-}
+}
\ No newline at end of file
index ca5e7a2..e2b0b2d 100644 (file)
@@ -1,68 +1,65 @@
 {
-  "eventList": [
-    {
-      "commonEventHeader": {
-        "domain": "@domain@",
-        "eventId": "@eventId@",
-        "eventName": "@domain@_@eventType@",
-        "eventType": "@eventType@",
-        "sequence": 0,
-        "priority": "Low",
-        "reportingEntityId": "",
-        "reportingEntityName": "@controllerName@",
-        "sourceId": "",
-        "sourceName": "@controllerName@",
-        "startEpochMicrosec": "@timestamp@",
-        "lastEpochMicrosec": "@timestamp@",
-        "nfNamingCode": "@type@",
-        "nfVendorName": "@vendor@",
-        "timeZoneOffset": "+00:00",
-        "version": "4.0.1",
-        "vesEventListenerVersion": "7.0.1"
-      },
-      "heartbeatFields": {
-        "heartbeatFieldsVersion": "3.0",
-        "heartbeatInterval": 20,
-        "additionalFields": {
-          "eventTime": "@eventTime@"
+    "eventList": [{
+        "commonEventHeader": {
+            "domain": "heartbeat",
+            "eventId": "@controllerName@_@eventTime@",
+            "eventName": "heartbeat_Controller",
+            "eventType": "Controller",
+            "sequence": 0,
+            "priority": "Low",
+            "reportingEntityId": "",
+            "reportingEntityName": "@controllerName@",
+            "sourceId": "",
+            "sourceName": "@controllerName@",
+            "startEpochMicrosec": "@timestamp@",
+            "lastEpochMicrosec": "@timestamp@",
+            "nfNamingCode": "@type@",
+            "nfVendorName": "@vendor@",
+            "timeZoneOffset": "+00:00",
+            "version": "4.1",
+            "vesEventListenerVersion": "7.2.1"
+        },
+        "heartbeatFields": {
+            "heartbeatFieldsVersion": "3.0",
+            "heartbeatInterval": 20,
+            "additionalFields": {
+                "eventTime": "@eventTime@"
+            }
         }
-      }
-    },
-    {
-      "commonEventHeader": {
-        "domain": "@domain@",
-        "eventId": "@eventId@",
-        "eventName": "@domain@_@eventType@_Alarms_@alarm@",
-        "eventType": "@eventType@_Alarms",
-        "sequence": 0,
-        "priority": "High",
-        "reportingEntityId": "",
-        "reportingEntityName": "@controllerName@",
-        "sourceId": "",
-        "sourceName": "@pnfId@",
-        "startEpochMicrosec": "@timestamp@",
-        "lastEpochMicrosec": "@timestamp@",
-        "nfNamingCode": "@type@",
-        "nfVendorName": "@vendor@",
-        "timeZoneOffset": "+00:00",
-        "version": "4.0.1",
-        "vesEventListenerVersion": "7.0.1"
-      },
-      "faultFields": {
-        "faultFieldsVersion": "4.0",
-        "alarmCondition": "@alarm@",
-        "alarmInterfaceA": "@interface@",
-        "eventSourceType": "@eventType@",
-        "specificProblem": "@alarm@",
-        "eventSeverity": "@severity@",
-        "vfStatus": "Active",
-        "alarmAdditionalInformation": {
-          "eventTime": "@eventTime@",
-          "equipType": "@type@",
-          "vendor": "@vendor@",
-          "model": "@model@"
+    }, {
+        "commonEventHeader": {
+            "domain": "@domain@",
+            "eventId": "@eventId@",
+            "eventName": "@domain@_@eventType@_Alarms_@alarm@",
+            "eventType": "@eventType@_Alarms",
+            "sequence": 0,
+            "priority": "High",
+            "reportingEntityId": "",
+            "reportingEntityName": "@controllerName@",
+            "sourceId": "",
+            "sourceName": "@pnfId@",
+            "startEpochMicrosec": "@timestamp@",
+            "lastEpochMicrosec": "@timestamp@",
+            "nfNamingCode": "@type@",
+            "nfVendorName": "@vendor@",
+            "timeZoneOffset": "+00:00",
+            "version": "4.1",
+            "vesEventListenerVersion": "7.2.1"
+        },
+        "faultFields": {
+            "faultFieldsVersion": "4.0",
+            "alarmCondition": "@alarm@",
+            "alarmInterfaceA": "@interface@",
+            "eventSourceType": "@eventType@",
+            "specificProblem": "@alarm@",
+            "eventSeverity": "@severity@",
+            "vfStatus": "Active",
+            "alarmAdditionalInformation": {
+                "eventTime": "@eventTime@",
+                "equipType": "@type@",
+                "vendor": "@vendor@",
+                "model": "@model@"
+            }
         }
-      }
-    }
-  ]
+    }]
 }
\ No newline at end of file
index f675f27..06feb44 100644 (file)
@@ -1,38 +1,38 @@
 {
-  "event": {
-    "commonEventHeader": {
-      "domain": "@domain@",
-      "eventId": "@eventId@",
-      "eventName": "@domain@_@eventType@_Alarms_@alarm@",
-      "eventType": "@eventType@_Alarms",
-      "sequence": 0,
-      "priority": "High",
-      "reportingEntityId": "",
-      "reportingEntityName": "@controllerName@",
-      "sourceId": "",
-      "sourceName": "@pnfId@",
-      "startEpochMicrosec": "@timestamp@",
-      "lastEpochMicrosec": "@timestamp@",
-      "nfNamingCode": "@type@",
-      "nfVendorName": "@vendor@",
-      "timeZoneOffset": "+00:00",
-      "version": "4.0.1",
-      "vesEventListenerVersion":"7.0.1"
-    },
-    "faultFields": {
-      "faultFieldsVersion": "4.0",
-      "alarmCondition": "@alarm@",
-      "alarmInterfaceA": "@interface@",
-      "eventSourceType": "@eventType@",
-      "specificProblem": "@alarm@",
-      "eventSeverity": "@severity@",
-      "vfStatus": "Active",
-      "alarmAdditionalInformation": {
-        "eventTime": "@eventTime@",
-        "equipType": "@type@",
-        "vendor":"@vendor@",
-        "model": "@model@"
-      }
+    "event": {
+        "commonEventHeader": {
+            "domain": "@domain@",
+            "eventId": "@eventId@",
+            "eventName": "@domain@_@eventType@_Alarms_@alarm@",
+            "eventType": "@eventType@_Alarms",
+            "sequence": 0,
+            "priority": "High",
+            "reportingEntityId": "",
+            "reportingEntityName": "@controllerName@",
+            "sourceId": "",
+            "sourceName": "@pnfId@",
+            "startEpochMicrosec": "@timestamp@",
+            "lastEpochMicrosec": "@timestamp@",
+            "nfNamingCode": "@type@",
+            "nfVendorName": "@vendor@",
+            "timeZoneOffset": "+00:00",
+            "version": "4.1",
+            "vesEventListenerVersion": "7.2.1"
+        },
+        "faultFields": {
+            "faultFieldsVersion": "4.0",
+            "alarmCondition": "@alarm@",
+            "alarmInterfaceA": "@interface@",
+            "eventSourceType": "@eventType@",
+            "specificProblem": "@alarm@",
+            "eventSeverity": "@severity@",
+            "vfStatus": "Active",
+            "alarmAdditionalInformation": {
+                "eventTime": "@eventTime@",
+                "equipType": "@type@",
+                "vendor": "@vendor@",
+                "model": "@model@"
+            }
+        }
     }
-  }
 }
\ No newline at end of file
index aaee9b6..d345bc8 100644 (file)
@@ -1,30 +1,30 @@
 {
-  "event": {
-    "commonEventHeader": {
-      "domain": "@domain@",
-      "eventId": "@eventId@",
-      "eventName": "@domain@_@eventType@",
-      "eventType": "@eventType@",
-      "sequence": 0,
-      "priority": "Low",
-      "reportingEntityId": "",
-      "reportingEntityName": "@controllerName@",
-      "sourceId": "",
-      "sourceName": "@controllerName@",
-      "startEpochMicrosec": "@timestamp@",
-      "lastEpochMicrosec": "@timestamp@",
-      "nfNamingCode": "@type@",
-      "nfVendorName": "@vendor@",
-      "timeZoneOffset": "+00:00",
-      "version": "4.0.1",
-      "vesEventListenerVersion":"7.0.1"
-    },
-    "heartbeatFields": {
-      "heartbeatFieldsVersion": "3.0",
-      "heartbeatInterval": 20,
-      "additionalFields": {
-        "eventTime": "@eventTime@"
-      }
+    "event": {
+        "commonEventHeader": {
+            "domain": "@domain@",
+            "eventId": "@eventId@",
+            "eventName": "@domain@_@eventType@",
+            "eventType": "@eventType@",
+            "sequence": 0,
+            "priority": "Low",
+            "reportingEntityId": "",
+            "reportingEntityName": "@controllerName@",
+            "sourceId": "",
+            "sourceName": "@controllerName@",
+            "startEpochMicrosec": "@timestamp@",
+            "lastEpochMicrosec": "@timestamp@",
+            "nfNamingCode": "@type@",
+            "nfVendorName": "@vendor@",
+            "timeZoneOffset": "+00:00",
+            "version": "4.1",
+            "vesEventListenerVersion": "7.2.1"
+        },
+        "heartbeatFields": {
+            "heartbeatFieldsVersion": "3.0",
+            "heartbeatInterval": 20,
+            "additionalFields": {
+                "eventTime": "@eventTime@"
+            }
+        }
     }
-  }
 }
\ No newline at end of file
index cc71cd3..df9e2af 100644 (file)
@@ -1,71 +1,70 @@
 {
-  "event": {
-    "commonEventHeader": {
-      "domain": "@domain@",
-      "eventId": "@eventId@",
-      "eventName": "@domain@_@eventType@_@granularity@",
-      "eventType": "@eventType@_@granularity@",
-      "sequence": 0,
-      "priority": "Low",
-      "reportingEntityId": "",
-      "reportingEntityName": "@controllerName@",
-      "sourceId": "",
-      "sourceName": "@pnfId@",
-      "startEpochMicrosec": "@collectionStartTime@",
-      "lastEpochMicrosec": "@collectionEndTime@",
-      "internalHeaderFields": {
-        "intervalStartTime": "@intervalStartTime@",
-        "intervalEndTime": "@intervalEndTime@"
-      },
-      "version": "4.0.1",
-      "vesEventListenerVersion": "7.0.1"
-    },
-    "measurementFields": {
-      "additionalFields": {},
-      "additionalMeasurements": [
-        {
-          "name": "@interface@-1",
-          "hashMap": {
-            "es": "0",
-            "ses": "1",
-            "cses": "0",
-            "unavailability": "0"
-          }
+    "event": {
+        "commonEventHeader": {
+            "domain": "@domain@",
+            "eventId": "@eventId@",
+            "eventName": "@domain@_@eventType@_@granularity@",
+            "eventType": "@eventType@_@granularity@",
+            "sequence": 0,
+            "priority": "Low",
+            "reportingEntityId": "",
+            "reportingEntityName": "@controllerName@",
+            "sourceId": "",
+            "sourceName": "@pnfId@",
+            "startEpochMicrosec": "@collectionStartTime@",
+            "lastEpochMicrosec": "@collectionEndTime@",
+            "internalHeaderFields": {
+                "intervalStartTime": "@intervalStartTime@",
+                "intervalEndTime": "@intervalEndTime@"
+            },
+            "version": "4.1",
+            "vesEventListenerVersion": "7.2.1"
         },
-        {
-          "name": "@interface@-2",
-          "hashMap": {
-            "es": "0",
-            "ses": "1",
-            "cses": "0",
-            "unavailability": "0"
-          }
+        "measurementFields": {
+            "additionalFields": {},
+            "additionalMeasurements": [{
+                    "name": "@interface@-1",
+                    "hashMap": {
+                        "es": "0",
+                        "ses": "1",
+                        "cses": "0",
+                        "unavailability": "0"
+                    }
+                },
+                {
+                    "name": "@interface@-2",
+                    "hashMap": {
+                        "es": "0",
+                        "ses": "1",
+                        "cses": "0",
+                        "unavailability": "0"
+                    }
+                }
+            ],
+            "additionalObjects": [],
+            "codecUsageArray": [],
+            "concurrentSessions": 2,
+            "configuredEntities": 2,
+            "cpuUsageArray": [],
+            "diskUsageArray": [],
+            "featureUsageArray": {
+                "https://www.itu.int/rec/T-REC-G.841": "true"
+            },
+            "filesystemUsageArray": [],
+            "hugePagesArray": [],
+            "ipmi": {},
+            "latencyDistribution": [],
+            "loadArray": [],
+            "machineCheckExceptionArray": [],
+            "meanRequestLatency": 1000,
+            "measurementInterval": 234,
+            "measurementFieldsVersion": "4.0",
+            "memoryUsageArray": [],
+            "numberOfMediaPortsInUse": 234,
+            "requestRate": 23,
+            "nfcScalingMetric": 3,
+            "nicPerformanceArray": [],
+            "processStatsArray": []
         }
-      ],
-      "additionalObjects": [],
-      "codecUsageArray": [],
-      "concurrentSessions": 2,
-      "configuredEntities": 2,
-      "cpuUsageArray": [],
-      "diskUsageArray": [],
-      "featureUsageArray": {
-        "https://www.itu.int/rec/T-REC-G.841":"true"
-      },
-      "filesystemUsageArray": [],
-      "hugePagesArray": [],
-      "ipmi": {},
-      "latencyDistribution": [],
-      "loadArray": [],
-      "machineCheckExceptionArray": [],
-      "meanRequestLatency": 1000,
-      "measurementInterval": 234,
-      "measurementFieldsVersion": "4.0",
-      "memoryUsageArray": [],
-      "numberOfMediaPortsInUse": 234,
-      "requestRate": 23,
-      "nfcScalingMetric": 3,
-      "nicPerformanceArray": [],
-      "processStatsArray": []
     }
-  }
 }
\ No newline at end of file
diff --git a/solution/dev/ves-test-collector/client-scripts-ves-v7/json/templates/notification.json b/solution/dev/ves-test-collector/client-scripts-ves-v7/json/templates/notification.json
new file mode 100644 (file)
index 0000000..03552f7
--- /dev/null
@@ -0,0 +1,35 @@
+{
+    "event": {
+        "commonEventHeader": {
+            "domain": "@domain@",
+            "eventId": "@eventId@",
+            "eventName": "@domain@_@eventType@",
+            "eventType": "@eventType@",
+            "sequence": 0,
+            "priority": "Low",
+            "reportingEntityId": "",
+            "reportingEntityName": "@controllerName@",
+            "sourceId": "",
+            "sourceName": "@pnfId@",
+            "startEpochMicrosec": "@timestamp@",
+            "lastEpochMicrosec": "@timestamp@",
+            "nfNamingCode": "@type@",
+            "nfVendorName": "@vendor@",
+            "timeZoneOffset": "+00:00",
+            "version": "4.1",
+            "vesEventListenerVersion": "7.2.1"
+        },
+        "notificationFields": {
+            "additionalFields": {
+                "eventTime": "@eventTime@"
+            },
+            "changeContact": "@controllerName@",
+            "changeIdentifier": "@pnfId@",
+            "changeType": "informal",
+            "newState": "all-good",
+            "oldState": "not-too-bad",
+            "notificationFieldsVersion": "2.0",
+            "stateInterface": "@interface@"
+        }
+    }
+}
\ No newline at end of file
index f0c2b3e..da1f78c 100644 (file)
@@ -1,37 +1,50 @@
 {
-  "event": {
-    "commonEventHeader": {
-      "domain": "@domain@",
-      "eventId": "@eventId@",
-      "eventName": "@domain@_@eventType@",
-      "eventType": "@eventType@",
-      "sequence": 0,
-      "priority": "Low",
-      "reportingEntityId": "",
-      "reportingEntityName": "@controllerName@",
-      "sourceId": "",
-      "sourceName": "@pnfId@",
-      "startEpochMicrosec": "@timestamp@",
-      "lastEpochMicrosec": "@timestamp@",
-      "nfNamingCode": "@type@",
-      "nfVendorName": "@vendor@",
-      "timeZoneOffset": "+00:00",
-      "version": "4.0.1",
-      "vesEventListenerVersion":"7.0.1"
-    },
-    "pnfRegistrationFields": {
-      "pnfRegistrationFieldsVersion": "2.0",
-      "lastServiceDate":"2019-08-16",
-      "macAddress":"@macAddress@",
-      "manufactureDate":"2019-08-16",
-      "modelNumber": "@model@",
-      "oamV4IpAddress": "@oamIp@",
-      "oamV6IpAddress": "@oamIpV6@",
-      "serialNumber": "@vendor@-@type@-@oamIp@-@model@",
-      "softwareVersion": "2.3.5",
-      "unitFamily": "@vendor@-@type@",
-      "unitType": "@type@",
-      "vendorName": "@vendor@"
+    "event": {
+        "commonEventHeader": {
+            "domain": "@domain@",
+            "eventId": "@eventId@",
+            "eventName": "@domain@_@eventType@",
+            "eventType": "@eventType@",
+            "sequence": 0,
+            "priority": "Low",
+            "reportingEntityId": "",
+            "reportingEntityName": "@controllerName@",
+            "sourceId": "",
+            "sourceName": "@pnfId@",
+            "startEpochMicrosec": "@timestamp@",
+            "lastEpochMicrosec": "@timestamp@",
+            "nfNamingCode": "@type@",
+            "nfVendorName": "@vendor@",
+            "timeZoneOffset": "+00:00",
+            "version": "4.1",
+            "vesEventListenerVersion": "7.2.1"
+        },
+        "pnfRegistrationFields": {
+            "pnfRegistrationFieldsVersion": "2.1",
+            "lastServiceDate": "2021-03-26",
+            "macAddress": "@macAddress@",
+            "manufactureDate": "2021-01-16",
+            "modelNumber": "@model@",
+            "oamV4IpAddress": "@oamIp@",
+            "oamV6IpAddress": "@oamIpV6@",
+            "serialNumber": "@vendor@-@type@-@oamIp@-@model@",
+            "softwareVersion": "2.3.5",
+            "unitFamily": "@vendor@-@type@",
+            "unitType": "@type@",
+            "vendorName": "@vendor@",
+            "additionalFields": {
+                "oamPort": "830",
+                "protocol": "SSH",
+                "username": "netconf",
+                "password": "netconf",
+                "reconnectOnChangedSchema": "false",
+                "sleep-factor": "1.5",
+                "tcpOnly": "false",
+                "connectionTimeout": "20000",
+                "maxConnectionAttempts": "100",
+                "betweenAttemptsTimeout": "2000",
+                "keepaliveDelay": "120"
+            }
+        }
     }
-  }
 }
\ No newline at end of file
diff --git a/solution/dev/ves-test-collector/client-scripts-ves-v7/json/templates/stateChange.json b/solution/dev/ves-test-collector/client-scripts-ves-v7/json/templates/stateChange.json
new file mode 100644 (file)
index 0000000..f5ff5aa
--- /dev/null
@@ -0,0 +1,32 @@
+{
+    "event": {
+        "commonEventHeader": {
+            "domain": "@domain@",
+            "eventId": "@eventId@",
+            "eventName": "@domain@_@eventType@",
+            "eventType": "@eventType@",
+            "sequence": 0,
+            "priority": "Low",
+            "reportingEntityId": "",
+            "reportingEntityName": "@controllerName@",
+            "sourceId": "",
+            "sourceName": "@pnfId@",
+            "startEpochMicrosec": "@timestamp@",
+            "lastEpochMicrosec": "@timestamp@",
+            "nfNamingCode": "@type@",
+            "nfVendorName": "@vendor@",
+            "timeZoneOffset": "+00:00",
+            "version": "4.1",
+            "vesEventListenerVersion": "7.2.1"
+        },
+        "stateChangeFields": {
+            "additionalFields": {
+                "eventTime": "@eventTime@"
+            },
+            "newState": "inService",
+            "oldState": "maintenance",
+            "stateChangeFieldsVersion": "4.0",
+            "stateInterface": "@interface@"
+        }
+    }
+}
\ No newline at end of file
index fcb7948..fe8b097 100644 (file)
@@ -1,46 +1,50 @@
 {
-  "event": {
-    "commonEventHeader": {
-      "domain": "@domain@",
-      "eventId": "@eventId@",
-      "eventName": "@domain@_@eventType@_TCA_@alarm@",
-      "eventType": "@eventType@_TCA",
-      "sequence": 0,
-      "priority": "High",
-      "reportingEntityId": "",
-      "reportingEntityName": "@controllerName@",
-      "sourceId": "",
-      "sourceName": "@pnfId@",
-      "startEpochMicrosec": "@timestamp@",
-      "lastEpochMicrosec": "@timestamp@",
-      "nfNamingCode": "@type@",
-      "nfVendorName": "@vendor@",
-      "timeZoneOffset": "+00:00",
-      "version": "4.0.1",
-      "vesEventListenerVersion":"7.0.1"
-    },
-    "thresholdCrossingAlertFields": {
-      "thresholdCrossingFieldsVersion": "4.0",
-      "additionalParameters": [],
-      "alertAction": "@action@",
-      "alertDescription": "TCA",
-      "alertType":"INTERFACE-ANOMALY",
-      "alertValue":"@type@",
-      "associatedAlertIdList":[],
-      "collectionTimestamp": "@collectionTimestamp@",
-      "dataCollector":"",
-      "elementType": "@type@",
-      "eventSeverity":"@severity@",
-      "eventStartTimestamp":"@eventStartTimestamp@",
-      "interfaceName":"@interface@",
-      "networkService":"",
-      "possibleRootCause":"",
-      "additionalFields": {
-        "eventTime": "@eventTime@",
-        "equipType": "@type@",
-        "vendor":"@vendor@",
-        "model": "@model@"
-      }
+    "event": {
+        "commonEventHeader": {
+            "domain": "@domain@",
+            "eventId": "@eventId@",
+            "eventName": "@domain@_@eventType@_TCA_@alarm@",
+            "eventType": "@eventType@_TCA",
+            "sequence": 0,
+            "priority": "High",
+            "reportingEntityId": "",
+            "reportingEntityName": "@controllerName@",
+            "sourceId": "",
+            "sourceName": "@pnfId@",
+            "startEpochMicrosec": "@timestamp@",
+            "lastEpochMicrosec": "@timestamp@",
+            "nfNamingCode": "@type@",
+            "nfVendorName": "@vendor@",
+            "timeZoneOffset": "+00:00",
+            "version": "4.1",
+            "vesEventListenerVersion": "7.2.1"
+        },
+        "thresholdCrossingAlertFields": {
+            "thresholdCrossingFieldsVersion": "4.0",
+            "additionalParameters": [{
+                "criticality": "MAJ",
+                "hashMap": { "additionalProperties": "up-and-down" },
+                "thresholdCrossed": "packetLoss"
+            }],
+            "alertAction": "@action@",
+            "alertDescription": "TCA",
+            "alertType": "INTERFACE-ANOMALY",
+            "alertValue": "@type@",
+            "associatedAlertIdList": ["loss-of-signal"],
+            "collectionTimestamp": "@collectionTimestamp@",
+            "dataCollector": "data-lake",
+            "elementType": "@type@",
+            "eventSeverity": "@severity@",
+            "eventStartTimestamp": "@eventStartTimestamp@",
+            "interfaceName": "@interface@",
+            "networkService": "from-a-to-b",
+            "possibleRootCause": "always-the-others",
+            "additionalFields": {
+                "eventTime": "@eventTime@",
+                "equipType": "@type@",
+                "vendor": "@vendor@",
+                "model": "@model@"
+            }
+        }
     }
-  }
 }
\ No newline at end of file
diff --git a/solution/dev/ves-test-collector/client-scripts-ves-v7/sendVesHeartbeat.py b/solution/dev/ves-test-collector/client-scripts-ves-v7/sendVesHeartbeat.py
new file mode 100644 (file)
index 0000000..b2066fb
--- /dev/null
@@ -0,0 +1,56 @@
+#!/usr/bin/env python
+################################################################################
+# Copyright 2021 highstreet technologies GmbH
+#
+# Licensed under the Apache License, Version 2.0 (the 'License');
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an 'AS IS' BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+################################################################################
+# Send a VES event for domain 'heartbeat'
+
+# importing the datetime, json, requests, os socket and yaml library
+import json
+import requests
+from globalVesEventEmitter import getInitData, saveExample
+
+# Globals
+domain = 'heartbeat'
+initData = getInitData(domain)
+
+print('################################################################################')
+print('# send SDN-Controller ' + domain)
+
+initData['body']['event']['commonEventHeader']['domain'] = initData['domain']
+initData['body']['event']['commonEventHeader']['eventId'] = initData['fqdn'] + '_' + initData['eventTime']
+initData['body']['event']['commonEventHeader']['eventName'] = initData['domain'] + '_' + initData['config']['settings']['eventType']
+initData['body']['event']['commonEventHeader']['eventType'] = initData['config']['settings']['eventType']
+initData['body']['event']['commonEventHeader']['sequence'] = initData['config']['settings']['sequence']
+initData['body']['event']['commonEventHeader']['reportingEntityName'] = initData['fqdn']
+initData['body']['event']['commonEventHeader']['sourceName'] =initData['fqdn']
+initData['body']['event']['commonEventHeader']['startEpochMicrosec'] = initData['timestamp']
+initData['body']['event']['commonEventHeader']['lastEpochMicrosec'] = initData['timestamp']
+initData['body']['event']['commonEventHeader']['nfNamingCode'] = 'SDN-Controller'
+initData['body']['event']['commonEventHeader']['nfVendorName'] = 'O-RAN-SC OAM'
+
+initData['body']['event']['heartbeatFields']['additionalFields']['eventTime'] = initData['eventTime']
+
+# Save example body
+saveExample(initData)
+
+# Send VES Event
+url = initData['config']['vesEndpoint']['url']
+username = initData['config']['vesEndpoint']['username']
+password = initData['config']['vesEndpoint']['password']
+verify = initData['config']['vesEndpoint']['verify']
+response = requests.post(url, json=initData['body'], auth=(username, password), verify=verify)
+print(response)
diff --git a/solution/dev/ves-test-collector/client-scripts-ves-v7/sendVesNotification.py b/solution/dev/ves-test-collector/client-scripts-ves-v7/sendVesNotification.py
new file mode 100644 (file)
index 0000000..6c4d521
--- /dev/null
@@ -0,0 +1,89 @@
+#!/usr/bin/env python
+################################################################################
+# Copyright 2021 highstreet technologies GmbH
+#
+# Licensed under the Apache License, Version 2.0 (the 'License');
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an 'AS IS' BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+################################################################################
+# Send a VES event for domain 'notification'
+
+# importing the sys, json, requests library
+import sys
+import getopt
+import json
+import requests
+from globalVesEventEmitter import getInitData, saveExample
+
+# Construct VES body and send
+def performJob(domain, pnfId):
+    initData = getInitData(domain)
+    initData['pnfId'] = pnfId
+
+    print('################################################################################')
+    print('# send VES ' + domain)
+
+    initData['body']['event']['commonEventHeader']['domain'] = initData['domain']
+    initData['body']['event']['commonEventHeader']['eventId'] = initData['fqdn'] + \
+        '_' + initData['eventTime']
+    initData['body']['event']['commonEventHeader']['eventName'] = initData['domain'] + \
+        '_' + initData['config']['settings']['eventType']
+    initData['body']['event']['commonEventHeader']['eventType'] = initData['config']['settings']['eventType']
+    initData['body']['event']['commonEventHeader']['sequence'] = initData['config']['settings']['sequence']
+    initData['body']['event']['commonEventHeader']['reportingEntityName'] = initData['fqdn']
+    initData['body']['event']['commonEventHeader']['sourceName'] = initData['pnfId']
+    initData['body']['event']['commonEventHeader']['startEpochMicrosec'] = initData['timestamp']
+    initData['body']['event']['commonEventHeader']['lastEpochMicrosec'] = initData['timestamp']
+    initData['body']['event']['commonEventHeader']['nfNamingCode'] = initData['pnfId']
+    initData['body']['event']['commonEventHeader']['nfVendorName'] = 'O-RAN-SC OAM'
+
+    initData['body']['event']['notificationFields']['additionalFields']['eventTime'] = initData['eventTime']
+    initData['body']['event']['notificationFields']['changeContact'] = initData['fqdn']
+    initData['body']['event']['notificationFields']['changeIdentifier'] = initData['pnfId']
+    initData['body']['event']['notificationFields']['stateInterface'] = initData['interface']
+
+    # Save example body
+    saveExample(initData)
+
+    # Send VES Event
+    url = initData['config']['vesEndpoint']['url']
+    username = initData['config']['vesEndpoint']['username']
+    password = initData['config']['vesEndpoint']['password']
+    verify = initData['config']['vesEndpoint']['verify']
+    response = requests.post(url, json=initData['body'], auth=(
+        username, password), verify=verify)
+    print(response)
+
+# Analysing command line parameters
+
+
+def main(argv):
+    domain = 'notification'
+    usage = 'sendVesNotification.py --pnfId <physical-network-function-nwuid>'
+    pnfId = ''
+    try:
+        opts, args = getopt.getopt(argv, "hi:o:", ["pnfId="])
+    except getopt.GetoptError:
+        print(usage)
+        sys.exit(2)
+    for opt, arg in opts:
+        if opt in ('-h', '--help'):
+            print(usage)
+            sys.exit()
+        elif opt in ("-p", "--pnfId"):
+            pnfId = arg
+            performJob(domain, pnfId)
+
+
+if __name__ == "__main__":
+    main(sys.argv[1:])
diff --git a/solution/dev/ves-test-collector/client-scripts-ves-v7/sendVesStateChange.py b/solution/dev/ves-test-collector/client-scripts-ves-v7/sendVesStateChange.py
new file mode 100644 (file)
index 0000000..aa4b5a0
--- /dev/null
@@ -0,0 +1,87 @@
+#!/usr/bin/env python
+################################################################################
+# Copyright 2021 highstreet technologies GmbH
+#
+# Licensed under the Apache License, Version 2.0 (the 'License');
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an 'AS IS' BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+################################################################################
+# Send a VES event for domain 'stateChange'
+
+# importing the sys, json, requests library
+import sys
+import getopt
+import json
+import requests
+from globalVesEventEmitter import getInitData, saveExample
+
+# Construct VES body and send
+def performJob(domain, pnfId):
+    initData = getInitData(domain)
+    initData['pnfId'] = pnfId
+
+    print('################################################################################')
+    print('# send VES ' + domain)
+
+    initData['body']['event']['commonEventHeader']['domain'] = initData['domain']
+    initData['body']['event']['commonEventHeader']['eventId'] = initData['fqdn'] + \
+        '_' + initData['eventTime']
+    initData['body']['event']['commonEventHeader']['eventName'] = initData['domain'] + \
+        '_' + initData['config']['settings']['eventType']
+    initData['body']['event']['commonEventHeader']['eventType'] = initData['config']['settings']['eventType']
+    initData['body']['event']['commonEventHeader']['sequence'] = initData['config']['settings']['sequence']
+    initData['body']['event']['commonEventHeader']['reportingEntityName'] = initData['fqdn']
+    initData['body']['event']['commonEventHeader']['sourceName'] = initData['pnfId']
+    initData['body']['event']['commonEventHeader']['startEpochMicrosec'] = initData['timestamp']
+    initData['body']['event']['commonEventHeader']['lastEpochMicrosec'] = initData['timestamp']
+    initData['body']['event']['commonEventHeader']['nfNamingCode'] = initData['pnfId']
+    initData['body']['event']['commonEventHeader']['nfVendorName'] = 'O-RAN-SC OAM'
+
+    initData['body']['event']['stateChangeFields']['additionalFields']['eventTime'] = initData['eventTime']
+    initData['body']['event']['stateChangeFields']['stateInterface'] = initData['interface']
+
+    # Save example body
+    saveExample(initData)
+
+    # Send VES Event
+    url = initData['config']['vesEndpoint']['url']
+    username = initData['config']['vesEndpoint']['username']
+    password = initData['config']['vesEndpoint']['password']
+    verify = initData['config']['vesEndpoint']['verify']
+    response = requests.post(url, json=initData['body'], auth=(
+        username, password), verify=verify)
+    print(response)
+
+# Analysing command line parameters
+
+
+def main(argv):
+    domain = 'stateChange'
+    usage = 'sendVesStateChange.py --pnfId <physical-network-function-nwuid>'
+    pnfId = ''
+    try:
+        opts, args = getopt.getopt(argv, "hi:o:", ["pnfId="])
+    except getopt.GetoptError:
+        print(usage)
+        sys.exit(2)
+    for opt, arg in opts:
+        if opt in ('-h', '--help'):
+            print(usage)
+            sys.exit()
+        elif opt in ("-p", "--pnfId"):
+            pnfId = arg
+            performJob(domain, pnfId)
+
+
+if __name__ == "__main__":
+    main(sys.argv[1:])
diff --git a/solution/dev/ves-test-collector/resources/CommonEventFormat_30.2.1_ONAP.json b/solution/dev/ves-test-collector/resources/CommonEventFormat_30.2.1_ONAP.json
new file mode 100644 (file)
index 0000000..b844554
--- /dev/null
@@ -0,0 +1,3088 @@
+{
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "title": "VES Event Listener Common Event Format",
+    "type": "object",
+    "properties": {
+        "event": {
+            "$ref": "#/definitions/event"
+        },
+        "eventList": {
+            "$ref": "#/definitions/eventList"
+        }
+    },
+    "definitions": {
+        "schemaHeaderBlock": {
+            "description": "schema date, version, author and associated API",
+            "type": "object",
+            "properties": {
+                "associatedApi": {
+                    "description": "VES Event Listener",
+                    "type": "string"
+                },
+                "lastUpdatedBy": {
+                    "description": "damian.nowak@nokia.com",
+                    "type": "string"
+                },
+                "schemaDate": {
+                    "description": "Jan 04, 2021",
+                    "type": "string"
+                },
+                "schemaVersion": {
+                    "description": "30.2.1",
+                    "type": "number"
+                }
+            }
+        },
+        "schemaLicenseAndCopyrightNotice": {
+            "description": "Copyright (c) 2020, AT&T Intellectual Property.  All rights reserved. Modification Copyright (c) 2021, Nokia Solutions and Networks.",
+            "type": "object",
+            "properties": {
+                "apacheLicense2.0": {
+                    "description": "Licensed under the Apache License, Version 2.0 (the 'License'); you may not use this file except in compliance with the License. You may obtain a copy of the License at:",
+                    "type": "string"
+                },
+                "licenseUrl": {
+                    "description": "http://www.apache.org/licenses/LICENSE-2.0",
+                    "type": "string"
+                },
+                "asIsClause": {
+                    "description": "Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.",
+                    "type": "string"
+                },
+                "permissionsAndLimitations": {
+                    "description": "See the License for the specific language governing permissions and limitations under the License.",
+                    "type": "string"
+                }
+            }
+        },
+        "arrayOfJsonObject": {
+            "description": "array of json objects described by name, schema and other meta-information",
+            "type": "array",
+            "items": {
+                "$ref": "#/definitions/jsonObject"
+            }
+        },
+        "arrayOfNamedHashMap": {
+            "description": "array of named hashMaps",
+            "type": "array",
+            "items": {
+                "$ref": "#/definitions/namedHashMap"
+            }
+        },
+        "codecsInUse": {
+            "description": "number of times an identified codec was used over the measurementInterval",
+            "type": "object",
+            "properties": {
+                "codecIdentifier": {
+                    "type": "string"
+                },
+                "numberInUse": {
+                    "type": "integer"
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "codecIdentifier",
+                "numberInUse"
+            ]
+        },
+        "commonEventHeader": {
+            "description": "fields common to all events",
+            "type": "object",
+            "properties": {
+                "domain": {
+                    "description": "the eventing domain associated with the event",
+                    "type": "string",
+                    "enum": [
+                        "fault",
+                        "heartbeat",
+                        "measurement",
+                        "mobileFlow",
+                        "notification",
+                        "other",
+                        "perf3gpp",
+                        "pnfRegistration",
+                        "sipSignaling",
+                        "stateChange",
+                        "stndDefined",
+                        "syslog",
+                        "thresholdCrossingAlert",
+                        "voiceQuality"
+                    ]
+                },
+                "eventId": {
+                    "description": "event key that is unique to the event source",
+                    "type": "string"
+                },
+                "eventName": {
+                    "description": "unique event name",
+                    "type": "string"
+                },
+                "eventType": {
+                    "description": "for example - applicationNf, guestOS, hostOS, platform",
+                    "type": "string"
+                },
+                "internalHeaderFields": {
+                    "$ref": "#/definitions/internalHeaderFields"
+                },
+                "lastEpochMicrosec": {
+                    "description": "the latest unix time aka epoch time associated with the event from any component--as microseconds elapsed since 1 Jan 1970 not including leap seconds",
+                    "type": "number"
+                },
+                "nfcNamingCode": {
+                    "description": "3 character network function component type, aligned with vfc naming standards",
+                    "type": "string"
+                },
+                "nfNamingCode": {
+                    "description": "4 character network function type, aligned with nf naming standards",
+                    "type": "string"
+                },
+                "nfVendorName": {
+                    "description": "network function vendor name",
+                    "type": "string"
+                },
+                "priority": {
+                    "description": "processing priority",
+                    "type": "string",
+                    "enum": [
+                        "High",
+                        "Medium",
+                        "Normal",
+                        "Low"
+                    ]
+                },
+                "reportingEntityId": {
+                    "description": "UUID identifying the entity reporting the event, for example an OAM VM; must be populated by the ATT enrichment process",
+                    "type": "string"
+                },
+                "reportingEntityName": {
+                    "description": "name of the entity reporting the event, for example, an EMS name; may be the same as sourceName",
+                    "type": "string"
+                },
+                "sequence": {
+                    "description": "ordering of events communicated by an event source instance or 0 if not needed",
+                    "type": "integer"
+                },
+                "sourceId": {
+                    "description": "UUID identifying the entity experiencing the event issue; must be populated by the ATT enrichment process",
+                    "type": "string"
+                },
+                "sourceName": {
+                    "description": "name of the entity experiencing the event issue",
+                    "type": "string"
+                },
+                "startEpochMicrosec": {
+                    "description": "the earliest unix time aka epoch time associated with the event from any component--as microseconds elapsed since 1 Jan 1970 not including leap seconds",
+                    "type": "number"
+                },
+                "stndDefinedNamespace": {
+                    "description": "Standards organization defined event namespace; expected usage includes event routing by the event listener",
+                    "type": "string"
+                },
+                "timeZoneOffset": {
+                    "description": "UTC offset for the local time zone of the device as UTC+/-hh.mm",
+                    "type": "string"
+                },
+                "version": {
+                    "description": "version of the event header",
+                    "type": "string",
+                    "enum": [
+                        "4.0",
+                        "4.0.1",
+                        "4.1"
+                    ]
+                },
+                "vesEventListenerVersion": {
+                    "description": "version of the VES Event Listener API",
+                    "type": "string",
+                    "enum": [
+                        "7.0",
+                        "7.0.1",
+                        "7.1",
+                        "7.1.1",
+                        "7.2",
+                        "7.2.1"
+                    ]
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "domain",
+                "eventId",
+                "eventName",
+                "lastEpochMicrosec",
+                "priority",
+                "reportingEntityName",
+                "sequence",
+                "sourceName",
+                "startEpochMicrosec",
+                "version",
+                "vesEventListenerVersion"
+            ]
+        },
+        "counter": {
+            "description": "performance counter",
+            "type": "object",
+            "properties": {
+                "criticality": {
+                    "type": "string",
+                    "enum": [
+                        "CRIT",
+                        "MAJ"
+                    ]
+                },
+                "hashMap": {
+                    "$ref": "#/definitions/hashMap"
+                },
+                "thresholdCrossed": {
+                    "type": "string"
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "criticality",
+                "hashMap",
+                "thresholdCrossed"
+            ]
+        },
+        "cpuUsage": {
+            "description": "usage of an identified CPU",
+            "type": "object",
+            "properties": {
+                "cpuCapacityContention": {
+                    "description": "the amount of time the CPU cannot run due to contention, in milliseconds over the measurementInterval",
+                    "type": "number"
+                },
+                "cpuDemandAvg": {
+                    "description": "the total CPU time that the NF/NFC/VM could use if there was no contention, in milliseconds over the measurementInterval",
+                    "type": "number"
+                },
+                "cpuDemandMhz": {
+                    "description": "CPU demand in megahertz",
+                    "type": "number"
+                },
+                "cpuDemandPct": {
+                    "description": "CPU demand as a percentage of the provisioned capacity",
+                    "type": "number"
+                },
+                "cpuIdentifier": {
+                    "description": "cpu identifer",
+                    "type": "string"
+                },
+                "cpuIdle": {
+                    "description": "percentage of CPU time spent in the idle task",
+                    "type": "number"
+                },
+                "cpuLatencyAvg": {
+                    "description": "percentage of time the VM is unable to run because it is contending for access to the physical CPUs",
+                    "type": "number"
+                },
+                "cpuOverheadAvg": {
+                    "description": "the overhead demand above available allocations and reservations, in milliseconds over the measurementInterval",
+                    "type": "number"
+                },
+                "cpuSwapWaitTime": {
+                    "description": "swap wait time. in milliseconds over the measurementInterval",
+                    "type": "number"
+                },
+                "cpuUsageInterrupt": {
+                    "description": "percentage of time spent servicing interrupts",
+                    "type": "number"
+                },
+                "cpuUsageNice": {
+                    "description": "percentage of time spent running user space processes that have been niced",
+                    "type": "number"
+                },
+                "cpuUsageSoftIrq": {
+                    "description": "percentage of time spent handling soft irq interrupts",
+                    "type": "number"
+                },
+                "cpuUsageSteal": {
+                    "description": "percentage of time spent in involuntary wait which is neither user, system or idle time and is effectively time that went missing",
+                    "type": "number"
+                },
+                "cpuUsageSystem": {
+                    "description": "percentage of time spent on system tasks running the kernel",
+                    "type": "number"
+                },
+                "cpuUsageUser": {
+                    "description": "percentage of time spent running un-niced user space processes",
+                    "type": "number"
+                },
+                "cpuWait": {
+                    "description": "percentage of CPU time spent waiting for I/O operations to complete",
+                    "type": "number"
+                },
+                "percentUsage": {
+                    "description": "aggregate cpu usage of the virtual machine on which the xNFC reporting the event is running",
+                    "type": "number"
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "cpuIdentifier",
+                "percentUsage"
+            ]
+        },
+        "diskUsage": {
+            "description": "usage of an identified disk",
+            "type": "object",
+            "properties": {
+                "diskBusResets": {
+                    "description": "number of bus resets over the measurementInterval",
+                    "type": "number"
+                },
+                "diskCommandsAborted": {
+                    "description": "number of disk commands aborted over the measurementInterval",
+                    "type": "number"
+                },
+                "diskCommandsAvg": {
+                    "description": "average number of commands per second over the measurementInterval",
+                    "type": "number"
+                },
+                "diskFlushRequests": {
+                    "description": "total flush requests of the disk cache over the measurementInterval",
+                    "type": "number"
+                },
+                "diskFlushTime": {
+                    "description": "milliseconds spent on disk cache flushing over the measurementInterval",
+                    "type": "number"
+                },
+                "diskIdentifier": {
+                    "description": "disk identifier",
+                    "type": "string"
+                },
+                "diskIoTimeAvg": {
+                    "description": "milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms  matches 100% load; provide the average over the measurement interval",
+                    "type": "number"
+                },
+                "diskIoTimeLast": {
+                    "description": "milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms  matches 100% load; provide the last value measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskIoTimeMax": {
+                    "description": "milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms  matches 100% load; provide the maximum value measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskIoTimeMin": {
+                    "description": "milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms  matches 100% load; provide the minimum value measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskMergedReadAvg": {
+                    "description": "number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the average measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskMergedReadLast": {
+                    "description": "number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the last value measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskMergedReadMax": {
+                    "description": "number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the maximum value measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskMergedReadMin": {
+                    "description": "number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the minimum value measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskMergedWriteAvg": {
+                    "description": "number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the average measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskMergedWriteLast": {
+                    "description": "number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the last value measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskMergedWriteMax": {
+                    "description": "number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the maximum value measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskMergedWriteMin": {
+                    "description": "number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the minimum value measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskOctetsReadAvg": {
+                    "description": "number of octets per second read from a disk or partition; provide the average measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskOctetsReadLast": {
+                    "description": "number of octets per second read from a disk or partition; provide the last measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskOctetsReadMax": {
+                    "description": "number of octets per second read from a disk or partition; provide the maximum measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskOctetsReadMin": {
+                    "description": "number of octets per second read from a disk or partition; provide the minimum measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskOctetsWriteAvg": {
+                    "description": "number of octets per second written to a disk or partition; provide the average measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskOctetsWriteLast": {
+                    "description": "number of octets per second written to a disk or partition; provide the last measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskOctetsWriteMax": {
+                    "description": "number of octets per second written to a disk or partition; provide the maximum measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskOctetsWriteMin": {
+                    "description": "number of octets per second written to a disk or partition; provide the minimum measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskOpsReadAvg": {
+                    "description": "number of read operations per second issued to the disk; provide the average measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskOpsReadLast": {
+                    "description": "number of read operations per second issued to the disk; provide the last measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskOpsReadMax": {
+                    "description": "number of read operations per second issued to the disk; provide the maximum measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskOpsReadMin": {
+                    "description": "number of read operations per second issued to the disk; provide the minimum measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskOpsWriteAvg": {
+                    "description": "number of write operations per second issued to the disk; provide the average measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskOpsWriteLast": {
+                    "description": "number of write operations per second issued to the disk; provide the last measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskOpsWriteMax": {
+                    "description": "number of write operations per second issued to the disk; provide the maximum measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskOpsWriteMin": {
+                    "description": "number of write operations per second issued to the disk; provide the minimum measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskPendingOperationsAvg": {
+                    "description": "queue size of pending I/O operations per second; provide the average measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskPendingOperationsLast": {
+                    "description": "queue size of pending I/O operations per second; provide the last measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskPendingOperationsMax": {
+                    "description": "queue size of pending I/O operations per second; provide the maximum measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskPendingOperationsMin": {
+                    "description": "queue size of pending I/O operations per second; provide the minimum measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskReadCommandsAvg": {
+                    "description": "average number of read commands issued per second to the disk over the measurementInterval",
+                    "type": "number"
+                },
+                "diskTime": {
+                    "description": "nanoseconds spent on disk cache reads/writes within the measurement interval",
+                    "type": "number"
+                },
+                "diskTimeReadAvg": {
+                    "description": "milliseconds a read operation took to complete; provide the average measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskTimeReadLast": {
+                    "description": "milliseconds a read operation took to complete; provide the last measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskTimeReadMax": {
+                    "description": "milliseconds a read operation took to complete; provide the maximum measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskTimeReadMin": {
+                    "description": "milliseconds a read operation took to complete; provide the minimum measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskTimeWriteAvg": {
+                    "description": "milliseconds a write operation took to complete; provide the average measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskTimeWriteLast": {
+                    "description": "milliseconds a write operation took to complete; provide the last measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskTimeWriteMax": {
+                    "description": "milliseconds a write operation took to complete; provide the maximum measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskTimeWriteMin": {
+                    "description": "milliseconds a write operation took to complete; provide the minimum measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskTotalReadLatencyAvg": {
+                    "description": "average read time from the perspective of a Guest OS: sum of the Kernel Read Latency and Physical Device Read Latency in milliseconds over the measurement interval",
+                    "type": "number"
+                },
+                "diskTotalWriteLatencyAvg": {
+                    "description": "average write time from the perspective of a Guest OS: sum of the Kernel Write Latency and Physical Device Write Latency in milliseconds over the measurement interval",
+                    "type": "number"
+                },
+                "diskWeightedIoTimeAvg": {
+                    "description": "measure in ms over 1 sec of both I/O completion time and the backlog that may be accumulating; value is the average within the collection interval",
+                    "type": "number"
+                },
+                "diskWeightedIoTimeLast": {
+                    "description": "measure in ms over 1 sec of both I/O completion time and the backlog that may be accumulating; value is the last within the collection interval",
+                    "type": "number"
+                },
+                "diskWeightedIoTimeMax": {
+                    "description": "measure in ms over 1 sec of both I/O completion time and the backlog that may be accumulating; value is the maximum within the collection interval",
+                    "type": "number"
+                },
+                "diskWeightedIoTimeMin": {
+                    "description": "measure in ms over 1 sec of both I/O completion time and the backlog that may be accumulating; value is the minimum within the collection interval",
+                    "type": "number"
+                },
+                "diskWriteCommandsAvg": {
+                    "description": "average number of write commands issued per second to the disk over the measurementInterval",
+                    "type": "number"
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "diskIdentifier"
+            ]
+        },
+        "endOfCallVqmSummaries": {
+            "description": "provides end of call voice quality metrics",
+            "type": "object",
+            "properties": {
+                "adjacencyName": {
+                    "description": " adjacency name",
+                    "type": "string"
+                },
+                "endpointAverageJitter": {
+                    "description": "endpoint average jitter",
+                    "type": "number"
+                },
+                "endpointDescription": {
+                    "description": "either Caller or Callee",
+                    "type": "string",
+                    "enum": [
+                        "Caller",
+                        "Callee"
+                    ]
+                },
+                "endpointMaxJitter": {
+                    "description": "endpoint maximum jitter",
+                    "type": "number"
+                },
+                "endpointRtpOctetsDiscarded": {
+                    "description": "",
+                    "type": "number"
+                },
+                "endpointRtpOctetsLost": {
+                    "description": "endpoint RTP octets lost",
+                    "type": "number"
+                },
+                "endpointRtpOctetsReceived": {
+                    "description": "",
+                    "type": "number"
+                },
+                "endpointRtpOctetsSent": {
+                    "description": "",
+                    "type": "number"
+                },
+                "endpointRtpPacketsDiscarded": {
+                    "description": "",
+                    "type": "number"
+                },
+                "endpointRtpPacketsLost": {
+                    "description": "endpoint RTP packets lost",
+                    "type": "number"
+                },
+                "endpointRtpPacketsReceived": {
+                    "description": "",
+                    "type": "number"
+                },
+                "endpointRtpPacketsSent": {
+                    "description": "",
+                    "type": "number"
+                },
+                "localAverageJitter": {
+                    "description": "Local average jitter",
+                    "type": "number"
+                },
+                "localAverageJitterBufferDelay": {
+                    "description": "Local average jitter delay",
+                    "type": "number"
+                },
+                "localMaxJitter": {
+                    "description": "Local maximum jitter",
+                    "type": "number"
+                },
+                "localMaxJitterBufferDelay": {
+                    "description": "Local maximum jitter delay",
+                    "type": "number"
+                },
+                "localRtpOctetsDiscarded": {
+                    "description": "",
+                    "type": "number"
+                },
+                "localRtpOctetsLost": {
+                    "description": "Local RTP octets lost",
+                    "type": "number"
+                },
+                "localRtpOctetsReceived": {
+                    "description": "",
+                    "type": "number"
+                },
+                "localRtpOctetsSent": {
+                    "description": "",
+                    "type": "number"
+                },
+                "localRtpPacketsDiscarded": {
+                    "description": "",
+                    "type": "number"
+                },
+                "localRtpPacketsLost": {
+                    "description": "Local RTP packets lost",
+                    "type": "number"
+                },
+                "localRtpPacketsReceived": {
+                    "description": "",
+                    "type": "number"
+                },
+                "localRtpPacketsSent": {
+                    "description": "",
+                    "type": "number"
+                },
+                "mosCqe": {
+                    "description": "1-5 1dp",
+                    "type": "number"
+                },
+                "oneWayDelay": {
+                    "description": "one-way path delay in milliseconds",
+                    "type": "number"
+                },
+                "packetLossPercent": {
+                    "description": "Calculated percentage packet loss based on Endpoint RTP packets lost (as reported in RTCP) and Local RTP packets sent. Direction is based on Endpoint description (Caller, Callee). Decimal (2 dp)",
+                    "type": "number"
+                },
+                "rFactor": {
+                    "description": "0-100",
+                    "type": "number"
+                },
+                "roundTripDelay": {
+                    "description": "millisecs",
+                    "type": "number"
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "adjacencyName",
+                "endpointDescription"
+            ]
+        },
+        "event": {
+            "description": "the root level of the common event format",
+            "type": "object",
+            "properties": {
+                "commonEventHeader": {
+                    "$ref": "#/definitions/commonEventHeader"
+                },
+                "faultFields": {
+                    "$ref": "#/definitions/faultFields"
+                },
+                "heartbeatFields": {
+                    "$ref": "#/definitions/heartbeatFields"
+                },
+                "measurementFields": {
+                    "$ref": "#/definitions/measurementFields"
+                },
+                "mobileFlowFields": {
+                    "$ref": "#/definitions/mobileFlowFields"
+                },
+                "notificationFields": {
+                    "$ref": "#/definitions/notificationFields"
+                },
+                "otherFields": {
+                    "$ref": "#/definitions/otherFields"
+                },
+                "perf3gppFields": {
+                    "$ref": "#/definitions/perf3gppFields"
+                },
+                "pnfRegistrationFields": {
+                    "$ref": "#/definitions/pnfRegistrationFields"
+                },
+                "sipSignalingFields": {
+                    "$ref": "#/definitions/sipSignalingFields"
+                },
+                "stateChangeFields": {
+                    "$ref": "#/definitions/stateChangeFields"
+                },
+                "stndDefinedFields": {
+                    "$ref": "#/definitions/stndDefinedFields"
+                },
+                "syslogFields": {
+                    "$ref": "#/definitions/syslogFields"
+                },
+                "thresholdCrossingAlertFields": {
+                    "$ref": "#/definitions/thresholdCrossingAlertFields"
+                },
+                "voiceQualityFields": {
+                    "$ref": "#/definitions/voiceQualityFields"
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "commonEventHeader"
+            ]
+        },
+        "eventList": {
+            "description": "array of events",
+            "type": "array",
+            "items": {
+                "$ref": "#/definitions/event"
+            }
+        },
+        "faultFields": {
+            "description": "fields specific to fault events",
+            "type": "object",
+            "properties": {
+                "alarmAdditionalInformation": {
+                    "$ref": "#/definitions/hashMap"
+                },
+                "alarmCondition": {
+                    "description": "alarm condition reported by the device",
+                    "type": "string"
+                },
+                "alarmInterfaceA": {
+                    "description": "card, port, channel or interface name of the device generating the alarm",
+                    "type": "string"
+                },
+                "eventCategory": {
+                    "description": "Event category, for example: license, link, routing, security, signaling",
+                    "type": "string"
+                },
+                "eventSeverity": {
+                    "description": "event severity",
+                    "type": "string",
+                    "enum": [
+                        "CRITICAL",
+                        "MAJOR",
+                        "MINOR",
+                        "WARNING",
+                        "NORMAL"
+                    ]
+                },
+                "eventSourceType": {
+                    "description": "type of event source; examples: card, host, other, port, portThreshold, router, slotThreshold, switch, virtualMachine, virtualNetworkFunction",
+                    "type": "string"
+                },
+                "faultFieldsVersion": {
+                    "description": "version of the faultFields block",
+                    "type": "string",
+                    "enum": [
+                        "4.0"
+                    ]
+                },
+                "specificProblem": {
+                    "description": "short description of the alarm or problem",
+                    "type": "string"
+                },
+                "vfStatus": {
+                    "description": "virtual function status enumeration",
+                    "type": "string",
+                    "enum": [
+                        "Active",
+                        "Idle",
+                        "Preparing to terminate",
+                        "Ready to terminate",
+                        "Requesting termination"
+                    ]
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "alarmCondition",
+                "eventSeverity",
+                "eventSourceType",
+                "faultFieldsVersion",
+                "specificProblem",
+                "vfStatus"
+            ]
+        },
+        "filesystemUsage": {
+            "description": "disk usage of an identified virtual machine in gigabytes and/or gigabytes per second",
+            "type": "object",
+            "properties": {
+                "blockConfigured": {
+                    "type": "number"
+                },
+                "blockIops": {
+                    "type": "number"
+                },
+                "blockUsed": {
+                    "type": "number"
+                },
+                "ephemeralConfigured": {
+                    "type": "number"
+                },
+                "ephemeralIops": {
+                    "type": "number"
+                },
+                "ephemeralUsed": {
+                    "type": "number"
+                },
+                "filesystemName": {
+                    "type": "string"
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "blockConfigured",
+                "blockIops",
+                "blockUsed",
+                "ephemeralConfigured",
+                "ephemeralIops",
+                "ephemeralUsed",
+                "filesystemName"
+            ]
+        },
+        "gtpPerFlowMetrics": {
+            "description": "Mobility GTP Protocol per flow metrics",
+            "type": "object",
+            "properties": {
+                "avgBitErrorRate": {
+                    "description": "average bit error rate",
+                    "type": "number"
+                },
+                "avgPacketDelayVariation": {
+                    "description": "Average packet delay variation or jitter in milliseconds for received packets: Average difference between the packet timestamp and time received for all pairs of consecutive packets",
+                    "type": "number"
+                },
+                "avgPacketLatency": {
+                    "description": "average delivery latency",
+                    "type": "number"
+                },
+                "avgReceiveThroughput": {
+                    "description": "average receive throughput",
+                    "type": "number"
+                },
+                "avgTransmitThroughput": {
+                    "description": "average transmit throughput",
+                    "type": "number"
+                },
+                "durConnectionFailedStatus": {
+                    "description": "duration of failed state in milliseconds, computed as the cumulative time between a failed echo request and the next following successful error request, over this reporting interval",
+                    "type": "number"
+                },
+                "durTunnelFailedStatus": {
+                    "description": "Duration of errored state, computed as the cumulative time between a tunnel error indicator and the next following non-errored indicator, over this reporting interval",
+                    "type": "number"
+                },
+                "flowActivatedBy": {
+                    "description": "Endpoint activating the flow",
+                    "type": "string"
+                },
+                "flowActivationEpoch": {
+                    "description": "Time the connection is activated in the flow (connection) being reported on, or transmission time of the first packet if activation time is not available",
+                    "type": "number"
+                },
+                "flowActivationMicrosec": {
+                    "description": "Integer microseconds for the start of the flow connection",
+                    "type": "number"
+                },
+                "flowActivationTime": {
+                    "description": "time the connection is activated in the flow being reported on, or transmission time of the first packet if activation time is not available; with RFC 2822 compliant format: Sat, 13 Mar 2010 11:29:05 -0800",
+                    "type": "string"
+                },
+                "flowDeactivatedBy": {
+                    "description": "Endpoint deactivating the flow",
+                    "type": "string"
+                },
+                "flowDeactivationEpoch": {
+                    "description": "Time for the start of the flow connection, in integer UTC epoch time aka UNIX time",
+                    "type": "number"
+                },
+                "flowDeactivationMicrosec": {
+                    "description": "Integer microseconds for the start of the flow connection",
+                    "type": "number"
+                },
+                "flowDeactivationTime": {
+                    "description": "Transmission time of the first packet in the flow connection being reported on; with RFC 2822 compliant format: Sat, 13 Mar 2010 11:29:05 -0800",
+                    "type": "string"
+                },
+                "flowStatus": {
+                    "description": "connection status at reporting time as a working / inactive / failed indicator value",
+                    "type": "string"
+                },
+                "gtpConnectionStatus": {
+                    "description": "Current connection state at reporting time",
+                    "type": "string"
+                },
+                "gtpTunnelStatus": {
+                    "description": "Current tunnel state  at reporting time",
+                    "type": "string"
+                },
+                "ipTosCountList": {
+                    "$ref": "#/definitions/hashMap"
+                },
+                "ipTosList": {
+                    "description": "Array of unique IP Type-of-Service values observed in the flow where values range from '0' to '255'",
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "largePacketRtt": {
+                    "description": "large packet round trip time",
+                    "type": "number"
+                },
+                "largePacketThreshold": {
+                    "description": "large packet threshold being applied",
+                    "type": "number"
+                },
+                "maxPacketDelayVariation": {
+                    "description": "Maximum packet delay variation or jitter in milliseconds for received packets: Maximum of the difference between the packet timestamp and time received for all pairs of consecutive packets",
+                    "type": "number"
+                },
+                "maxReceiveBitRate": {
+                    "description": "maximum receive bit rate",
+                    "type": "number"
+                },
+                "maxTransmitBitRate": {
+                    "description": "maximum transmit bit rate",
+                    "type": "number"
+                },
+                "mobileQciCosCountList": {
+                    "$ref": "#/definitions/hashMap"
+                },
+                "mobileQciCosList": {
+                    "description": "Array of unique LTE QCI or UMTS class-of-service values observed in the flow",
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "numActivationFailures": {
+                    "description": "Number of failed activation requests, as observed by the reporting node",
+                    "type": "number"
+                },
+                "numBitErrors": {
+                    "description": "number of errored bits",
+                    "type": "number"
+                },
+                "numBytesReceived": {
+                    "description": "number of bytes received, including retransmissions",
+                    "type": "number"
+                },
+                "numBytesTransmitted": {
+                    "description": "number of bytes transmitted, including retransmissions",
+                    "type": "number"
+                },
+                "numDroppedPackets": {
+                    "description": "number of received packets dropped due to errors per virtual interface",
+                    "type": "number"
+                },
+                "numGtpEchoFailures": {
+                    "description": "Number of Echo request path failures where failed paths are defined in 3GPP TS 29.281 sec 7.2.1 and 3GPP TS 29.060 sec. 11.2",
+                    "type": "number"
+                },
+                "numGtpTunnelErrors": {
+                    "description": "Number of tunnel error indications where errors are defined in 3GPP TS 29.281 sec 7.3.1 and 3GPP TS 29.060 sec. 11.1",
+                    "type": "number"
+                },
+                "numHttpErrors": {
+                    "description": "Http error count",
+                    "type": "number"
+                },
+                "numL7BytesReceived": {
+                    "description": "number of tunneled layer 7 bytes received, including retransmissions",
+                    "type": "number"
+                },
+                "numL7BytesTransmitted": {
+                    "description": "number of tunneled layer 7 bytes transmitted, excluding retransmissions",
+                    "type": "number"
+                },
+                "numLostPackets": {
+                    "description": "number of lost packets",
+                    "type": "number"
+                },
+                "numOutOfOrderPackets": {
+                    "description": "number of out-of-order packets",
+                    "type": "number"
+                },
+                "numPacketErrors": {
+                    "description": "number of errored packets",
+                    "type": "number"
+                },
+                "numPacketsReceivedExclRetrans": {
+                    "description": "number of packets received, excluding retransmission",
+                    "type": "number"
+                },
+                "numPacketsReceivedInclRetrans": {
+                    "description": "number of packets received, including retransmission",
+                    "type": "number"
+                },
+                "numPacketsTransmittedInclRetrans": {
+                    "description": "number of packets transmitted, including retransmissions",
+                    "type": "number"
+                },
+                "numRetries": {
+                    "description": "number of packet retries",
+                    "type": "number"
+                },
+                "numTimeouts": {
+                    "description": "number of packet timeouts",
+                    "type": "number"
+                },
+                "numTunneledL7BytesReceived": {
+                    "description": "number of tunneled layer 7 bytes received, excluding retransmissions",
+                    "type": "number"
+                },
+                "roundTripTime": {
+                    "description": "round trip time",
+                    "type": "number"
+                },
+                "tcpFlagCountList": {
+                    "$ref": "#/definitions/hashMap"
+                },
+                "tcpFlagList": {
+                    "description": "Array of unique TCP Flags observed in the flow",
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "timeToFirstByte": {
+                    "description": "Time in milliseconds between the connection activation and first byte received",
+                    "type": "number"
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "avgBitErrorRate",
+                "avgPacketDelayVariation",
+                "avgPacketLatency",
+                "avgReceiveThroughput",
+                "avgTransmitThroughput",
+                "flowActivationEpoch",
+                "flowActivationMicrosec",
+                "flowDeactivationEpoch",
+                "flowDeactivationMicrosec",
+                "flowDeactivationTime",
+                "flowStatus",
+                "maxPacketDelayVariation",
+                "numActivationFailures",
+                "numBitErrors",
+                "numBytesReceived",
+                "numBytesTransmitted",
+                "numDroppedPackets",
+                "numL7BytesReceived",
+                "numL7BytesTransmitted",
+                "numLostPackets",
+                "numOutOfOrderPackets",
+                "numPacketErrors",
+                "numPacketsReceivedExclRetrans",
+                "numPacketsReceivedInclRetrans",
+                "numPacketsTransmittedInclRetrans",
+                "numRetries",
+                "numTimeouts",
+                "numTunneledL7BytesReceived",
+                "roundTripTime",
+                "timeToFirstByte"
+            ]
+        },
+        "hashMap": {
+            "description": "an associative array which is an array of key:value pairs",
+            "type": "object",
+            "additionalProperties": {
+                "type": "string"
+            },
+            "default": {}
+        },
+        "heartbeatFields": {
+            "description": "optional field block for fields specific to heartbeat events",
+            "type": "object",
+            "properties": {
+                "additionalFields": {
+                    "$ref": "#/definitions/hashMap"
+                },
+                "heartbeatFieldsVersion": {
+                    "description": "version of the heartbeatFields block",
+                    "type": "string",
+                    "enum": [
+                        "3.0"
+                    ]
+                },
+                "heartbeatInterval": {
+                    "description": "current heartbeat interval in seconds",
+                    "type": "integer"
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "heartbeatFieldsVersion",
+                "heartbeatInterval"
+            ]
+        },
+        "hugePages": {
+            "description": "metrics on system hugepages",
+            "type": "object",
+            "properties": {
+                "bytesFree": {
+                    "description": "number of free hugepages in bytes",
+                    "type": "number"
+                },
+                "bytesUsed": {
+                    "description": "number of used hugepages in bytes",
+                    "type": "number"
+                },
+                "hugePagesIdentifier": {
+                    "description": "hugePages identifier",
+                    "type": "string"
+                },
+                "percentFree": {
+                    "description": "number of free hugepages in percent",
+                    "type": "number"
+                },
+                "percentUsed": {
+                    "description": "number of free hugepages in percent",
+                    "type": "number"
+                },
+                "vmPageNumberFree": {
+                    "description": "number of free vmPages in numbers",
+                    "type": "number"
+                },
+                "vmPageNumberUsed": {
+                    "description": "number of used vmPages in numbers",
+                    "type": "number"
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "hugePagesIdentifier"
+            ]
+        },
+        "internalHeaderFields": {
+            "description": "enrichment fields for internal VES Event Listener service use only, not supplied by event sources",
+            "type": "object"
+        },
+        "ipmi": {
+            "description": "intelligent platform management interface metrics",
+            "type": "object",
+            "properties": {
+                "exitAirTemperature": {
+                    "description": "system fan exit air flow temperature in celsius",
+                    "type": "number"
+                },
+                "frontPanelTemperature": {
+                    "description": "front panel temperature in celsius",
+                    "type": "number"
+                },
+                "ioModuleTemperature": {
+                    "description": "io module temperature in celsius",
+                    "type": "number"
+                },
+                "ipmiBaseboardTemperatureArray": {
+                    "description": "array of ipmiBaseboardTemperature objects",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/ipmiBaseboardTemperature"
+                    }
+                },
+                "ipmiBaseboardVoltageRegulatorArray": {
+                    "description": "array of ipmiBaseboardVoltageRegulator objects",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/ipmiBaseboardVoltageRegulator"
+                    }
+                },
+                "ipmiBatteryArray": {
+                    "description": "array of ipmiBattery objects",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/ipmiBattery"
+                    }
+                },
+                "ipmiFanArray": {
+                    "description": "array of ipmiFan objects",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/ipmiFan"
+                    }
+                },
+                "ipmiHsbpArray": {
+                    "description": "array of ipmiHsbp objects",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/ipmiHsbp"
+                    }
+                },
+                "ipmiGlobalAggregateTemperatureMarginArray": {
+                    "description": "array of ipmiGlobalAggregateTemperatureMargin objects",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/ipmiGlobalAggregateTemperatureMargin"
+                    }
+                },
+                "ipmiNicArray": {
+                    "description": "array of ipmiNic objects",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/ipmiNic"
+                    }
+                },
+                "ipmiPowerSupplyArray": {
+                    "description": "array of ipmiPowerSupply objects",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/ipmiPowerSupply"
+                    }
+                },
+                "ipmiProcessorArray": {
+                    "description": "array of ipmiProcessor objects",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/ipmiProcessor"
+                    }
+                },
+                "systemAirflow": {
+                    "description": "airfflow in cubic feet per minute (cfm)",
+                    "type": "number"
+                }
+            },
+            "additionalProperties": false
+        },
+        "ipmiBaseboardTemperature": {
+            "description": "intelligent platform management interface (ipmi) baseboard temperature metrics",
+            "type": "object",
+            "properties": {
+                "baseboardTemperatureIdentifier": {
+                    "description": "identifier for the location where the temperature is taken",
+                    "type": "string"
+                },
+                "baseboardTemperature": {
+                    "description": "baseboard temperature in celsius",
+                    "type": "number"
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "baseboardTemperatureIdentifier"
+            ]
+        },
+        "ipmiBaseboardVoltageRegulator": {
+            "description": "intelligent platform management interface (ipmi) baseboard voltage regulator metrics",
+            "type": "object",
+            "properties": {
+                "baseboardVoltageRegulatorIdentifier": {
+                    "description": "identifier for the baseboard voltage regulator",
+                    "type": "string"
+                },
+                "voltageRegulatorTemperature": {
+                    "description": "voltage regulator temperature in celsius",
+                    "type": "number"
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "baseboardVoltageRegulatorIdentifier"
+            ]
+        },
+        "ipmiBattery": {
+            "description": "intelligent platform management interface (ipmi) battery metrics",
+            "type": "object",
+            "properties": {
+                "batteryIdentifier": {
+                    "description": "identifier for the battery",
+                    "type": "string"
+                },
+                "batteryType": {
+                    "description": "type of battery",
+                    "type": "string"
+                },
+                "batteryVoltageLevel": {
+                    "description": "battery voltage level",
+                    "type": "number"
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "batteryIdentifier"
+            ]
+        },
+        "ipmiFan": {
+            "description": "intelligent platform management interface (ipmi) fan metrics",
+            "type": "object",
+            "properties": {
+                "fanIdentifier": {
+                    "description": "identifier for the fan",
+                    "type": "string"
+                },
+                "fanSpeed": {
+                    "description": "fan speed in revolutions per minute (rpm)",
+                    "type": "number"
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "fanIdentifier"
+            ]
+        },
+        "ipmiGlobalAggregateTemperatureMargin": {
+            "description": "intelligent platform management interface (ipmi) global aggregate temperature margin",
+            "type": "object",
+            "properties": {
+                "globalAggregateTemperatureMarginIdentifier": {
+                    "description": "identifier for the ipmi global aggregate temperature margin metrics",
+                    "type": "string"
+                },
+                "globalAggregateTemperatureMargin": {
+                    "description": "the difference between the current global aggregate temperature, in celsius, and the global aggregate throttling thermal trip point",
+                    "type": "number"
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "globalAggregateTemperatureMarginIdentifier",
+                "globalAggregateTemperatureMargin"
+            ]
+        },
+        "ipmiHsbp": {
+            "description": "intelligent platform management interface (ipmi) hot swap backplane power metrics",
+            "type": "object",
+            "properties": {
+                "hsbpIdentifier": {
+                    "description": "identifier for the hot swap backplane power unit",
+                    "type": "string"
+                },
+                "hsbpTemperature": {
+                    "description": "hot swap backplane power temperature in celsius",
+                    "type": "number"
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "hsbpIdentifier"
+            ]
+        },
+        "ipmiNic": {
+            "description": "intelligent platform management interface (ipmi) network interface control card (nic) metrics",
+            "type": "object",
+            "properties": {
+                "nicIdentifier": {
+                    "description": "identifier for the network interface control card",
+                    "type": "string"
+                },
+                "nicTemperature": {
+                    "description": "nic temperature in celsius",
+                    "type": "number"
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "nicIdentifier"
+            ]
+        },
+        "ipmiPowerSupply": {
+            "description": "intelligent platform management interface (ipmi) power supply metrics",
+            "type": "object",
+            "properties": {
+                "powerSupplyIdentifier": {
+                    "description": "identifier for the power supply",
+                    "type": "string"
+                },
+                "powerSupplyInputPower": {
+                    "description": "input power in watts",
+                    "type": "number"
+                },
+                "powerSupplyCurrentOutputPercent": {
+                    "description": "current output voltage as a percentage of the design specified level",
+                    "type": "number"
+                },
+                "powerSupplyTemperature": {
+                    "description": "power supply temperature in celsius",
+                    "type": "number"
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "powerSupplyIdentifier"
+            ]
+        },
+        "ipmiProcessor": {
+            "description": "intelligent platform management interface processor metrics",
+            "type": "object",
+            "properties": {
+                "processorIdentifier": {
+                    "description": "identifier for an ipmi processor",
+                    "type": "string"
+                },
+                "processorThermalControlPercent": {
+                    "description": "io module temperature in celsius",
+                    "type": "number"
+                },
+                "processorDtsThermalMargin": {
+                    "description": "front panel temperature in celsius",
+                    "type": "number"
+                },
+                "processorDimmAggregateThermalMarginArray": {
+                    "description": "array of processorDimmAggregateThermalMargin objects",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/processorDimmAggregateThermalMargin"
+                    }
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "processorIdentifier"
+            ]
+        },
+        "jsonObject": {
+            "description": "json object schema, name and other meta-information along with one or more object instances",
+            "type": "object",
+            "properties": {
+                "objectInstances": {
+                    "description": "one or more instances of the jsonObject",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/jsonObjectInstance"
+                    }
+                },
+                "objectName": {
+                    "description": "name of the JSON Object",
+                    "type": "string"
+                },
+                "objectSchema": {
+                    "description": "json schema for the object",
+                    "type": "string"
+                },
+                "objectSchemaUrl": {
+                    "description": "Url to the json schema for the object",
+                    "type": "string"
+                },
+                "nfSubscribedObjectName": {
+                    "description": "name of the object associated with the nfSubscriptonId",
+                    "type": "string"
+                },
+                "nfSubscriptionId": {
+                    "description": "identifies an openConfig telemetry subscription on a network function, which configures the network function to send complex object data associated with the jsonObject",
+                    "type": "string"
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "objectInstances",
+                "objectName"
+            ]
+        },
+        "jsonObjectInstance": {
+            "description": "meta-information about an instance of a jsonObject along with the actual object instance",
+            "type": "object",
+            "properties": {
+                "jsonObject": {
+                    "$ref": "#/definitions/jsonObject"
+                },
+                "objectInstance": {
+                    "description": "an instance conforming to the jsonObject objectSchema",
+                    "type": "object"
+                },
+                "objectInstanceEpochMicrosec": {
+                    "description": "the unix time aka epoch time associated with this objectInstance--as microseconds elapsed since 1 Jan 1970 not including leap seconds",
+                    "type": "number"
+                },
+                "objectKeys": {
+                    "description": "an ordered set of keys that identifies this particular instance of jsonObject",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/key"
+                    }
+                }
+            },
+            "additionalProperties": false
+        },
+        "key": {
+            "description": "tuple which provides the name of a key along with its value and relative order",
+            "type": "object",
+            "properties": {
+                "keyName": {
+                    "description": "name of the key",
+                    "type": "string"
+                },
+                "keyOrder": {
+                    "description": "relative sequence or order of the key with respect to other keys",
+                    "type": "integer"
+                },
+                "keyValue": {
+                    "description": "value of the key",
+                    "type": "string"
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "keyName"
+            ]
+        },
+        "latencyBucketMeasure": {
+            "description": "number of counts falling within a defined latency bucket",
+            "type": "object",
+            "properties": {
+                "countsInTheBucket": {
+                    "type": "number"
+                },
+                "highEndOfLatencyBucket": {
+                    "type": "number"
+                },
+                "lowEndOfLatencyBucket": {
+                    "type": "number"
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "countsInTheBucket"
+            ]
+        },
+        "load": {
+            "description": "/proc/loadavg cpu utilization and io utilization metrics",
+            "type": "object",
+            "properties": {
+                "longTerm": {
+                    "description": "number of jobs in the run queue (state R, cpu utilization) or waiting for disk I/O (state D, io utilization) averaged over 15 minutes using /proc/loadavg",
+                    "type": "number"
+                },
+                "midTerm": {
+                    "description": "number of jobs in the run queue (state R, cpu utilization) or waiting for disk I/O (state D, io utilization) averaged over 5 minutes using /proc/loadavg",
+                    "type": "number"
+                },
+                "shortTerm": {
+                    "description": "number of jobs in the run queue (state R, cpu utilization) or waiting for disk I/O (state D, io utilization) averaged over 1 minute using /proc/loadavg",
+                    "type": "number"
+                }
+            },
+            "additionalProperties": false
+        },
+        "machineCheckException": {
+            "description": "metrics on vm machine check exceptions",
+            "type": "object",
+            "properties": {
+                "correctedMemoryErrors": {
+                    "description": "total hardware errors that were corrected by the hardware (e.g. data corruption corrected via  ECC) over the measurementInterval",
+                    "type": "number"
+                },
+                "correctedMemoryErrorsIn1Hr": {
+                    "description": "total hardware errors that were corrected by the hardware over the last one hour",
+                    "type": "number"
+                },
+                "uncorrectedMemoryErrors": {
+                    "description": "total uncorrected hardware errors that were detected by the hardware (e.g., causing data corruption) over the measurementInterval",
+                    "type": "number"
+                },
+                "uncorrectedMemoryErrorsIn1Hr": {
+                    "description": "total uncorrected hardware errors that were detected by the hardware over the last one hour",
+                    "type": "number"
+                },
+                "vmIdentifier": {
+                    "description": "virtual machine identifier associated with the machine check exception",
+                    "type": "string"
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "vmIdentifier"
+            ]
+        },
+        "measDataCollection": {
+            "description": "3GPP measurement collection structure aligned with 3GPP PM format",
+            "type": "object",
+            "properties": {
+                "formatVersion": {
+                    "description": "3gpp PM reporting file format version from pre-standard TS 28.550 v2.0.0",
+                    "type": "string"
+                },
+                "granularityPeriod": {
+                    "description": "granularity period for the PM report in seconds",
+                    "type": "number"
+                },
+                "measInfoList": {
+                    "description": "array of measurements",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/measInfo"
+                    }
+                },
+                "measObjInstIdList": {
+                    "description": "array of monitored object local distinguished name ids per 3GPP TS 32.300",
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "measuredEntityDn": {
+                    "description": "distinguished name per 3GPP TS 28.550",
+                    "type": "string"
+                },
+                "measuredEntitySoftwareVersion": {
+                    "description": "software version for the NF providing the PM data as specified in 3GPP TS 28.550",
+                    "type": "string"
+                },
+                "measuredEntityUserName": {
+                    "description": "user definable name for the measured object per 3GPP TS 28.550",
+                    "type": "string"
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "granularityPeriod",
+                "measInfoList",
+                "measuredEntityDn"
+            ]
+        },
+        "measInfo": {
+            "description": "measurement information.",
+            "type": "object",
+            "properties": {
+                "jobId": {
+                    "description": "name of the measurement job",
+                    "type": "string"
+                },
+                "measInfoId": {
+                    "description": "measurement group identifier",
+                    "oneOf": [{
+                            "$ref": "#/definitions/measInfoIdInteger"
+                        },
+                        {
+                            "$ref": "#/definitions/measInfoIdString"
+                        }
+                    ]
+                },
+                "measTypes": {
+                    "oneOf": [{
+                            "$ref": "#/definitions/measTypesInteger"
+                        },
+                        {
+                            "$ref": "#/definitions/measTypesString"
+                        }
+                    ]
+                },
+                "measValuesList": {
+                    "description": "an array of measurement values",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/measValues"
+                    }
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "measTypes",
+                "measValuesList"
+            ]
+        },
+        "measInfoIdInteger": {
+            "description": "integer measurement group identifier",
+            "type": "object",
+            "properties": {
+                "iMeasInfoId": {
+                    "type": "integer"
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "iMeasInfoId"
+            ]
+        },
+        "measInfoIdString": {
+            "description": "string measurement group identifier",
+            "type": "object",
+            "properties": {
+                "sMeasInfoId": {
+                    "type": "string"
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "sMeasInfoId"
+            ]
+        },
+        "measResultInteger": {
+            "description": "integer 3GPP PM measurement result",
+            "type": "object",
+            "properties": {
+                "p": {
+                    "description": "integer reference to the counter",
+                    "type": "integer"
+                },
+                "iValue": {
+                    "description": "integer counter value",
+                    "type": "integer"
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "p",
+                "iValue"
+            ]
+        },
+        "measResultNull": {
+            "description": "null 3GPP PM measurement result",
+            "type": "object",
+            "properties": {
+                "p": {
+                    "description": "integer reference to the counter",
+                    "type": "integer"
+                },
+                "isNull": {
+                    "description": "true if the counter has no value",
+                    "type": "string",
+                    "enum": [
+                        "true",
+                        "false"
+                    ]
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "p",
+                "isNull"
+            ]
+        },
+        "measResultNumber": {
+            "description": "number 3GPP PM measurement result",
+            "type": "object",
+            "properties": {
+                "p": {
+                    "description": "integer reference to the counter",
+                    "type": "integer"
+                },
+                "rValue": {
+                    "description": "numeric counter value",
+                    "type": "number"
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "p",
+                "rValue"
+            ]
+        },
+        "measResultString": {
+            "description": "string 3GPP PM measurement result",
+            "type": "object",
+            "properties": {
+                "p": {
+                    "description": "integer reference to the counter",
+                    "type": "integer"
+                },
+                "sValue": {
+                    "description": "string counter value",
+                    "type": "string"
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "p",
+                "sValue"
+            ]
+        },
+        "measTypesInteger": {
+            "description": "object containing an array of integer measurement identifiers associated with the measurement results",
+            "type": "object",
+            "properties": {
+                "iMeasTypesList": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "iMeasTypesList"
+            ]
+        },
+        "measTypesString": {
+            "description": "object containing an array of string measurement identifiers associated with the measurement results",
+            "type": "object",
+            "properties": {
+                "sMeasTypesList": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "sMeasTypesList"
+            ]
+        },
+        "measurementFields": {
+            "description": "measurement fields",
+            "type": "object",
+            "properties": {
+                "additionalFields": {
+                    "$ref": "#/definitions/hashMap"
+                },
+                "additionalMeasurements": {
+                    "$ref": "#/definitions/arrayOfNamedHashMap"
+                },
+                "additionalObjects": {
+                    "$ref": "#/definitions/arrayOfJsonObject"
+                },
+                "codecUsageArray": {
+                    "description": "array of codecs in use",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/codecsInUse"
+                    }
+                },
+                "concurrentSessions": {
+                    "description": "peak concurrent sessions for the VM or xNF over the measurementInterval",
+                    "type": "integer"
+                },
+                "configuredEntities": {
+                    "description": "over the measurementInterval, peak total number of: users, subscribers, devices, adjacencies, etc., for the VM, or subscribers, devices, etc., for the xNF",
+                    "type": "integer"
+                },
+                "cpuUsageArray": {
+                    "description": "usage of an array of CPUs",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/cpuUsage"
+                    }
+                },
+                "diskUsageArray": {
+                    "description": "usage of an array of disks",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/diskUsage"
+                    }
+                },
+                "featureUsageArray": {
+                    "$ref": "#/definitions/hashMap"
+                },
+                "filesystemUsageArray": {
+                    "description": "filesystem usage of the VM on which the xNFC reporting the event is running",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/filesystemUsage"
+                    }
+                },
+                "hugePagesArray": {
+                    "description": "array of metrics on hugepPages",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/hugePages"
+                    }
+                },
+                "ipmi": {
+                    "$ref": "#/definitions/ipmi"
+                },
+                "latencyDistribution": {
+                    "description": "array of integers representing counts of requests whose latency in milliseconds falls within per-xNF configured ranges",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/latencyBucketMeasure"
+                    }
+                },
+                "loadArray": {
+                    "description": "array of system load metrics",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/load"
+                    }
+                },
+                "machineCheckExceptionArray": {
+                    "description": "array of machine check exceptions",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/machineCheckException"
+                    }
+                },
+                "meanRequestLatency": {
+                    "description": "mean seconds required to respond to each request for the VM on which the xNFC reporting the event is running",
+                    "type": "number"
+                },
+                "measurementInterval": {
+                    "description": "interval over which measurements are being reported in seconds",
+                    "type": "number"
+                },
+                "measurementFieldsVersion": {
+                    "description": "version of the measurementFields block",
+                    "type": "string",
+                    "enum": [
+                        "4.0"
+                    ]
+                },
+                "memoryUsageArray": {
+                    "description": "memory usage of an array of VMs",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/memoryUsage"
+                    }
+                },
+                "numberOfMediaPortsInUse": {
+                    "description": "number of media ports in use",
+                    "type": "integer"
+                },
+                "requestRate": {
+                    "description": "peak rate of service requests per second to the xNF over the measurementInterval",
+                    "type": "number"
+                },
+                "nfcScalingMetric": {
+                    "description": "represents busy-ness of the network function from 0 to 100 as reported by the xNFC",
+                    "type": "integer"
+                },
+                "nicPerformanceArray": {
+                    "description": "usage of an array of network interface cards",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/nicPerformance"
+                    }
+                },
+                "processStatsArray": {
+                    "description": "array of metrics on system processes",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/processStats"
+                    }
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "measurementInterval",
+                "measurementFieldsVersion"
+            ]
+        },
+        "measValues": {
+            "description": "3GPP measurement values",
+            "type": "object",
+            "properties": {
+                "measObjAddlFlds": {
+                    "$ref": "#/definitions/hashMap"
+                },
+                "measObjInstId": {
+                    "description": "monitored object local distinguished name per 3GPP TS 32.300 and 3GPP TS 32.432",
+                    "type": "string"
+                },
+                "measResults": {
+                    "description": "array of results",
+                    "type": "array",
+                    "items": {
+                        "oneOf": [{
+                                "$ref": "#/definitions/measResultInteger"
+                            },
+                            {
+                                "$ref": "#/definitions/measResultNull"
+                            },
+                            {
+                                "$ref": "#/definitions/measResultNumber"
+                            },
+                            {
+                                "$ref": "#/definitions/measResultString"
+                            }
+                        ]
+                    }
+                },
+                "suspectFlag": {
+                    "description": "indicates if the values are suspect",
+                    "type": "string",
+                    "enum": [
+                        "true",
+                        "false"
+                    ]
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "measObjInstId",
+                "measResults"
+            ]
+        },
+        "memoryUsage": {
+            "description": "memory usage of an identified virtual machine",
+            "type": "object",
+            "properties": {
+                "memoryBuffered": {
+                    "description": "kibibytes of temporary storage for raw disk blocks",
+                    "type": "number"
+                },
+                "memoryCached": {
+                    "description": "kibibytes of memory used for cache",
+                    "type": "number"
+                },
+                "memoryConfigured": {
+                    "description": "kibibytes of memory configured in the virtual machine on which the xNFC reporting the event is running",
+                    "type": "number"
+                },
+                "memoryDemand": {
+                    "description": "host demand in kibibytes",
+                    "type": "number"
+                },
+                "memoryFree": {
+                    "description": "kibibytes of physical RAM left unused by the system",
+                    "type": "number"
+                },
+                "memoryLatencyAvg": {
+                    "description": "Percentage of time the VM is waiting to access swapped or compressed memory",
+                    "type": "number"
+                },
+                "memorySharedAvg": {
+                    "description": "shared memory in kilobytes",
+                    "type": "number"
+                },
+                "memorySlabRecl": {
+                    "description": "the part of the slab that can be reclaimed such as caches measured in kibibytes",
+                    "type": "number"
+                },
+                "memorySlabUnrecl": {
+                    "description": "the part of the slab that cannot be reclaimed even when lacking memory measured in kibibytes",
+                    "type": "number"
+                },
+                "memorySwapInAvg": {
+                    "description": "Amount of memory swapped-in from host cache in kibibytes",
+                    "type": "number"
+                },
+                "memorySwapInRateAvg": {
+                    "description": "rate at which memory is swapped from disk into active memory during the interval in kilobytes per second",
+                    "type": "number"
+                },
+                "memorySwapOutAvg": {
+                    "description": "Amount of memory swapped-out to host cache in kibibytes",
+                    "type": "number"
+                },
+                "memorySwapOutRateAvg": {
+                    "description": "rate at which memory is being swapped from active memory to disk during the current interval in kilobytes per second",
+                    "type": "number"
+                },
+                "memorySwapUsedAvg": {
+                    "description": "space used for caching swapped pages in the host cache in kibibytes",
+                    "type": "number"
+                },
+                "memoryUsed": {
+                    "description": "total memory minus the sum of free, buffered, cached and slab memory measured in kibibytes",
+                    "type": "number"
+                },
+                "percentMemoryUsage": {
+                    "description": "Percentage of memory usage; value = (memoryUsed / (memoryUsed + memoryFree) x 100 if denomintor is nonzero, or 0, if otherwise",
+                    "type": "number"
+                },
+                "vmIdentifier": {
+                    "description": "virtual machine identifier associated with the memory metrics",
+                    "type": "string"
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "memoryFree",
+                "memoryUsed",
+                "vmIdentifier"
+            ]
+        },
+        "mobileFlowFields": {
+            "description": "mobileFlow fields",
+            "type": "object",
+            "properties": {
+                "additionalFields": {
+                    "$ref": "#/definitions/hashMap"
+                },
+                "applicationType": {
+                    "description": "Application type inferred",
+                    "type": "string"
+                },
+                "appProtocolType": {
+                    "description": "application protocol",
+                    "type": "string"
+                },
+                "appProtocolVersion": {
+                    "description": "application protocol version",
+                    "type": "string"
+                },
+                "cid": {
+                    "description": "cell id",
+                    "type": "string"
+                },
+                "connectionType": {
+                    "description": "Abbreviation referencing a 3GPP reference point e.g., S1-U, S11, etc",
+                    "type": "string"
+                },
+                "ecgi": {
+                    "description": "Evolved Cell Global Id",
+                    "type": "string"
+                },
+                "flowDirection": {
+                    "description": "Flow direction, indicating if the reporting node is the source of the flow or destination for the flow",
+                    "type": "string"
+                },
+                "gtpPerFlowMetrics": {
+                    "$ref": "#/definitions/gtpPerFlowMetrics"
+                },
+                "gtpProtocolType": {
+                    "description": "GTP protocol",
+                    "type": "string"
+                },
+                "gtpVersion": {
+                    "description": "GTP protocol version",
+                    "type": "string"
+                },
+                "httpHeader": {
+                    "description": "HTTP request header, if the flow connects to a node referenced by HTTP",
+                    "type": "string"
+                },
+                "imei": {
+                    "description": "IMEI for the subscriber UE used in this flow, if the flow connects to a mobile device",
+                    "type": "string"
+                },
+                "imsi": {
+                    "description": "IMSI for the subscriber UE used in this flow, if the flow connects to a mobile device",
+                    "type": "string"
+                },
+                "ipProtocolType": {
+                    "description": "IP protocol type e.g., TCP, UDP, RTP...",
+                    "type": "string"
+                },
+                "ipVersion": {
+                    "description": "IP protocol version e.g., IPv4, IPv6",
+                    "type": "string"
+                },
+                "lac": {
+                    "description": "location area code",
+                    "type": "string"
+                },
+                "mcc": {
+                    "description": "mobile country code",
+                    "type": "string"
+                },
+                "mnc": {
+                    "description": "mobile network code",
+                    "type": "string"
+                },
+                "mobileFlowFieldsVersion": {
+                    "description": "version of the mobileFlowFields block",
+                    "type": "string",
+                    "enum": [
+                        "4.0"
+                    ]
+                },
+                "msisdn": {
+                    "description": "MSISDN for the subscriber UE used in this flow, as an integer, if the flow connects to a mobile device",
+                    "type": "string"
+                },
+                "otherEndpointIpAddress": {
+                    "description": "IP address for the other endpoint, as used for the flow being reported on",
+                    "type": "string"
+                },
+                "otherEndpointPort": {
+                    "description": "IP Port for the reporting entity, as used for the flow being reported on",
+                    "type": "integer"
+                },
+                "otherFunctionalRole": {
+                    "description": "Functional role of the other endpoint for the flow being reported on e.g., MME, S-GW, P-GW, PCRF...",
+                    "type": "string"
+                },
+                "rac": {
+                    "description": "routing area code",
+                    "type": "string"
+                },
+                "radioAccessTechnology": {
+                    "description": "Radio Access Technology e.g., 2G, 3G, LTE",
+                    "type": "string"
+                },
+                "reportingEndpointIpAddr": {
+                    "description": "IP address for the reporting entity, as used for the flow being reported on",
+                    "type": "string"
+                },
+                "reportingEndpointPort": {
+                    "description": "IP port for the reporting entity, as used for the flow being reported on",
+                    "type": "integer"
+                },
+                "sac": {
+                    "description": "service area code",
+                    "type": "string"
+                },
+                "samplingAlgorithm": {
+                    "description": "Integer identifier for the sampling algorithm or rule being applied in calculating the flow metrics if metrics are calculated based on a sample of packets, or 0 if no sampling is applied",
+                    "type": "integer"
+                },
+                "tac": {
+                    "description": "transport area code",
+                    "type": "string"
+                },
+                "tunnelId": {
+                    "description": "tunnel identifier",
+                    "type": "string"
+                },
+                "vlanId": {
+                    "description": "VLAN identifier used by this flow",
+                    "type": "string"
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "flowDirection",
+                "gtpPerFlowMetrics",
+                "ipProtocolType",
+                "ipVersion",
+                "mobileFlowFieldsVersion",
+                "otherEndpointIpAddress",
+                "otherEndpointPort",
+                "reportingEndpointIpAddr",
+                "reportingEndpointPort"
+            ]
+        },
+        "namedHashMap": {
+            "description": "a hashMap which is associated with and described by a name",
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "hashMap": {
+                    "$ref": "#/definitions/hashMap"
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "name",
+                "hashMap"
+            ]
+        },
+        "nicPerformance": {
+            "description": "describes the performance and errors of an identified network interface card",
+            "type": "object",
+            "properties": {
+                "administrativeState": {
+                    "description": "administrative state",
+                    "type": "string",
+                    "enum": [
+                        "inService",
+                        "outOfService"
+                    ]
+                },
+                "nicIdentifier": {
+                    "description": "nic identification",
+                    "type": "string"
+                },
+                "operationalState": {
+                    "description": "operational state",
+                    "type": "string",
+                    "enum": [
+                        "inService",
+                        "outOfService"
+                    ]
+                },
+                "receivedBroadcastPacketsAccumulated": {
+                    "description": "Cumulative count of broadcast packets received as read at the end of the measurement interval",
+                    "type": "number"
+                },
+                "receivedBroadcastPacketsDelta": {
+                    "description": "Count of broadcast packets received within the measurement interval",
+                    "type": "number"
+                },
+                "receivedDiscardedPacketsAccumulated": {
+                    "description": "Cumulative count of discarded packets received as read at the end of the measurement interval",
+                    "type": "number"
+                },
+                "receivedDiscardedPacketsDelta": {
+                    "description": "Count of discarded packets received within the measurement interval",
+                    "type": "number"
+                },
+                "receivedErrorPacketsAccumulated": {
+                    "description": "Cumulative count of error packets received as read at the end of the measurement interval",
+                    "type": "number"
+                },
+                "receivedErrorPacketsDelta": {
+                    "description": "Count of error packets received within the measurement interval",
+                    "type": "number"
+                },
+                "receivedMulticastPacketsAccumulated": {
+                    "description": "Cumulative count of multicast packets received as read at the end of the measurement interval",
+                    "type": "number"
+                },
+                "receivedMulticastPacketsDelta": {
+                    "description": "Count of multicast packets received within the measurement interval",
+                    "type": "number"
+                },
+                "receivedOctetsAccumulated": {
+                    "description": "Cumulative count of octets received as read at the end of the measurement interval",
+                    "type": "number"
+                },
+                "receivedOctetsDelta": {
+                    "description": "Count of octets received within the measurement interval",
+                    "type": "number"
+                },
+                "receivedTotalPacketsAccumulated": {
+                    "description": "Cumulative count of all packets received as read at the end of the measurement interval",
+                    "type": "number"
+                },
+                "receivedPercentDiscard": {
+                    "description": "Percentage of discarded packets received; value = (receivedDiscardedPacketsDelta / receivedTotalPacketsDelta) x 100, if denominator is nonzero, or 0, if otherwise",
+                    "type": "number"
+                },
+                "receivedPercentError": {
+                    "description": "Percentage of error packets received; value = (receivedErrorPacketsDelta / receivedTotalPacketsDelta) x 100, if denominator is nonzero, or 0, if otherwise.",
+                    "type": "number"
+                },
+                "receivedTotalPacketsDelta": {
+                    "description": "Count of all packets received within the measurement interval",
+                    "type": "number"
+                },
+                "receivedUnicastPacketsAccumulated": {
+                    "description": "Cumulative count of unicast packets received as read at the end of the measurement interval",
+                    "type": "number"
+                },
+                "receivedUnicastPacketsDelta": {
+                    "description": "Count of unicast packets received within the measurement interval",
+                    "type": "number"
+                },
+                "receivedUtilization": {
+                    "description": "Percentage of utilization received; value = (receivedOctetsDelta / (speed x (lastEpochMicrosec - startEpochMicrosec))) x 100, if denominator is nonzero, or 0, if otherwise",
+                    "type": "number"
+                },
+                "speed": {
+                    "description": "Speed configured in mbps",
+                    "type": "number"
+                },
+                "transmittedBroadcastPacketsAccumulated": {
+                    "description": "Cumulative count of broadcast packets transmitted as read at the end of the measurement interval",
+                    "type": "number"
+                },
+                "transmittedBroadcastPacketsDelta": {
+                    "description": "Count of broadcast packets transmitted within the measurement interval",
+                    "type": "number"
+                },
+                "transmittedDiscardedPacketsAccumulated": {
+                    "description": "Cumulative count of discarded packets transmitted as read at the end of the measurement interval",
+                    "type": "number"
+                },
+                "transmittedDiscardedPacketsDelta": {
+                    "description": "Count of discarded packets transmitted within the measurement interval",
+                    "type": "number"
+                },
+                "transmittedErrorPacketsAccumulated": {
+                    "description": "Cumulative count of error packets transmitted as read at the end of the measurement interval",
+                    "type": "number"
+                },
+                "transmittedErrorPacketsDelta": {
+                    "description": "Count of error packets transmitted within the measurement interval",
+                    "type": "number"
+                },
+                "transmittedMulticastPacketsAccumulated": {
+                    "description": "Cumulative count of multicast packets transmitted as read at the end of the measurement interval",
+                    "type": "number"
+                },
+                "transmittedMulticastPacketsDelta": {
+                    "description": "Count of multicast packets transmitted within the measurement interval",
+                    "type": "number"
+                },
+                "transmittedOctetsAccumulated": {
+                    "description": "Cumulative count of octets transmitted as read at the end of the measurement interval",
+                    "type": "number"
+                },
+                "transmittedOctetsDelta": {
+                    "description": "Count of octets transmitted within the measurement interval",
+                    "type": "number"
+                },
+                "transmittedTotalPacketsAccumulated": {
+                    "description": "Cumulative count of all packets transmitted as read at the end of the measurement interval",
+                    "type": "number"
+                },
+                "transmittedTotalPacketsDelta": {
+                    "description": "Count of all packets transmitted within the measurement interval",
+                    "type": "number"
+                },
+                "transmittedUnicastPacketsAccumulated": {
+                    "description": "Cumulative count of unicast packets transmitted as read at the end of the measurement interval",
+                    "type": "number"
+                },
+                "transmittedUnicastPacketsDelta": {
+                    "description": "Count of unicast packets transmitted within the measurement interval",
+                    "type": "number"
+                },
+                "transmittedPercentDiscard": {
+                    "description": "Percentage of discarded packets transmitted; value = (transmittedDiscardedPacketsDelta / transmittedTotalPacketsDelta) x 100, if denominator is nonzero, or 0, if otherwise",
+                    "type": "number"
+                },
+                "transmittedPercentError": {
+                    "description": "Percentage of error packets received; value = (transmittedErrorPacketsDelta / transmittedTotalPacketsDelta) x 100, if denominator is nonzero, or 0, if otherwise",
+                    "type": "number"
+                },
+                "transmittedUtilization": {
+                    "description": "Percentage of utilization transmitted; value = (transmittedOctetsDelta / (speed x (lastEpochMicrosec - startEpochMicrosec))) x 100, if denominator is nonzero, or 0, if otherwise.",
+                    "type": "number"
+                },
+                "valuesAreSuspect": {
+                    "description": "Indicates whether vNicPerformance values are likely inaccurate due to counter overflow or other condtions",
+                    "type": "string",
+                    "enum": [
+                        "true",
+                        "false"
+                    ]
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "nicIdentifier",
+                "valuesAreSuspect"
+            ]
+        },
+        "notificationFields": {
+            "description": "notification fields",
+            "type": "object",
+            "properties": {
+                "additionalFields": {
+                    "$ref": "#/definitions/hashMap"
+                },
+                "arrayOfNamedHashMap": {
+                    "$ref": "#/definitions/arrayOfNamedHashMap"
+                },
+                "changeContact": {
+                    "description": "identifier for a contact related to the change",
+                    "type": "string"
+                },
+                "changeIdentifier": {
+                    "description": "system or session identifier associated with the change",
+                    "type": "string"
+                },
+                "changeType": {
+                    "description": "describes what has changed for the entity",
+                    "type": "string"
+                },
+                "newState": {
+                    "description": "new state of the entity",
+                    "type": "string"
+                },
+                "oldState": {
+                    "description": "previous state of the entity",
+                    "type": "string"
+                },
+                "notificationFieldsVersion": {
+                    "description": "version of the notificationFields block",
+                    "type": "string",
+                    "enum": [
+                        "2.0"
+                    ]
+                },
+                "stateInterface": {
+                    "description": "card or port name of the entity that changed state",
+                    "type": "string"
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "changeIdentifier",
+                "changeType",
+                "notificationFieldsVersion"
+            ]
+        },
+        "otherFields": {
+            "description": "fields for events belonging to the 'other' domain of the commonEventHeader domain enumeration",
+            "type": "object",
+            "properties": {
+                "arrayOfNamedHashMap": {
+                    "$ref": "#/definitions/arrayOfNamedHashMap"
+                },
+                "hashMap": {
+                    "$ref": "#/definitions/hashMap"
+                },
+                "jsonObjects": {
+                    "$ref": "#/definitions/arrayOfJsonObject"
+                },
+                "otherFieldsVersion": {
+                    "description": "version of the otherFields block",
+                    "type": "string",
+                    "enum": [
+                        "3.0"
+                    ]
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "otherFieldsVersion"
+            ]
+        },
+        "perf3gppFields": {
+            "description": "fields for 3GPP PM format events, based on 3GPP TS 28.550, belonging to the 'perf3gpp' domain of the commonEventHeader domain enumeration",
+            "type": "object",
+            "properties": {
+                "eventAddlFields": {
+                    "$ref": "#/definitions/hashMap"
+                },
+                "measDataCollection": {
+                    "$ref": "#/definitions/measDataCollection"
+                },
+                "perf3gppFieldsVersion": {
+                    "description": "version of the perf3gppFields block",
+                    "type": "string",
+                    "enum": [
+                        "1.0",
+                        "1.0.1"
+                    ]
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "measDataCollection",
+                "perf3gppFieldsVersion"
+            ]
+        },
+        "pnfRegistrationFields": {
+            "description": "hardware device registration fields",
+            "type": "object",
+            "properties": {
+                "additionalFields": {
+                    "$ref": "#/definitions/hashMap"
+                },
+                "lastServiceDate": {
+                    "description": "TS 32.692 dateOfLastService = date of last service; e.g. 15022017",
+                    "type": "string"
+                },
+                "macAddress": {
+                    "description": "MAC address of OAM interface of the unit",
+                    "type": "string"
+                },
+                "manufactureDate": {
+                    "description": "TS 32.692 dateOfManufacture = manufacture date of the unit; 24032016",
+                    "type": "string"
+                },
+                "modelNumber": {
+                    "description": "TS 32.692 versionNumber = version of the unit from vendor; e.g. AJ02.  Maps to AAI equip-model",
+                    "type": "string"
+                },
+                "oamV4IpAddress": {
+                    "description": "IPv4 m-plane IP address to be used by the manager to contact the PNF",
+                    "type": "string",
+                    "format": "ipv4"
+                },
+                "oamV6IpAddress": {
+                    "description": "IPv6 m-plane IP address to be used by the manager to contact the PNF",
+                    "type": "string",
+                    "format": "ipv6"
+                },
+                "pnfRegistrationFieldsVersion": {
+                    "description": "version of the pnfRegistrationFields block",
+                    "type": "string",
+                    "enum": [
+                        "2.0",
+                        "2.1"
+                    ]
+                },
+                "serialNumber": {
+                    "description": "TS 32.692 serialNumber = serial number of the unit; e.g. 6061ZW3",
+                    "type": "string"
+                },
+                "softwareVersion": {
+                    "description": "TS 32.692 swName = active SW running on the unit; e.g. 5gDUv18.05.201",
+                    "type": "string"
+                },
+                "unitFamily": {
+                    "description": "TS 32.692 vendorUnitFamilyType = general type of HW unit; e.g. BBU",
+                    "type": "string"
+                },
+                "unitType": {
+                    "description": "TS 32.692 vendorUnitTypeNumber = vendor name for the unit; e.g. Airscale",
+                    "type": "string"
+                },
+                "vendorName": {
+                    "description": "TS 32.692 vendorName = name of manufacturer; e.g. Nokia. Maps to AAI equip-vendor",
+                    "type": "string"
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "pnfRegistrationFieldsVersion"
+            ]
+        },
+        "processorDimmAggregateThermalMargin": {
+            "description": "intelligent platform management interface (ipmi) processor dual inline memory module aggregate thermal margin metrics",
+            "type": "object",
+            "properties": {
+                "processorDimmAggregateThermalMarginIdentifier": {
+                    "description": "identifier for the aggregate thermal margin metrics from the processor dual inline memory module",
+                    "type": "string"
+                },
+                "thermalMargin": {
+                    "description": "the difference between the DIMM's current temperature, in celsius, and the DIMM's throttling thermal trip point",
+                    "type": "number"
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "processorDimmAggregateThermalMarginIdentifier",
+                "thermalMargin"
+            ]
+        },
+        "processStats": {
+            "description": "metrics on system processes",
+            "type": "object",
+            "properties": {
+                "forkRate": {
+                    "description": "the number of threads created since the last reboot",
+                    "type": "number"
+                },
+                "processIdentifier": {
+                    "description": "processIdentifier",
+                    "type": "string"
+                },
+                "psStateBlocked": {
+                    "description": "the number of processes in a blocked state",
+                    "type": "number"
+                },
+                "psStatePaging": {
+                    "description": "the number of processes in a paging state",
+                    "type": "number"
+                },
+                "psStateRunning": {
+                    "description": "the number of processes in a running state",
+                    "type": "number"
+                },
+                "psStateSleeping": {
+                    "description": "the number of processes in a sleeping state",
+                    "type": "number"
+                },
+                "psStateStopped": {
+                    "description": "the number of processes in a stopped state",
+                    "type": "number"
+                },
+                "psStateZombie": {
+                    "description": "the number of processes in a zombie state",
+                    "type": "number"
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "processIdentifier"
+            ]
+        },
+        "requestError": {
+            "description": "standard request error data structure",
+            "type": "object",
+            "properties": {
+                "messageId": {
+                    "description": "Unique message identifier of the format ABCnnnn where ABC is either SVC for Service Exceptions or POL for Policy Exception",
+                    "type": "string"
+                },
+                "text": {
+                    "description": "Message text, with replacement variables marked with %n, where n is an index into the list of <variables> elements, starting at 1",
+                    "type": "string"
+                },
+                "url": {
+                    "description": "Hyperlink to a detailed error resource e.g., an HTML page for browser user agents",
+                    "type": "string"
+                },
+                "variables": {
+                    "description": "List of zero or more strings that represent the contents of the variables used by the message text",
+                    "type": "string"
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "messageId",
+                "text"
+            ]
+        },
+        "sipSignalingFields": {
+            "description": "sip signaling fields",
+            "type": "object",
+            "properties": {
+                "additionalInformation": {
+                    "$ref": "#/definitions/hashMap"
+                },
+                "compressedSip": {
+                    "description": "the full SIP request/response including headers and bodies",
+                    "type": "string"
+                },
+                "correlator": {
+                    "description": "this is the same for all events on this call",
+                    "type": "string"
+                },
+                "localIpAddress": {
+                    "description": "IP address on xNF",
+                    "type": "string"
+                },
+                "localPort": {
+                    "description": "port on xNF",
+                    "type": "string"
+                },
+                "remoteIpAddress": {
+                    "description": "IP address of peer endpoint",
+                    "type": "string"
+                },
+                "remotePort": {
+                    "description": "port of peer endpoint",
+                    "type": "string"
+                },
+                "sipSignalingFieldsVersion": {
+                    "description": "version of the sipSignalingFields block",
+                    "type": "string",
+                    "enum": [
+                        "3.0"
+                    ]
+                },
+                "summarySip": {
+                    "description": "the SIP Method or Response ('INVITE', '200 OK', 'BYE', etc)",
+                    "type": "string"
+                },
+                "vendorNfNameFields": {
+                    "$ref": "#/definitions/vendorNfNameFields"
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "correlator",
+                "localIpAddress",
+                "localPort",
+                "remoteIpAddress",
+                "remotePort",
+                "sipSignalingFieldsVersion",
+                "vendorNfNameFields"
+            ]
+        },
+        "stateChangeFields": {
+            "description": "stateChange fields",
+            "type": "object",
+            "properties": {
+                "additionalFields": {
+                    "$ref": "#/definitions/hashMap"
+                },
+                "newState": {
+                    "description": "new state of the entity",
+                    "type": "string",
+                    "enum": [
+                        "inService",
+                        "maintenance",
+                        "outOfService"
+                    ]
+                },
+                "oldState": {
+                    "description": "previous state of the entity",
+                    "type": "string",
+                    "enum": [
+                        "inService",
+                        "maintenance",
+                        "outOfService"
+                    ]
+                },
+                "stateChangeFieldsVersion": {
+                    "description": "version of the stateChangeFields block",
+                    "type": "string",
+                    "enum": [
+                        "4.0"
+                    ]
+                },
+                "stateInterface": {
+                    "description": "card or port name of the entity that changed state",
+                    "type": "string"
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "newState",
+                "oldState",
+                "stateChangeFieldsVersion",
+                "stateInterface"
+            ]
+        },
+        "stndDefinedFields": {
+            "description": "stndDefined fields",
+            "type": "object",
+            "properties": {
+                "schemaReference": {
+                    "description": "a uri of a standards-defined JSON object schema; used to valide the stndDefinedFields.data property contents",
+                    "type": "string",
+                    "format": "uri"
+                },
+                "data": {
+                    "description": "a native standards-defined JSON notification",
+                    "type": "object"
+                },
+                "stndDefinedFieldsVersion": {
+                    "description": "version of stndDefinedFields block",
+                    "type": "string",
+                    "enum": [
+                        "1.0"
+                    ]
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "data",
+                "stndDefinedFieldsVersion"
+            ]
+        },
+        "syslogFields": {
+            "description": "sysLog fields",
+            "type": "object",
+            "properties": {
+                "additionalFields": {
+                    "$ref": "#/definitions/hashMap"
+                },
+                "eventSourceHost": {
+                    "description": "hostname of the device",
+                    "type": "string"
+                },
+                "eventSourceType": {
+                    "description": "type of event source; examples: other, router, switch, host, card, port, slotThreshold, portThreshold, virtualMachine, virtualNetworkFunction",
+                    "type": "string"
+                },
+                "syslogFacility": {
+                    "description": "numeric code from 0 to 23 for facility--see table in documentation",
+                    "type": "integer"
+                },
+                "syslogFieldsVersion": {
+                    "description": "version of the syslogFields block",
+                    "type": "string",
+                    "enum": [
+                        "4.0"
+                    ]
+                },
+                "syslogMsg": {
+                    "description": "syslog message",
+                    "type": "string"
+                },
+                "syslogMsgHost": {
+                    "description": "hostname parsed from non-VES syslog message",
+                    "type": "string"
+                },
+                "syslogPri": {
+                    "description": "0-192 combined severity and facility",
+                    "type": "integer"
+                },
+                "syslogProc": {
+                    "description": "identifies the application that originated the message",
+                    "type": "string"
+                },
+                "syslogProcId": {
+                    "description": "a change in the value of this field indicates a discontinuity in syslog reporting",
+                    "type": "number"
+                },
+                "syslogSData": {
+                    "description": "syslog structured data consisting of a structured data Id followed by a set of key value pairs",
+                    "type": "string"
+                },
+                "syslogSdId": {
+                    "description": "0-32 char in format name@number for example ourSDID@32473",
+                    "type": "string"
+                },
+                "syslogSev": {
+                    "description": "numerical Code for  severity derived from syslogPri as remaider of syslogPri / 8",
+                    "type": "string",
+                    "enum": [
+                        "Alert",
+                        "Critical",
+                        "Debug",
+                        "Emergency",
+                        "Error",
+                        "Info",
+                        "Notice",
+                        "Warning"
+                    ]
+                },
+                "syslogTag": {
+                    "description": "msgId indicating the type of message such as TCPOUT or TCPIN; NILVALUE should be used when no other value can be provided",
+                    "type": "string"
+                },
+                "syslogTs": {
+                    "description": "timestamp parsed from non-VES syslog message",
+                    "type": "string"
+                },
+                "syslogVer": {
+                    "description": "IANA assigned version of the syslog protocol specification - typically 1",
+                    "type": "number"
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "eventSourceType",
+                "syslogFieldsVersion",
+                "syslogMsg",
+                "syslogTag"
+            ]
+        },
+        "thresholdCrossingAlertFields": {
+            "description": "fields specific to threshold crossing alert events",
+            "type": "object",
+            "properties": {
+                "additionalFields": {
+                    "$ref": "#/definitions/hashMap"
+                },
+                "additionalParameters": {
+                    "description": "performance counters",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/counter"
+                    }
+                },
+                "alertAction": {
+                    "description": "Event action",
+                    "type": "string",
+                    "enum": [
+                        "CLEAR",
+                        "CONT",
+                        "SET"
+                    ]
+                },
+                "alertDescription": {
+                    "description": "Unique short alert description such as IF-SHUB-ERRDROP",
+                    "type": "string"
+                },
+                "alertType": {
+                    "description": "Event type",
+                    "type": "string",
+                    "enum": [
+                        "CARD-ANOMALY",
+                        "ELEMENT-ANOMALY",
+                        "INTERFACE-ANOMALY",
+                        "SERVICE-ANOMALY"
+                    ]
+                },
+                "alertValue": {
+                    "description": "Calculated API value (if applicable)",
+                    "type": "string"
+                },
+                "associatedAlertIdList": {
+                    "description": "List of eventIds associated with the event being reported",
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "collectionTimestamp": {
+                    "description": "Time when the performance collector picked up the data; with RFC 2822 compliant format: Sat, 13 Mar 2010 11:29:05 -0800",
+                    "type": "string"
+                },
+                "dataCollector": {
+                    "description": "Specific performance collector instance used",
+                    "type": "string"
+                },
+                "elementType": {
+                    "description": "type of network element - internal ATT field",
+                    "type": "string"
+                },
+                "eventSeverity": {
+                    "description": "event severity or priority",
+                    "type": "string",
+                    "enum": [
+                        "CRITICAL",
+                        "MAJOR",
+                        "MINOR",
+                        "WARNING",
+                        "NORMAL"
+                    ]
+                },
+                "eventStartTimestamp": {
+                    "description": "Time closest to when the measurement was made; with RFC 2822 compliant format: Sat, 13 Mar 2010 11:29:05 -0800",
+                    "type": "string"
+                },
+                "interfaceName": {
+                    "description": "Physical or logical port or card (if applicable)",
+                    "type": "string"
+                },
+                "networkService": {
+                    "description": "network name - internal ATT field",
+                    "type": "string"
+                },
+                "possibleRootCause": {
+                    "description": "Reserved for future use",
+                    "type": "string"
+                },
+                "thresholdCrossingFieldsVersion": {
+                    "description": "version of the thresholdCrossingAlertFields block",
+                    "type": "string",
+                    "enum": [
+                        "4.0"
+                    ]
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "additionalParameters",
+                "alertAction",
+                "alertDescription",
+                "alertType",
+                "collectionTimestamp",
+                "eventSeverity",
+                "eventStartTimestamp",
+                "thresholdCrossingFieldsVersion"
+            ]
+        },
+        "vendorNfNameFields": {
+            "description": "provides vendor, nf and nfModule identifying information",
+            "type": "object",
+            "properties": {
+                "vendorName": {
+                    "description": "network function vendor name",
+                    "type": "string"
+                },
+                "nfModuleName": {
+                    "description": "name of the nfModule generating the event",
+                    "type": "string"
+                },
+                "nfName": {
+                    "description": "name of the network function generating the event",
+                    "type": "string"
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "vendorName"
+            ]
+        },
+        "voiceQualityFields": {
+            "description": "provides statistics related to customer facing voice products",
+            "type": "object",
+            "properties": {
+                "additionalInformation": {
+                    "$ref": "#/definitions/hashMap"
+                },
+                "calleeSideCodec": {
+                    "description": "callee codec for the call",
+                    "type": "string"
+                },
+                "callerSideCodec": {
+                    "description": "caller codec for the call",
+                    "type": "string"
+                },
+                "correlator": {
+                    "description": "this is the same for all events on this call",
+                    "type": "string"
+                },
+                "endOfCallVqmSummaries": {
+                    "$ref": "#/definitions/endOfCallVqmSummaries"
+                },
+                "phoneNumber": {
+                    "description": "phone number associated with the correlator",
+                    "type": "string"
+                },
+                "midCallRtcp": {
+                    "description": "Base64 encoding of the binary RTCP data excluding Eth/IP/UDP headers",
+                    "type": "string"
+                },
+                "vendorNfNameFields": {
+                    "$ref": "#/definitions/vendorNfNameFields"
+                },
+                "voiceQualityFieldsVersion": {
+                    "description": "version of the voiceQualityFields block",
+                    "type": "string",
+                    "enum": [
+                        "4.0"
+                    ]
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "calleeSideCodec",
+                "callerSideCodec",
+                "correlator",
+                "midCallRtcp",
+                "vendorNfNameFields",
+                "voiceQualityFieldsVersion"
+            ]
+        }
+    }
+}
\ No newline at end of file
index 1a56ac8..fde8c37 100644 (file)
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright 2019 highstreet technologies and others
+# Copyright 2021 highstreet technologies and others
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # limitations under the License.
 #
 
-#NEXUS_DOCKER_REPO=nexus3.onap.org:10001/
-CCSDK_DOCKER_IMAGE_VERSION=latest
-HT_DOCKER_REPO=
-#HT_DOCKER_IMAGE_NAME=onap/sdnc-image
-HT_DOCKER_IMAGE_NAME=hightec/sdnc-image
-#HT_DOCKER_IMAGE_TAG=1.8.0-STAGING-20200301T124848Z
-HT_DOCKER_IMAGE_TAG=latest
-PORTPREFIX=
-ENABLE_ODL_CLUSTER=false
-REPLICAS=0
-ODL_HOME=/opt/opendaylight
-LOCAL_SDNR_MOUNT=/var/tmp/
-#elasticsearch:
-ES_VERSION=6.8.5
-VES_DOCKER_REPO=
-VES_TEST_COLLECTOR_IMAGE_NAME=hightec/ves-testcollector
-VES_TEST_COLLECTOR_IMAGE_TAG=latest
-LOCAL_VES_MOUNT=/var/tmp/
-EXT_VES_PORT=3000
-VES_API=5
-VES_FORMAT_FILE=CommonEventFormat_28.4.1.json
-
-NETCONF_SERVER_SIMULATOR_IMAGE_NAME=hightec/netconfserversimulator
-NETCONF_SERVER_SIMULATOR_IMAGE_TAG=4.2.2
-SIM_MODEL=equipment
-INT_SIM_PORT=2230
-EXT_SIM_PORT=2230
-EXT_SIM_SSH_PORT=8000
-
-SIM_MODEL2=DVM_MWCore12_BasicAir
-INT_SIM_PORT2=2231
-EXT_SIM_PORT2=2231
-EXT_SIM_SSH_PORT2=8001
-
-NTS_DOCKER_REPO=
-NTS_IMAGE_NAME=hightec/ntsim_manager
-NTS_IMAGE_TAG=0.1.4
-NTS_SIM_PORT=2240
-EXT_PORT=8300
-NTS_IP=172.28.0.1
-NETCONF_BASE=50000
-DOCKER_ENGINE_VERSION=1.39
-MODELS_IMAGE=hightec/ntsim_oran
-MODELS_TAG=0.1.4
+COMPOSE_PROJECT_NAME=smo
 
+# Network settings
+NETWORK_NAME=integration
+
+IPv4_NETWORK_SUBNET=172.40.0.0/16
+IPv4_GATEWAY=172.40.0.1
+
+# Please update /etc/docker/daemon.json accordingly
+# https://docs.docker.com/config/daemon/ipv6/
+IPv6_NETWORK_SUBNET=2001:db8:1:1::/64
+IPv6_GATEWAY=2001:db8:1:1::1
+
+# SDN-R Database
+SDNRDB_IMAGE=docker.elastic.co/elasticsearch/elasticsearch-oss:7.9.3
+IPv4_SDNRDB=172.40.0.30
+IPv6_SDNRDB=2001:db8:1:1::30
+
+# SDN Controller
+SDNC_IMAGE=nexus3.onap.org:10001/onap/sdnc-image:2.1.3
+IPv4_SDNC=172.40.0.21
+IPv6_SDNC=2001:db8:1:1::21
+ODL_CERT_DIR=/opt/opendaylight/current/certs
+ODL_ADMIN_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
+
+# dependent components
+## ZooKeeper
+ZOOKEEPER_IMAGE=nexus3.onap.org:10001/onap/dmaap/zookeeper:6.0.3
+IPv4_ZOOKEEPER=172.40.0.60
+IPv6_ZOOKEEPER=2001:db8:1:1::60
+
+## Kafka
+KAFKA_IMAGE=nexus3.onap.org:10001/onap/dmaap/kafka111:1.0.4
+IPv4_KAFKA=172.40.0.70
+IPv6_KAFKA=2001:db8:1:1::70
+
+## DMaaP
+DMAAP_IMAGE=nexus3.onap.org:10001/onap/dmaap/dmaap-mr:1.1.18
+IPv4_DMAAP=172.40.0.80
+IPv6_DMAAP=2001:db8:1:1::80
+
+## VES Collector
+VESCOLLECTOR_IMAGE=nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:1.9.0
+IPv4_VESCOLLECTOR=172.40.0.90
+IPv6_VESCOLLECTOR=2001:db8:1:1::90
index 92fda8d..b333033 100644 (file)
@@ -1,6 +1,6 @@
 # Service Management and Orchestration (SMO)
 
-With respect to OAM the SMO implements the O1-interface provider. According to the O-RAN OAM Architecture and the O-RAN OAM Interface Specification, the SMO has a NetConf Client for configuration and HTTP/REST/VES Server for receiving all kind of events in a VES format. 
+With respect to OAM the SMO implements the O1-interface provider. According to the O-RAN OAM Architecture and the O-RAN OAM Interface Specification, the SMO has a NetConf Client for configuration and HTTP/REST/VES Server for receiving all kind of events in a VES format.
 
 The setup contains an OpenDaylight based NetConf client and a VES Test Collector.
 
@@ -11,24 +11,18 @@ This docker-compose file starts a pre-configured, self-contained SDN-R solution
   * **SDN-R** single node instance
 
     ... representing the NetConf consumer on the Service Management and Orchstration framework (SMO) for the O1 interface.
-    ODL-Neon/CCSDK/SDNC-ElAlto
+    based on ODL-Sodium/ONAP-Guilin
 
-  * **VES test collector**
+  * **VES collector**
 
     ... representing the VES (REST) provider at SMO for all kind of events.
-    DCAE-ElAlto/VES 5.0
 
-  * **NTSDevice simulator**
-
-    ... represents the NetConf Provider of an O-RAN component.
-
-  * **NetconfServerSimulator** 
-
-    ... another simulator
+  * **DMaaP**
+    ... representing SMO DMaaP component, includes message-router
 
 ## Prerequisites
 
-docker-compose file version 3.3 is used and tested with
+docker-compose file version 2.2 is used and tested with
 
   * Ubuntu 18.04 LTS
   * Docker version 19.03.x
@@ -42,36 +36,34 @@ cat /etc/os-release
 docker --version
 docker-compose --version
 git --version
-cd 
-mkdir git
-cd git
-git clone  https://git-highstreet-technologies.com/highstreet/CICD_environment.git
-cd CICD_environment/docker/solution/o-ran-dev
+cd ~
+git clone https://gerrit.o-ran-sc.org:29418/oam.git
+cd ~/oam/solution/integration/smo
 ```
 
 ## Usage
 
-### Bring Up Solution 
+### Bring Up Solution
 
   * Check (adjust if required) environment variables
 
 ```
-cd ~/git/CICD_environment/docker/solution/o-ran-dev
+cd ~/oam/solution/integration/smo
 nano .env
 ```
-  
-  * startup solution 
+
+  * startup solution
 
 ```
-cd ~/git/CICD_environment/docker/solution/o-ran-dev
+cd ~/oam/solution/integration/smo
 docker-compose up -d
 ```
 
 ### Log files and karaf console
 
-  * ODL karaf.logs can be found on docker host
+  * ODL karaf.logs
 ```
-tail -f /var/tmp/sdnr/logs/karaf.log
+docker exec -it sdnr  tail -f /opt/opendaylight/data/log/karaf.log
 ```
 
   * karaf console access (karaf:karaf)
@@ -80,10 +72,10 @@ tail -f /var/tmp/sdnr/logs/karaf.log
 ssh karaf@localhost -p 8101
 ```
 
-  * ves-testcollector logs
+  * vescollector logs
 
 ```
-  tail -f /var/tmp/ves-v5/logs/evel-output.log
+   docker logs -f vescollector
 ```
 
 ### Customizing Solution
@@ -98,162 +90,21 @@ ssh karaf@localhost -p 8101
   * login into SDN-R
     http://<host_ip>:8181/odlux/index.html
     User:admin
-    Password:admin
-
-#### Connectivity NETCONF interface to simulator of type 'NTSdevice'
-
-  * Mount simulated network element (default parameters if not changed in '.env'
-    * Open 'Connect'
-    * Required Network Elements: add ('+' sign)
-    * Name: NTSDevice
-    * IP: <host_ip>
-    * Port: 2240
-    * User: netconf
-    * Password: netconf
-    
-  Network Element 'NTSDevice' Should be connected
-
-#### Connectivity NETCONF interface to simulator of type 'netconfserversimulator'
-
-  * Mount simulated network element (default parameters if not changed in '.env'
-    * Open 'Connect'
-    * Required Network Elements: add ('+' sign)
-    * Name: SIMTEST
-    * IP: <host_ip>
-    * Port: 2230
-    * User: admin
-    * Password: admin
-
-  Network Element 'SIMTEST' Should be connected
-
-
-#### Connectivity SDN-R to VES-testcollector 
-  * verify VES-testcollector on host terminal
-  ```
-  tail -f /var/tmp/ves-v5/logs/evel-output.log
-  ```
-  
-  * heart beat events should be visible
-    
-  ```
-  Authenticated OK
-==== Wed Aug 14 12:28:51 2019 =================================================
-Valid body decoded & checked against schema OK:
-{
-    "event": {
-        "commonEventHeader": {
-            "domain": "heartbeat",
-            "eventId": "testpattern-ab305d54-85b4-a31b-7db2-fb6b9e546015",
-            "eventName": "heartbeat_Controller",
-            "eventType": "Controller",
-            "lastEpochMicrosec": 11087481660,
-            "priority": "Low",
-            "reportingEntityId": "",
-            "reportingEntityName": "bf0c1c6deac1",
-            "sequence": 7,
-            "sourceId": "",
-            "sourceName": "bf0c1c6deac1",
-            "startEpochMicrosec": 11087481660,
-            "version": 3.0
-        },
-        "heartbeatFields": {
-            "additionalFields": [
-                {
-                    "name": "eventTime",
-                    "value": "2019-08-14T12:28:51.5Z"
-                }
-            ],
-            "heartbeatFieldsVersion": 1.0,
-            "heartbeatInterval": 30
-        }
-    }
-}172.20.0.3 - - [14/Aug/2019 12:28:51] "POST /eventListener/v5 HTTP/1.1" 202 0
-
-  ```
-#### Verify e2e event flow from 'NTSDevice' to VES-testcollector
-
-NTSDevice simulator raise new alarms every 60 seconds. Time interval can be configured within .env file
-This alarm shoulld be visible within the ves testcollector log file
-
-
-#### Verify e2e event flow from 'netconfserversimulator' to VES-testcollector
-
-Raise test event via device simulator and check VES log file
-  
-* login to simulator with admin:admin
-
-  ```
-  ssh admin@<host_IP> -p 8000
-  
-  ```
-  * type 'n2'  (or 'n1') for m and clear event
-  
-```
-==== Wed Aug 14 12:36:34 2019 =================================================
-Valid body decoded & checked against schema OK:
-{
-    "event": {
-        "commonEventHeader": {
-            "domain": "fault",
-            "eventId": "SIMTEST_LP-MWPS-RADIO_signalIsLostMajor",
-            "eventName": "fault_Microwave_Radio_Alarms_signalIsLostMajor",
-            "eventType": "Microwave_Radio_Alarms",
-            "lastEpochMicrosec": 1565786194600000,
-            "priority": "High",
-            "reportingEntityId": "",
-            "reportingEntityName": "bf0c1c6deac1",
-            "sequence": 23,
-            "sourceId": "",
-            "sourceName": "SIMTEST",
-            "startEpochMicrosec": 1565786194600000,
-            "version": 3.0
-        },
-        "faultFields": {
-            "alarmAdditionalInformation": [
-                {
-                    "name": "eventTime",
-                    "value": "2019-08-14T12:36:34.6Z"
-                },
-                {
-                    "name": "equipType",
-                    "value": "unknown"
-                },
-                {
-                    "name": "vendor",
-                    "value": "unknown"
-                },
-                {
-                    "name": "model",
-                    "value": "unknown"
-                }
-            ],
-            "alarmCondition": "signalIsLostMajor",
-            "alarmInterfaceA": "LP-MWPS-RADIO",
-            "eventSeverity": "MAJOR",
-            "eventSourceType": "Microwave_Radio",
-            "faultFieldsVersion": 2.0,
-            "specificProblem": "signalIsLostMajor",
-            "vfStatus": "Active"
-        }
-    }
-}172.20.0.3 - - [14/Aug/2019 12:36:34] "POST /eventListener/v5 HTTP/1.1" 202 0
-```
-  * type '~.' to exit ssh
-  * 
-  
+    Password:Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
+
+
 ### Terminate solution
 
 To stop all container:
 
 ```
-cd ~/git/CICD_environment/docker/solution/o-ran-dev
+cd ~/oam/solution/integration/smo
 docker-compose down
 ```
 
-re-start solution at any point in time with 
+re-start solution at any point in time with
 ```
-cd ~/git/CICD_environment/docker/solution/o-ran-dev
+cd ~/oam/solution/integration/smo
 docker-compose up -d
 ```
 
@@ -263,16 +114,8 @@ docker-compose up -d
 !!! be careful if other stopped containers are on the same system
 ```
 docker system prune -a -f
-sudo rm -rf /var/tmp/ves-v5/
+
 
 ```
 ### Troubleshooting
 
-Issue: no VES events, no heartbeat events
-  * For some reasons SDN-R overwrites DCAE settings in devicemanager.properties.
-
-```
-sudo docker-compose down
-git checkout -- devicemanager.properties
-sudo docker-compose up -d
-```
\ No newline at end of file
diff --git a/solution/integration/smo/dmaap/MsgRtrApi.properties b/solution/integration/smo/dmaap/MsgRtrApi.properties
new file mode 100644 (file)
index 0000000..33ff0fd
--- /dev/null
@@ -0,0 +1,169 @@
+###############################################################################
+#  ============LICENSE_START=======================================================
+#  org.onap.dmaap
+#  ================================================================================
+#  Copyright � 2017 AT&T Intellectual Property. All rights reserved.
+#  ================================================================================
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#  ============LICENSE_END=========================================================
+#
+#  ECOMP is a trademark and service mark of AT&T Intellectual Property.
+#
+###############################################################################
+###############################################################################
+##
+## Cambria API Server config
+##
+##     - Default values are shown as commented settings.
+##
+
+###############################################################################
+##
+## HTTP service
+##
+##             - 3904 is standard as of 7/29/14.
+#
+## Zookeeper Connection
+##
+##     Both Cambria and Kafka make use of Zookeeper.
+##
+#config.zk.servers=172.18.1.1
+config.zk.servers=zookeeper
+#config.zk.root=/fe3c/cambria/config
+
+
+###############################################################################
+##
+## Kafka Connection
+##
+##     Items below are passed through to Kafka's producer and consumer
+##     configurations (after removing "kafka.")
+##     if you want to change request.required.acks it can take this one value
+#kafka.metadata.broker.list=localhost:9092,localhost:9093
+kafka.metadata.broker.list=kafka:9092
+##kafka.request.required.acks=-1
+#kafka.client.zookeeper=${config.zk.servers}
+consumer.timeout.ms=100
+zookeeper.connection.timeout.ms=6000
+zookeeper.session.timeout.ms=20000
+zookeeper.sync.time.ms=2000
+auto.commit.interval.ms=1000
+fetch.message.max.bytes =1000000
+auto.commit.enable=false
+
+#(backoff*retries > zksessiontimeout)
+kafka.rebalance.backoff.ms=10000
+kafka.rebalance.max.retries=6
+
+
+###############################################################################
+##
+##     Secured Config
+##
+##     Some data stored in the config system is sensitive -- API keys and secrets,
+##     for example. to protect it, we use an encryption layer for this section
+##     of the config.
+##
+## The key is a base64 encode AES key. This must be created/configured for
+## each installation.
+#cambria.secureConfig.key=
+##
+## The initialization vector is a 16 byte value specific to the secured store.
+## This must be created/configured for each installation.
+#cambria.secureConfig.iv=
+
+## Southfield Sandbox
+cambria.secureConfig.key=b/7ouTn9FfEw2PQwL0ov/Q==
+cambria.secureConfig.iv=wR9xP5k5vbz/xD0LmtqQLw==
+authentication.adminSecret=fe3cCompound
+#cambria.secureConfig.key[pc569h]=YT3XPyxEmKCTLI2NK+Sjbw==
+#cambria.secureConfig.iv[pc569h]=rMm2jhR3yVnU+u2V9Ugu3Q==
+
+
+###############################################################################
+##
+## Consumer Caching
+##
+##     Kafka expects live connections from the consumer to the broker, which
+##     obviously doesn't work over connectionless HTTP requests. The Cambria
+##     server proxies HTTP requests into Kafka consumer sessions that are kept
+##     around for later re-use. Not doing so is costly for setup per request,
+##     which would substantially impact a high volume consumer's performance.
+##
+##     This complicates Cambria server failover, because we often need server
+##     A to close its connection before server B brings up the replacement.
+##
+
+## The consumer cache is normally enabled.
+#cambria.consumer.cache.enabled=true
+
+## Cached consumers are cleaned up after a period of disuse. The server inspects
+## consumers every sweepFreqSeconds and will clean up any connections that are
+## dormant for touchFreqMs.
+#cambria.consumer.cache.sweepFreqSeconds=15
+cambria.consumer.cache.touchFreqMs=120000
+##stickforallconsumerrequests=false
+## The cache is managed through ZK. The default value for the ZK connection
+## string is the same as config.zk.servers.
+#cambria.consumer.cache.zkConnect=${config.zk.servers}
+
+##
+## Shared cache information is associated with this node's name. The default
+## name is the hostname plus the HTTP service port this host runs on. (The
+## hostname is determined via InetAddress.getLocalHost ().getCanonicalHostName(),
+## which is not always adequate.) You can set this value explicitly here.
+##
+#cambria.api.node.identifier=<use-something-unique-to-this-instance>
+
+#cambria.rateLimit.maxEmptyPollsPerMinute=30
+#cambria.rateLimitActual.delay.ms=10
+
+###############################################################################
+##
+## Metrics Reporting
+##
+##     This server can report its metrics periodically on a topic.
+##
+#metrics.send.cambria.enabled=true
+#metrics.send.cambria.topic=cambria.apinode.metrics                                  #msgrtr.apinode.metrics.dmaap
+#metrics.send.cambria.sendEverySeconds=60
+
+cambria.consumer.cache.zkBasePath=/fe3c/cambria/consumerCache
+consumer.timeout=17
+
+##############################################################################
+#100mb
+maxcontentlength=10000
+
+
+##############################################################################
+#AAF Properties
+msgRtr.namespace.aaf=org.onap.dmaap.mr.topic
+msgRtr.topicfactory.aaf=org.onap.dmaap.mr.topicFactory|:org.onap.dmaap.mr.topic:
+enforced.topic.name.AAF=org.onap.dmaap.mr
+forceAAF=false
+transidUEBtopicreqd=false
+defaultNSforUEB=org.onap.dmaap.mr
+##############################################################################
+#Mirror Maker Agent
+msgRtr.mirrormakeradmin.aaf=org.onap.dmaap.mr.mirrormaker|*|admin
+msgRtr.mirrormakeruser.aaf=org.onap.dmaap.mr.mirrormaker|*|user
+msgRtr.mirrormakeruser.aaf.create=org.onap.dmaap.mr.topicFactory|:org.onap.dmaap.mr.topic:
+msgRtr.mirrormaker.timeout=15000
+msgRtr.mirrormaker.topic=org.onap.dmaap.mr.mmagent
+msgRtr.mirrormaker.consumergroup=mmagentserver
+msgRtr.mirrormaker.consumerid=1
+
+kafka.max.poll.interval.ms=300000
+kafka.heartbeat.interval.ms=60000
+kafka.session.timeout.ms=240000
+kafka.max.poll.records=1000
\ No newline at end of file
diff --git a/solution/integration/smo/dmaap/cadi.properties b/solution/integration/smo/dmaap/cadi.properties
new file mode 100644 (file)
index 0000000..dca56c8
--- /dev/null
@@ -0,0 +1,19 @@
+aaf_locate_url=https://aaf-locate.{{ include "common.namespace" . }}:8095
+aaf_url=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.service:2.1
+aaf_env=DEV
+aaf_lur=org.onap.aaf.cadi.aaf.v2_0.AAFLurPerm
+
+cadi_truststore=/appl/dmaapMR1/etc/org.onap.dmaap.mr.trust.jks
+cadi_truststore_password=enc:mN6GiIzFQxKGDzAXDOs7b4j8DdIX02QrZ9QOWNRpxV3rD6whPCfizSMZkJwxi_FJ
+
+cadi_keyfile=/appl/dmaapMR1/etc/org.onap.dmaap.mr.keyfile
+
+cadi_alias=dmaapmr@mr.dmaap.onap.org
+cadi_keystore=/appl/dmaapMR1/etc/org.onap.dmaap.mr.p12
+cadi_keystore_password=enc:_JJT2gAEkRzXla5xfDIHal8pIoIB5iIos3USvZQT6sL-l14LpI5fRFR_QIGUCh5W
+cadi_x509_issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_9, OU=OSAAF, O=ONAP, C=US
+
+cadi_loglevel=INFO
+cadi_protocols=TLSv1.1,TLSv1.2
+cadi_latitude=37.78187
+cadi_longitude=-122.26147
\ No newline at end of file
diff --git a/solution/integration/smo/dmaap/logback.xml b/solution/integration/smo/dmaap/logback.xml
new file mode 100644 (file)
index 0000000..f02a2db
--- /dev/null
@@ -0,0 +1,208 @@
+<!--
+     ============LICENSE_START=======================================================
+     Copyright © 2019 AT&T Intellectual Property. All rights reserved.
+     ================================================================================
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+           http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+     ============LICENSE_END=========================================================
+ -->
+
+<configuration scan="true" scanPeriod="3 seconds" debug="false">
+  <contextName>${module.ajsc.namespace.name}</contextName>
+  <jmxConfigurator />
+  <property name="logDirectory" value="${AJSC_HOME}/log" />
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <filter class="ch.qos.logback.classic.filter.LevelFilter">
+      <level>ERROR</level>
+      <onMatch>ACCEPT</onMatch>
+      <onMismatch>DENY</onMismatch>
+    </filter>
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n
+      </pattern>
+    </encoder>
+  </appender>
+
+  <appender name="INFO" class="ch.qos.logback.core.ConsoleAppender">
+    <filter class="ch.qos.logback.classic.filter.LevelFilter">
+      <level>INFO</level>
+      <onMatch>ACCEPT</onMatch>
+      <onMismatch>DENY</onMismatch>
+    </filter>
+  </appender>
+
+  <appender name="DEBUG" class="ch.qos.logback.core.ConsoleAppender">
+
+    <encoder>
+      <pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern>
+    </encoder>
+  </appender>
+
+  <appender name="ERROR" class="ch.qos.logback.core.ConsoleAppender"> class="ch.qos.logback.core.ConsoleAppender">
+    <filter class="ch.qos.logback.classic.filter.LevelFilter">
+      <level>ERROR</level>
+      <onMatch>ACCEPT</onMatch>
+      <onMismatch>DENY</onMismatch>
+    </filter>
+    <encoder>
+      <pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern>
+    </encoder>
+  </appender>
+
+
+  <!-- Msgrtr related loggers -->
+  <logger name="org.onap.dmaap.dmf.mr.service" level="INFO" />
+  <logger name="org.onap.dmaap.dmf.mr.service.impl" level="INFO" />
+
+  <logger name="org.onap.dmaap.dmf.mr.resources" level="INFO" />
+  <logger name="org.onap.dmaap.dmf.mr.resources.streamReaders" level="INFO" />
+
+  <logger name="org.onap.dmaap.dmf.mr.backends" level="INFO" />
+  <logger name="org.onap.dmaap.dmf.mr.backends.kafka" level="INFO" />
+  <logger name="org.onap.dmaap.dmf.mr.backends.memory" level="INFO" />
+
+  <logger name="org.onap.dmaap.dmf.mr.beans" level="INFO" />
+
+  <logger name="org.onap.dmaap.dmf.mr.constants" level="INFO" />
+
+  <logger name="org.onap.dmaap.dmf.mr.exception" level="INFO" />
+
+  <logger name="org.onap.dmaap.dmf.mr.listener" level="INFO" />
+
+  <logger name="org.onap.dmaap.dmf.mr.metabroker" level="INFO" />
+
+  <logger name="org.onap.dmaap.dmf.mr.metrics.publisher" level="INFO" />
+  <logger name="org.onap.dmaap.dmf.mr.metrics.publisher.impl" level="INFO" />
+
+
+
+  <logger name="org.onap.dmaap.dmf.mr.security" level="INFO" />
+  <logger name="org.onap.dmaap.dmf.mr.security.impl" level="INFO" />
+
+  <logger name="org.onap.dmaap.dmf.mr.transaction" level="INFO" />
+  <logger name="com.att.dmf.mr.transaction.impl" level="INFO" />
+
+  <logger name="org.onap.dmaap.dmf.mr.metabroker" level="INFO" />
+  <logger name="org.onap.dmaap.dmf.mr.metabroker" level="INFO" />
+
+  <logger name="org.onap.dmaap.dmf.mr.utils" level="INFO" />
+  <logger name="org.onap.dmaap.mr.filter" level="INFO" />
+
+  <!--<logger name="com.att.nsa.cambria.*" level="INFO" />-->
+
+  <!-- Msgrtr loggers in ajsc -->
+  <logger name="org.onap.dmaap.service" level="INFO" />
+  <logger name="org.onap.dmaap" level="INFO" />
+
+
+  <!-- Spring related loggers -->
+  <logger name="org.springframework" level="WARN" additivity="false"/>
+  <logger name="org.springframework.beans" level="WARN" additivity="false"/>
+  <logger name="org.springframework.web" level="WARN" additivity="false" />
+  <logger name="com.blog.spring.jms" level="WARN" additivity="false" />
+
+  <!-- AJSC Services (bootstrap services) -->
+  <logger name="ajsc" level="WARN" additivity="false"/>
+  <logger name="ajsc.RouteMgmtService" level="INFO" additivity="false"/>
+  <logger name="ajsc.ComputeService" level="INFO" additivity="false" />
+  <logger name="ajsc.VandelayService" level="WARN" additivity="false"/>
+  <logger name="ajsc.FilePersistenceService" level="WARN" additivity="false"/>
+  <logger name="ajsc.UserDefinedJarService" level="WARN" additivity="false" />
+  <logger name="ajsc.UserDefinedBeansDefService" level="WARN" additivity="false" />
+  <logger name="ajsc.LoggingConfigurationService" level="WARN" additivity="false" />
+
+  <!-- AJSC related loggers (DME2 Registration, csi logging, restlet, servlet
+    logging) -->
+  <logger name="ajsc.utils" level="WARN" additivity="false"/>
+  <logger name="ajsc.utils.DME2Helper" level="INFO" additivity="false" />
+  <logger name="ajsc.filters" level="DEBUG" additivity="false" />
+  <logger name="ajsc.beans.interceptors" level="DEBUG" additivity="false" />
+  <logger name="ajsc.restlet" level="DEBUG" additivity="false" />
+  <logger name="ajsc.servlet" level="DEBUG" additivity="false" />
+  <logger name="com.att" level="WARN" additivity="false" />
+  <logger name="com.att.ajsc.csi.logging" level="WARN" additivity="false" />
+  <logger name="com.att.ajsc.filemonitor" level="WARN" additivity="false"/>
+
+  <logger name="com.att.nsa.dmaap.util" level="INFO" additivity="false"/>
+  <logger name="com.att.cadi.filter" level="INFO" additivity="false" />
+
+
+  <!-- Other Loggers that may help troubleshoot -->
+  <logger name="net.sf" level="WARN" additivity="false" />
+  <logger name="org.apache.commons.httpclient" level="WARN" additivity="false"/>
+  <logger name="org.apache.commons" level="WARN" additivity="false" />
+  <logger name="org.apache.coyote" level="WARN" additivity="false"/>
+  <logger name="org.apache.jasper" level="WARN" additivity="false"/>
+
+  <!-- Camel Related Loggers (including restlet/servlet/jaxrs/cxf logging.
+    May aid in troubleshooting) -->
+  <logger name="org.apache.camel" level="WARN" additivity="false" />
+  <logger name="org.apache.cxf" level="WARN" additivity="false" />
+  <logger name="org.apache.camel.processor.interceptor" level="WARN" additivity="false"/>
+  <logger name="org.apache.cxf.jaxrs.interceptor" level="WARN" additivity="false" />
+  <logger name="org.apache.cxf.service" level="WARN" additivity="false" />
+  <logger name="org.restlet" level="DEBUG" additivity="false" />
+  <logger name="org.apache.camel.component.restlet" level="DEBUG" additivity="false" />
+  <logger name="org.apache.kafka" level="DEBUG" additivity="false" />
+  <logger name="org.apache.zookeeper" level="INFO" additivity="false" />
+  <logger name="org.I0Itec.zkclient" level="DEBUG" additivity="false" />
+
+  <!-- logback internals logging -->
+  <logger name="ch.qos.logback.classic" level="INFO" additivity="false"/>
+  <logger name="ch.qos.logback.core" level="INFO" additivity="false" />
+
+  <!-- logback jms appenders & loggers definition starts here -->
+  <!-- logback jms appenders & loggers definition starts here -->
+  <appender name="auditLogs" class="ch.qos.logback.core.ConsoleAppender">
+    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+    </filter>
+    <encoder>
+      <pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern>
+    </encoder>
+  </appender>
+  <appender name="perfLogs" class="ch.qos.logback.core.ConsoleAppender">
+    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+    </filter>
+    <encoder>
+      <pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern>
+    </encoder>
+  </appender>
+  <appender name="ASYNC-audit" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>1000</queueSize>
+    <discardingThreshold>0</discardingThreshold>
+    <appender-ref ref="Audit-Record-Queue" />
+  </appender>
+
+  <logger name="AuditRecord" level="INFO" additivity="FALSE">
+    <appender-ref ref="STDOUT" />
+  </logger>
+  <logger name="AuditRecord_DirectCall" level="INFO" additivity="FALSE">
+    <appender-ref ref="STDOUT" />
+  </logger>
+  <appender name="ASYNC-perf" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>1000</queueSize>
+    <discardingThreshold>0</discardingThreshold>
+    <appender-ref ref="Performance-Tracker-Queue" />
+  </appender>
+  <logger name="PerfTrackerRecord" level="INFO" additivity="FALSE">
+    <appender-ref ref="ASYNC-perf" />
+    <appender-ref ref="perfLogs" />
+  </logger>
+  <!-- logback jms appenders & loggers definition ends here -->
+
+  <root level="DEBUG">
+    <appender-ref ref="DEBUG" />
+    <appender-ref ref="ERROR" />
+    <appender-ref ref="INFO" />
+    <appender-ref ref="STDOUT" />
+  </root>
+
+</configuration>
index 9d7cdb8..4e059ab 100755 (executable)
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright 2019 highstreet technologies and others
+# Copyright 2021 highstreet technologies and others
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-version: "3.3"
-
+version: "2.2"
 services:
+  sdnrdb:
+    image: ${SDNRDB_IMAGE}
+    container_name: sdnrdb
+    environment:
+      - discovery.type=single-node
+    networks:
+      integration:
+        ipv4_address: ${IPv4_SDNRDB}
+        ipv6_address: ${IPv6_SDNRDB}
+
   sdnr:
-    image: ${NEXUS_DOCKER_REPO}${HT_DOCKER_IMAGE_NAME}:${HT_DOCKER_IMAGE_TAG}
+    image: ${SDNC_IMAGE}
     container_name: sdnr
-    #ports:
-    #  - "${PORTPREFIX}8181:8181"
+    ports:
+      - "8181:8181"
+      - "8101:8101"
     environment:
       - SDNC_CONFIG_DIR=/opt/onap/ccsdk/data/properties
-      - ENABLE_ODL_CLUSTER=${ENABLE_ODL_CLUSTER}
-      - CCSDK_REPLICAS=${REPLICAS}
+      - ODL_CERT_DIR=${ODL_CERT_DIR}
+      - ENABLE_ODL_CLUSTER=false
+      - SDNC_REPLICAS=0
+      - CCSDK_REPLICAS=0
       - DOMAIN=""
       - SDNRWT=true
-      - SDNRONLY=true
       - SDNRINIT=true
+      - SDNRONLY=true
       - SDNRDBURL=http://sdnrdb:9200
+      - A1_ADAPTER_NORTHBOUND=false
+      - ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD}
+      - JAVA_OPTS=-Xms256m -Xmx2g
     volumes:
-    #- ${LOCAL_SDNR_MOUNT}/sdnr-frankfurt/logs:${ODL_HOME}/data/log
-     - type: bind
-       source: ./resources/startODL.oom.sh
-       target: /opt/onap/sdnc/bin/startODL.sh 
-     - type: bind 
-       source: ./resources/devicemanager.properties
-       target: ${ODL_HOME}/etc/devicemanager.properties   
-     - type: bind
-       source: ./resources/org.ops4j.pax.logging.cfg
-       target: ${ODL_HOME}/etc/org.ops4j.pax.logging.cfg
-     - type: bind
-       source: ./yang
-       target: $ODL_HOME/cache/schema
+      - ./sdnr/mountpoint-registrar.properties:/opt/opendaylight/etc/mountpoint-registrar.properties
+      - ./sdnr/certs/certs.properties:${ODL_CERT_DIR}/certs.properties
+      - ./sdnr/certs/keys0.zip:${ODL_CERT_DIR}/keys0.zip
     networks:
-      - sb-net
-            ipv4_address: 172.28.1.2
+      integration:
+        ipv4_address: ${IPv4_SDNC}
+        ipv6_address: ${IPv6_SDNC}
     logging:
       driver:   "json-file"
       options:
         max-size: "30m"
         max-file: "5"
-  sdnrdb:
-    image: docker.elastic.co/elasticsearch/elasticsearch-oss:${ES_VERSION}
-    container_name: sdnrdb
-    #ports:
-    #  - "${PORTPREFIX}9200:9200"
+  zookeeper:
+    image: ${ZOOKEEPER_IMAGE}
+    container_name: zookeeper
+    ports:
+      - "2181:2181"
     environment:
-      - discovery.type=single-node
+      ZOOKEEPER_REPLICAS: 1
+      ZOOKEEPER_TICK_TIME: 2000
+      ZOOKEEPER_SYNC_LIMIT: 5
+      ZOOKEEPER_INIT_LIMIT: 10
+      ZOOKEEPER_MAX_CLIENT_CNXNS: 200
+      ZOOKEEPER_AUTOPURGE_SNAP_RETAIN_COUNT: 3
+      ZOOKEEPER_AUTOPURGE_PURGE_INTERVAL: 24
+      ZOOKEEPER_CLIENT_PORT: 2181
+      KAFKA_OPTS: -Djava.security.auth.login.config=/etc/zookeeper/secrets/jaas/zk_server_jaas.conf -Dzookeeper.kerberos.removeHostFromPrincipal=true -Dzookeeper.kerberos.removeRealmFromPrincipal=true -Dzookeeper.authProvider.1=org.apache.zookeeper.server.auth.SASLAuthenticationProvider -Dzookeeper.requireClientAuthScheme=sasl
+      ZOOKEEPER_SERVER_ID:
+    volumes:
+      -  ./zk/zk_server_jaas.conf:/etc/zookeeper/secrets/jaas/zk_server_jaas.conf
     networks:
-      sb-net:
-        ipv4_address: 172.28.1.3
-
-
-  ves-test-collector:
-    image: ${VES_DOCKER_REPO}${VES_TEST_COLLECTOR_IMAGE_NAME}:${VES_TEST_COLLECTOR_IMAGE_TAG}
-    container_name: ves-test-collector-v${VES_API}
-    #ports:
-    #  - "${EXT_VES_PORT}${VES_API}:30000"
+      integration:
+        aliases:
+        - zookeeper
+        ipv4_address: ${IPv4_ZOOKEEPER}
+        ipv6_address: ${IPv6_ZOOKEEPER}
+  kafka:
+    image: ${KAFKA_IMAGE}
+    container_name: kafka
+    ports:
+     - "9092:9092"
     environment:
-      - VES_API=${VES_API}
+      enableCadi: 'false'
+      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
+      KAFKA_ZOOKEEPER_CONNECTION_TIMEOUT_MS: 40000
+      KAFKA_ZOOKEEPER_SESSION_TIMEOUT_MS: 40000
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: INTERNAL_PLAINTEXT:PLAINTEXT,EXTERNAL_PLAINTEXT:PLAINTEXT
+      KAFKA_ADVERTISED_LISTENERS: INTERNAL_PLAINTEXT://kafka:9092
+      KAFKA_LISTENERS: INTERNAL_PLAINTEXT://0.0.0.0:9092
+      KAFKA_INTER_BROKER_LISTENER_NAME: INTERNAL_PLAINTEXT
+      KAFKA_CONFLUENT_SUPPORT_METRICS_ENABLE: 'false'
+      KAFKA_OPTS: -Djava.security.auth.login.config=/etc/kafka/secrets/jaas/zk_client_jaas.conf
+      KAFKA_ZOOKEEPER_SET_ACL: 'true'
+      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+      # Reduced the number of partitions only to avoid the timeout error for the first subscribe call in slow environment
+      KAFKA_OFFSETS_TOPIC_NUM_PARTITIONS: 1
     volumes:
-     - ${LOCAL_VES_MOUNT}/ves-v${VES_API}/logs:/VES5.0/evel/evel-test-collector/logs
-     - type: bind
-       source: ./resources/${VES_FORMAT_FILE}
-       target: /VES5.0/evel/evel-test-collector/docs/att_interface_definition/event_format_updated.json
-     - type: bind
-       source: ./resources/go-collector.sh
-       target: /VES5.0/evel/evel-test-collector/scripts/linux/go-collector.sh
-    logging:
-      driver: "json-file"
-      options:
-        max-size: "30m"
-        max-file: "5"
+      -  ./kafka/zk_client_jaas.conf:/etc/kafka/secrets/jaas/zk_client_jaas.conf
     networks:
-      sb-net:
-        ipv4_address: 172.28.1.4
-
-  netconf-server-simulator:
-    image: ${HT_DOCKER_REPO}${NETCONF_SERVER_SIMULATOR_IMAGE_NAME}:${NETCONF_SERVER_SIMULATOR_IMAGE_TAG}
-    container_name: netconf-server-simulator
-    #ports:
-    #  - "${EXT_SIM_PORT}:${INT_SIM_PORT}"
-    #  - "${EXT_SIM_SSH_PORT}:8000"
+      integration:
+        aliases:
+        - kafka
+        ipv4_address: ${IPv4_KAFKA}
+        ipv6_address: ${IPv6_KAFKA}
+    depends_on:
+     - zookeeper
+  dmaap:
+    container_name: onap-dmaap
+    image: ${DMAAP_IMAGE}
+    ports:
+      - "3904:3904"
+      - "3905:3905"
     environment:
-      - PORT=${INT_SIM_PORT}
-      - XMLFILE=xmlNeModel/${SIM_MODEL}.xml
-      - SSHPORT=-sshport=8000
+      enableCadi: 'false'
+    volumes:
+      - ./dmaap/MsgRtrApi.properties:/appl/dmaapMR1/bundleconfig/etc/appprops/MsgRtrApi.properties
+      - ./dmaap/logback.xml:/appl/dmaapMR1/bundleconfig/etc/logback.xml
+      - ./dmaap/cadi.properties:/appl/dmaapMR1/etc/cadi.properties
     networks:
-      sb-net:
-        ipv4_address: 172.28.1.11
-    logging:
-      driver: "json-file"
-      options:
-        max-size: "30m"
-        max-file: "5"
+      integration:
+        aliases:
+        - dmaap
+        ipv4_address: ${IPv4_DMAAP}
+        ipv6_address: ${IPv6_DMAAP}
 
-  netconf-server-simulator2:
-    image: ${HT_DOCKER_REPO}${NETCONF_SERVER_SIMULATOR_IMAGE_NAME}:${NETCONF_SERVER_SIMULATOR_IMAGE_TAG}
-    container_name: netconf-server-simulator2
-    #ports:
-    #  - "${EXT_SIM_PORT2}:${INT_SIM_PORT2}"
-    #  - "${EXT_SIM_SSH_PORT2}:8000"
+    depends_on:
+      - zookeeper
+      - kafka
+  vescollector:
+    image: ${VESCOLLECTOR_IMAGE}
+    container_name: vescollector
     environment:
-      - PORT=${INT_SIM_PORT2}
-      - XMLFILE=xmlNeModel/${SIM_MODEL2}.xml
-      - SSHPORT=-sshport=8000
-    networks:
-      sb-net:
-          ipv4_address: 172.28.1.12
-    logging:
-      driver: "json-file"
-      options:
-        max-size: "30m"
-        max-file: "5"
-  ntsimulator:
-    image: ${NTS_DOCKER_REPO}${NTS_IMAGE_NAME}:${NTS_IMAGE_TAG}
-    container_name: NTS_Manager
-    #ports:
-    #- "${EXT_PORT}:830"
-    volumes:
-    - "/var/run/docker.sock:/var/run/docker.sock"
-    - "./ntshome:/opt/dev/scripts"
-    - "/usr/bin/docker:/usr/bin/docker"
-    labels:
-      "NTS-manager": ""
-    environment:
-      NTS_IP: "${NTS_IP}"
-      NETCONF_BASE: ${NETCONF_BASE}
-      DOCKER_ENGINE_VERSION: "${DOCKER_ENGINE_VERSION}"
-      MODELS_IMAGE: ${DOCKER_REPO}${MODELS_IMAGE}:${MODELS_TAG}
-    networks:
-      sb-net:
-        ipv4_address: 172.28.1.20
-    logging:
-      driver: "json-file"
-      options:
-        max-size: "30m"
-        max-file: "5"
-  ntsimulator_xran:
-    image: ${NTS_DOCKER_REPO}${NTS_IMAGE_NAME}:${NTS_IMAGE_TAG}
-    container_name: NTS_Manager_XRAN
-    #ports:
-    #- "${EXT_PORT}:830"
+      DMAAPHOST: "onap-dmaap"
+    ports:
+      - "8080:8080"
+      - "8443:8443"
     volumes:
-    - "/var/run/docker.sock:/var/run/docker.sock"
-    - "./ntshome:/opt/dev/scripts"
-    - "/usr/bin/docker:/usr/bin/docker"
-    labels:
-      "NTS-manager": ""
-    environment:
-      NTS_IP: "${NTS_IP}"
-      NETCONF_BASE: 60000
-      DOCKER_ENGINE_VERSION: "${DOCKER_ENGINE_VERSION}"
-      MODELS_IMAGE: ${DOCKER_REPO}hightec/ntsim_xran:latest
+      - ./vescollector/collector.properties:/opt/app/VESCollector/etc/collector.properties
     networks:
-      sb-net:
-        ipv4_address: 172.28.1.30
-    logging:
-      driver: "json-file"
-      options:
-        max-size: "30m"
-        max-file: "5"
-
-
+      integration:
+        ipv4_address: ${IPv4_VESCOLLECTOR}
+        ipv6_address: ${IPv6_VESCOLLECTOR}
 networks:
-  sb-net:
+  integration:
+    driver: bridge
+    enable_ipv6: true
     ipam:
+      driver: default
       config:
-        - subnet: 172.28.0.0/16
-  
\ No newline at end of file
+      - subnet: ${IPv4_NETWORK_SUBNET}
+        gateway: ${IPv4_GATEWAY}
+      - subnet: ${IPv6_NETWORK_SUBNET}
+        gateway: ${IPv6_GATEWAY}
diff --git a/solution/integration/smo/kafka/zk_client_jaas.conf b/solution/integration/smo/kafka/zk_client_jaas.conf
new file mode 100755 (executable)
index 0000000..d4ef1eb
--- /dev/null
@@ -0,0 +1,5 @@
+Client {
+   org.apache.zookeeper.server.auth.DigestLoginModule required
+   username="kafka"
+   password="kafka_secret";
+ };
\ No newline at end of file
diff --git a/solution/integration/smo/ntshome/clean.sh b/solution/integration/smo/ntshome/clean.sh
deleted file mode 100755 (executable)
index 06f00b6..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-#/bin/bash
-
-echo "Cleaning up..."
-
-mapfile -t NTS_containers < <( docker ps -a --filter "label=NTS" --format "{{.ID}}" )
-
-CONTAINERS=""
-
-if [ ${#NTS_containers[@]} -gt 0 ]
-then
-
-        for container in "${NTS_containers[@]}"
-        do
-                CONTAINERS="$CONTAINERS $container"
-        done
-        echo "Cleaning up ontainers: $CONTAINERS"
-        docker kill $CONTAINERS > /dev/null 2>&1
-        docker rm $CONTAINERS > /dev/null 2>&1
-fi
-
-echo "Cleaning NTS Manager container"
-docker kill NTS_Manager > /dev/null 2>&1
-docker rm NTS_Manager > /dev/null 2>&1
-
-echo "All cleaned up!"
-
diff --git a/solution/integration/smo/ntshome/configuration.json b/solution/integration/smo/ntshome/configuration.json
deleted file mode 100644 (file)
index 3d991ca..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-       "notification-config":  {
-               "fault-notification-delay-period":      0,
-               "ves-heartbeat-period": 0,
-               "is-netconf-available": true,
-               "is-ves-available":     false
-       },
-       "ves-endpoint-details": {
-               "ves-endpoint-ip":      "172.17.0.1",
-               "ves-endpoint-port":    30007,
-               "ves-endpoint-auth-method":     "no-auth",
-               "ves-endpoint-username":        "",
-               "ves-endpoint-password":        "",
-               "ves-endpoint-certificate":     "",
-               "ves-registration":     false
-       }
-}
\ No newline at end of file
diff --git a/solution/integration/smo/ntshome/docker_stats.sh b/solution/integration/smo/ntshome/docker_stats.sh
deleted file mode 100755 (executable)
index a8f6afa..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# This script is used to complete the output of the docker stats command.
-# The docker stats command does not compute the total amount of resources (RAM or CPU)
-
-# Get the output of the docker stat command. Will be displayed at the end
-# Without modifying the special variable IFS the ouput of the docker stats command won't have
-CPU_CORES=`nproc`
-# the new lines thus resulting in a failure when using awk to process each line
-IFS=;
-mapfile -t DOCKER_PS_RESULT < <(/usr/bin/docker ps --all --format "{{.ID}}" --filter "label=NTS")
-
-CONTAINERS=""
-
-if [ ${#DOCKER_PS_RESULT[@]} -gt 0 ]
-then
-
-        for container in "${DOCKER_PS_RESULT[@]}"
-        do
-                CONTAINERS="$CONTAINERS $container"
-        done
-fi
-
-if [ -z "$CONTAINERS" ]
-then
-        CPU_SCALED=0
-        SUM_RAM=0
-else
-        DOCKER_STATS_COMMAND="/usr/bin/docker stats --no-stream --format \"table {{.CPUPerc}}\t{{.MemUsage}}\" ${CONTAINERS}"
-        DOCKER_STATS_COMMAND_RESULT=$(eval "$DOCKER_STATS_COMMAND")
-
-        SUM_CPU=`echo $DOCKER_STATS_COMMAND_RESULT | tail -n +2 | sed "s/%//g" | awk '{s+=$1} END {print s}'`
-        SUM_RAM=`echo $DOCKER_STATS_COMMAND_RESULT | tail -n +2 | sed "s/%//g" | awk '{s+=$2} END {print s}'`
-
-        CPU_SCALED=$(echo "scale=2; $SUM_CPU/$CPU_CORES" | bc)
-fi
-
-# Output the result
-echo -e "CPU=${CPU_SCALED}%;RAM=${SUM_RAM}MiB"
-
diff --git a/solution/integration/smo/resources/CommonEventFormat_28.4.1.json b/solution/integration/smo/resources/CommonEventFormat_28.4.1.json
deleted file mode 100644 (file)
index 04d2a06..0000000
+++ /dev/null
@@ -1,1876 +0,0 @@
-{
-    "$schema": "http://json-schema.org/draft-04/schema#",
-       "title": "VES Event Listener",
-       "type": "object",
-       "properties": {
-        "event": {"$ref": "#/definitions/event"},
-               "eventList": {"$ref": "#/definitions/eventList"}
-    },
-       
-       "definitions": {
-        "schemaHeaderBlock": {
-            "description": "schema date, version, author and associated API",
-            "type": "object",
-            "properties": {
-                "associatedApi": {
-                    "description": "VES Event Listener",
-                    "type": "string"
-                },
-                "lastUpdatedBy": {
-                    "description": "re2947",
-                    "type": "string"
-                },
-                "schemaDate": {
-                    "description": "September 19, 2017",
-                    "type": "string"
-                },
-                "schemaVersion": {
-                    "description": "28.4.1",
-                    "type": "number"
-                }
-            }
-        },
-           "schemaLicenseAndCopyrightNotice": {
-            "description": "Copyright (c) 2017, AT&T Intellectual Property.  All rights reserved",
-            "type": "object",
-            "properties": {
-                "apacheLicense2.0": {
-                    "description": "Licensed under the Apache License, Version 2.0 (the 'License'); you may not use this file except in compliance with the License. You may obtain a copy of the License at:",
-                    "type": "string"
-                },
-                "licenseUrl": {
-                    "description": "http://www.apache.org/licenses/LICENSE-2.0",
-                    "type": "string"
-                },
-                "asIsClause": {
-                    "description": "Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.",
-                    "type": "string"
-                },
-                "permissionsAndLimitations": {
-                    "description": "See the License for the specific language governing permissions and limitations under the License.",
-                    "type": "string"
-                }
-            }
-        },
-               "codecsInUse": {
-                       "description": "number of times an identified codec was used over the measurementInterval",
-                       "type": "object",
-                       "properties": {
-                               "codecIdentifier": { "type": "string" },
-                               "numberInUse": { "type": "integer" }
-                       },
-                       "required": [ "codecIdentifier", "numberInUse" ]
-               },
-               "command": {
-                       "description": "command from an event collector toward an event source",
-                       "type": "object",
-                       "properties": {
-                               "commandType": {
-                                       "type": "string",
-                                       "enum": [
-                                               "heartbeatIntervalChange",
-                                               "measurementIntervalChange",
-                                               "provideThrottlingState",
-                                               "throttlingSpecification"
-                                       ]
-                               },
-                               "eventDomainThrottleSpecification": { "$ref": "#/definitions/eventDomainThrottleSpecification" },
-                               "heartbeatInterval": { "type": "integer" },
-                               "measurementInterval": { "type": "integer" }
-                       },
-                       "required": [ "commandType" ]
-               },
-               "commandList": {
-                       "description": "array of commands from an event collector toward an event source",
-                       "type": "array",
-                       "items": {
-                           "$ref": "#/definitions/command"
-                       },
-                       "minItems": 0
-               },
-               "commonEventHeader": {
-                       "description": "fields common to all events",
-                       "type": "object",
-                       "properties": {
-                               "domain": {
-                                       "description": "the eventing domain associated with the event",
-                                       "type": "string",
-                                       "enum": [
-                                               "fault",
-                                               "heartbeat",
-                                               "measurementsForVfScaling",
-                                               "mobileFlow",
-                                               "other",
-                                               "sipSignaling",
-                                               "stateChange",
-                                               "syslog",
-                                               "thresholdCrossingAlert",
-                                               "voiceQuality"
-                                       ]
-                               },
-                               "eventId": {
-                                       "description": "event key that is unique to the event source",
-                                       "type": "string"
-                               },
-                               "eventName": {
-                                       "description": "unique event name",
-                                       "type": "string"
-                               },
-                               "eventType": {
-                                       "description": "for example - applicationVnf, guestOS, hostOS, platform",
-                                       "type": "string"
-                               },
-                               "internalHeaderFields": { "$ref": "#/definitions/internalHeaderFields" },
-                               "lastEpochMicrosec": {
-                                       "description": "the latest unix time aka epoch time associated with the event from any component--as microseconds elapsed since 1 Jan 1970 not including leap seconds",
-                                       "type": "number"
-                               },
-                               "nfcNamingCode": {
-                                       "description": "3 character network function component type, aligned with vfc naming standards",
-                                       "type": "string"
-                               },
-                               "nfNamingCode": {
-                                       "description": "4 character network function type, aligned with vnf naming standards",
-                                       "type": "string"
-                               },
-                               "priority": {
-                                       "description": "processing priority",
-                                       "type": "string",
-                                       "enum": [
-                                               "High",
-                                               "Medium",
-                                               "Normal",
-                                               "Low"
-                                       ]
-                               },
-                               "reportingEntityId": {
-                                       "description": "UUID identifying the entity reporting the event, for example an OAM VM; must be populated by the ATT enrichment process",
-                                       "type": "string"
-                               },
-                               "reportingEntityName": {
-                                       "description": "name of the entity reporting the event, for example, an EMS name; may be the same as sourceName",
-                                       "type": "string"
-                               },
-                               "sequence": {
-                                       "description": "ordering of events communicated by an event source instance or 0 if not needed",
-                                       "type": "integer"
-                               },
-                               "sourceId": {
-                                       "description": "UUID identifying the entity experiencing the event issue; must be populated by the ATT enrichment process",
-                                       "type": "string"
-                               },
-                               "sourceName": {
-                                       "description": "name of the entity experiencing the event issue",
-                                       "type": "string"
-                               },
-                               "startEpochMicrosec": {
-                                       "description": "the earliest unix time aka epoch time associated with the event from any component--as microseconds elapsed since 1 Jan 1970 not including leap seconds",
-                                       "type": "number"
-                               },
-                               "version": {
-                                       "description": "version of the event header",
-                                       "type": "number"
-                               }
-                       },
-                       "required": [ "domain", "eventId", "eventName", "lastEpochMicrosec", 
-                                                 "priority", "reportingEntityName", "sequence", "sourceName",
-                                     "startEpochMicrosec", "version" ]
-               },
-               "counter": {
-                       "description": "performance counter",
-                       "type": "object",
-                       "properties": {
-                               "criticality": { "type": "string", "enum": [ "CRIT", "MAJ" ] },
-                               "name":  { "type": "string" },
-                               "thresholdCrossed": { "type": "string" },
-                               "value": { "type": "string"}
-                       },
-                       "required": [ "criticality", "name", "thresholdCrossed", "value" ]
-               },
-               "cpuUsage": {
-                       "description": "usage of an identified CPU",
-                       "type": "object",
-                       "properties": {
-                               "cpuIdentifier": { 
-                    "description": "cpu identifer",
-                    "type": "string" 
-                },
-                               "cpuIdle": { 
-                    "description": "percentage of CPU time spent in the idle task",
-                    "type": "number" 
-                },
-                               "cpuUsageInterrupt": { 
-                    "description": "percentage of time spent servicing interrupts",
-                    "type": "number" 
-                },
-                               "cpuUsageNice": { 
-                    "description": "percentage of time spent running user space processes that have been niced",
-                    "type": "number" 
-                },
-                               "cpuUsageSoftIrq": { 
-                    "description": "percentage of time spent handling soft irq interrupts",
-                    "type": "number" 
-                },
-                               "cpuUsageSteal": { 
-                    "description": "percentage of time spent in involuntary wait which is neither user, system or idle time and is effectively time that went missing",
-                    "type": "number" 
-                },
-                               "cpuUsageSystem": { 
-                    "description": "percentage of time spent on system tasks running the kernel",
-                    "type": "number" 
-                },
-                               "cpuUsageUser": { 
-                    "description": "percentage of time spent running un-niced user space processes",
-                    "type": "number" 
-                },
-                               "cpuWait": { 
-                    "description": "percentage of CPU time spent waiting for I/O operations to complete",
-                    "type": "number" 
-                },
-                               "percentUsage": { 
-                    "description": "aggregate cpu usage of the virtual machine on which the VNFC reporting the event is running",
-                    "type": "number" 
-                }
-                       },
-                       "required": [ "cpuIdentifier", "percentUsage" ]
-               },
-               "diskUsage": {
-                       "description": "usage of an identified disk",
-                       "type": "object",
-                       "properties": {
-                               "diskIdentifier": { 
-                    "description": "disk identifier", 
-                    "type": "string" 
-                },
-                "diskIoTimeAvg": {
-                    "description": "milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms  matches 100% load; provide the average over the measurement interval",
-                    "type": "number"
-                },
-                "diskIoTimeLast": {
-                    "description": "milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms  matches 100% load; provide the last value measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskIoTimeMax": {
-                    "description": "milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms  matches 100% load; provide the maximum value measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskIoTimeMin": {
-                    "description": "milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms  matches 100% load; provide the minimum value measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskMergedReadAvg": {
-                    "description": "number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the average measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskMergedReadLast": {
-                    "description": "number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the last value measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskMergedReadMax": {
-                    "description": "number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the maximum value measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskMergedReadMin": {
-                    "description": "number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the minimum value measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskMergedWriteAvg": {
-                    "description": "number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the average measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskMergedWriteLast": {
-                    "description": "number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the last value measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskMergedWriteMax": {
-                    "description": "number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the maximum value measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskMergedWriteMin": {
-                    "description": "number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the minimum value measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskOctetsReadAvg": {
-                    "description": "number of octets per second read from a disk or partition; provide the average measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskOctetsReadLast": {
-                    "description": "number of octets per second read from a disk or partition; provide the last measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskOctetsReadMax": {
-                    "description": "number of octets per second read from a disk or partition; provide the maximum measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskOctetsReadMin": {
-                    "description": "number of octets per second read from a disk or partition; provide the minimum measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskOctetsWriteAvg": {
-                    "description": "number of octets per second written to a disk or partition; provide the average measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskOctetsWriteLast": {
-                    "description": "number of octets per second written to a disk or partition; provide the last measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskOctetsWriteMax": {
-                    "description": "number of octets per second written to a disk or partition; provide the maximum measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskOctetsWriteMin": {
-                    "description": "number of octets per second written to a disk or partition; provide the minimum measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskOpsReadAvg": {
-                    "description": "number of read operations per second issued to the disk; provide the average measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskOpsReadLast": {
-                    "description": "number of read operations per second issued to the disk; provide the last measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskOpsReadMax": {
-                    "description": "number of read operations per second issued to the disk; provide the maximum measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskOpsReadMin": {
-                    "description": "number of read operations per second issued to the disk; provide the minimum measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskOpsWriteAvg": {
-                    "description": "number of write operations per second issued to the disk; provide the average measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskOpsWriteLast": {
-                    "description": "number of write operations per second issued to the disk; provide the last measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskOpsWriteMax": {
-                    "description": "number of write operations per second issued to the disk; provide the maximum measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskOpsWriteMin": {
-                    "description": "number of write operations per second issued to the disk; provide the minimum measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskPendingOperationsAvg": {
-                    "description": "queue size of pending I/O operations per second; provide the average measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskPendingOperationsLast": {
-                    "description": "queue size of pending I/O operations per second; provide the last measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskPendingOperationsMax": {
-                    "description": "queue size of pending I/O operations per second; provide the maximum measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskPendingOperationsMin": {
-                    "description": "queue size of pending I/O operations per second; provide the minimum measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskTimeReadAvg": {
-                    "description": "milliseconds a read operation took to complete; provide the average measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskTimeReadLast": {
-                    "description": "milliseconds a read operation took to complete; provide the last measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskTimeReadMax": {
-                    "description": "milliseconds a read operation took to complete; provide the maximum measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskTimeReadMin": {
-                    "description": "milliseconds a read operation took to complete; provide the minimum measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskTimeWriteAvg": {
-                    "description": "milliseconds a write operation took to complete; provide the average measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskTimeWriteLast": {
-                    "description": "milliseconds a write operation took to complete; provide the last measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskTimeWriteMax": {
-                    "description": "milliseconds a write operation took to complete; provide the maximum measurement within the measurement interval",
-                    "type": "number"
-                },
-                "diskTimeWriteMin": {
-                    "description": "milliseconds a write operation took to complete; provide the minimum measurement within the measurement interval",
-                    "type": "number"
-                }
-                       },
-                       "required": [ "diskIdentifier" ]
-               },
-        "endOfCallVqmSummaries": {
-            "description": "provides end of call voice quality metrics",
-                       "type": "object",
-                       "properties": {
-                "adjacencyName": {
-                    "description": " adjacency name",
-                    "type": "string"
-                },
-                "endpointDescription": {
-                    "description": "Either Caller or Callee",
-                    "type": "string",
-                    "enum": ["Caller", "Callee"]
-                },
-                "endpointJitter": {
-                    "description": "",
-                    "type": "number"
-                },
-                "endpointRtpOctetsDiscarded": {
-                    "description": "",
-                    "type": "number"
-                },
-                "endpointRtpOctetsReceived": {
-                    "description": "",
-                    "type": "number"
-                },
-                "endpointRtpOctetsSent": {
-                    "description": "",
-                    "type": "number"
-                },
-                "endpointRtpPacketsDiscarded": {
-                    "description": "",
-                    "type": "number"
-                },
-                "endpointRtpPacketsReceived": {
-                    "description": "",
-                    "type": "number"
-                },
-                "endpointRtpPacketsSent": {
-                    "description": "",
-                    "type": "number"
-                },
-                "localJitter": {
-                    "description": "",
-                    "type": "number"
-                },
-                "localRtpOctetsDiscarded": {
-                    "description": "",
-                    "type": "number"
-                },
-                "localRtpOctetsReceived": {
-                    "description": "",
-                    "type": "number"
-                },
-                "localRtpOctetsSent": {
-                    "description": "",
-                    "type": "number"
-                },
-                "localRtpPacketsDiscarded": {
-                    "description": "",
-                    "type": "number"
-                },
-                "localRtpPacketsReceived": {
-                    "description": "",
-                    "type": "number"
-                },
-                "localRtpPacketsSent": {
-                    "description": "",
-                    "type": "number"
-                },
-                "mosCqe": {
-                    "description": "1-5 1dp",
-                    "type": "number"
-                },
-                "packetsLost": {
-                    "description": "",
-                    "type": "number"
-                },
-                "packetLossPercent": {
-                    "description" : "Calculated percentage packet loss based on Endpoint RTP packets lost (as reported in RTCP) and Local RTP packets sent. Direction is based on Endpoint description (Caller, Callee). Decimal (2 dp)",
-                    "type": "number"
-                },
-                "rFactor": {
-                    "description": "0-100",
-                    "type": "number"
-                },
-                "roundTripDelay": {
-                    "description": "millisecs",
-                    "type": "number"
-                }
-            },
-            "required": [ "adjacencyName", "endpointDescription" ]
-        },
-        "event": {
-            "description": "the root level of the common event format",
-               "type": "object",
-               "properties": {
-                       "commonEventHeader": { "$ref": "#/definitions/commonEventHeader" },
-                       "faultFields": { "$ref": "#/definitions/faultFields" },
-                       "heartbeatFields": { "$ref": "#/definitions/heartbeatFields" },
-                       "measurementsForVfScalingFields": { "$ref": "#/definitions/measurementsForVfScalingFields" },
-                               "mobileFlowFields": { "$ref": "#/definitions/mobileFlowFields" },
-                       "otherFields": { "$ref": "#/definitions/otherFields" },
-                       "sipSignalingFields": { "$ref": "#/definitions/sipSignalingFields" },
-                       "stateChangeFields": { "$ref": "#/definitions/stateChangeFields" },
-                               "syslogFields": { "$ref": "#/definitions/syslogFields" },
-                       "thresholdCrossingAlertFields": { "$ref": "#/definitions/thresholdCrossingAlertFields" },
-                       "voiceQualityFields": { "$ref": "#/definitions/voiceQualityFields" }
-               },
-            "required": [ "commonEventHeader" ]
-        },
-               "eventDomainThrottleSpecification": {
-                       "description": "specification of what information to suppress within an event domain",
-                       "type": "object",
-                       "properties": {
-                       "eventDomain": {
-                               "description": "Event domain enum from the commonEventHeader domain field",
-                               "type": "string"
-                       },
-                       "suppressedFieldNames": {
-                               "description": "List of optional field names in the event block that should not be sent to the Event Listener",
-                               "type": "array",
-                                       "items": {
-                                           "type": "string"
-                                       }
-                       },
-                               "suppressedNvPairsList": {
-                                       "description": "Optional list of specific NvPairsNames to suppress within a given Name-Value Field",
-                               "type": "array",
-                                       "items": {
-                                           "$ref": "#/definitions/suppressedNvPairs"
-                                       }
-                       }
-                       },
-                       "required": [ "eventDomain" ]
-               },
-               "eventDomainThrottleSpecificationList": {
-                       "description": "array of eventDomainThrottleSpecifications",
-                       "type": "array",
-                       "items": {
-                           "$ref": "#/definitions/eventDomainThrottleSpecification"
-                       },
-                       "minItems": 0
-               },
-               "eventList": {
-                       "description": "array of events",
-                       "type": "array",
-                       "items": {
-                               "$ref": "#/definitions/event"
-                       }
-               },
-               "eventThrottlingState": {
-                       "description": "reports the throttling in force at the event source",
-                       "type": "object",
-                       "properties": {
-                       "eventThrottlingMode": {
-                               "description": "Mode the event manager is in",
-                               "type": "string",
-                                       "enum": [
-                                               "normal",
-                                               "throttled"
-                                       ]
-                       },
-                               "eventDomainThrottleSpecificationList": { "$ref": "#/definitions/eventDomainThrottleSpecificationList" }
-                       },
-                       "required": [ "eventThrottlingMode" ]
-               },
-               "faultFields": {
-                       "description": "fields specific to fault events",
-                       "type": "object",
-                       "properties": {
-                               "alarmAdditionalInformation": {
-                                       "description": "additional alarm information",
-                                       "type": "array",
-                                       "items": {
-                                               "$ref": "#/definitions/field"
-                                       }
-                               },
-                               "alarmCondition": {
-                                       "description": "alarm condition reported by the device",
-                                       "type": "string"
-                               },
-                               "alarmInterfaceA": {
-                                       "description": "card, port, channel or interface name of the device generating the alarm",
-                                       "type": "string"
-                               },
-                               "eventCategory": {
-                                       "description": "Event category, for example: license, link, routing, security, signaling",
-                                       "type": "string"
-                               },
-                               "eventSeverity": {
-                                       "description": "event severity",
-                                       "type": "string",
-                                       "enum": [
-                                               "CRITICAL",
-                                               "MAJOR",
-                                               "MINOR",
-                                               "WARNING",
-                                               "NORMAL"
-                                       ]
-                               },
-                               "eventSourceType": {
-                                       "description": "type of event source; examples: card, host, other, port, portThreshold, router, slotThreshold, switch, virtualMachine, virtualNetworkFunction",
-                                       "type": "string"
-                               },
-                               "faultFieldsVersion": {
-                                       "description": "version of the faultFields block",
-                                       "type": "number"
-                               },
-                               "specificProblem": {
-                                       "description": "short description of the alarm or problem",
-                                       "type": "string"
-                               },
-                               "vfStatus": {
-                                       "description": "virtual function status enumeration",
-                                       "type": "string",
-                                       "enum": [
-                                               "Active",
-                                               "Idle",
-                                               "Preparing to terminate",
-                                               "Ready to terminate",
-                                               "Requesting termination"
-                                       ]
-                               }
-                       },
-                       "required": [ "alarmCondition", "eventSeverity", "eventSourceType",
-                                     "faultFieldsVersion", "specificProblem", "vfStatus" ]
-               },
-               "featuresInUse": {
-                       "description": "number of times an identified feature was used over the measurementInterval",
-                       "type": "object",
-                       "properties": {
-                               "featureIdentifier": { "type": "string" },
-                               "featureUtilization": { "type": "integer" }
-                       },
-                       "required": [ "featureIdentifier", "featureUtilization" ]
-               },
-               "field": {
-                       "description": "name value pair",
-                       "type": "object",
-                       "properties": {
-                               "name":  { "type": "string" },
-                               "value": { "type": "string" }
-                       },
-                       "required": [ "name", "value" ]
-               },
-               "filesystemUsage": {
-                       "description": "disk usage of an identified virtual machine in gigabytes and/or gigabytes per second",
-                       "type": "object",
-                       "properties": {
-                               "blockConfigured": { "type": "number" },
-                               "blockIops": { "type": "number" },
-                               "blockUsed": { "type": "number" },
-                               "ephemeralConfigured": { "type": "number" },
-                               "ephemeralIops": { "type": "number" },
-                               "ephemeralUsed": { "type": "number" },
-                               "filesystemName": { "type": "string" }
-                       },
-                       "required": [ "blockConfigured", "blockIops", "blockUsed", "ephemeralConfigured",
-                                     "ephemeralIops", "ephemeralUsed", "filesystemName" ]
-               },
-               "gtpPerFlowMetrics": {
-                       "description": "Mobility GTP Protocol per flow metrics",
-                       "type": "object",
-                       "properties": {
-                               "avgBitErrorRate": {
-                                       "description": "average bit error rate",
-                                       "type": "number"
-                               },
-                               "avgPacketDelayVariation": {
-                                       "description": "Average packet delay variation or jitter in milliseconds for received packets: Average difference between the packet timestamp and time received for all pairs of consecutive packets",
-                                       "type": "number"
-                               },
-                               "avgPacketLatency": {
-                                       "description": "average delivery latency",
-                                       "type": "number"
-                               },
-                               "avgReceiveThroughput": {
-                                       "description": "average receive throughput",
-                                       "type": "number"
-                               },
-                               "avgTransmitThroughput": {
-                                       "description": "average transmit throughput",
-                                       "type": "number"
-                               },
-                               "durConnectionFailedStatus": {
-                                       "description": "duration of failed state in milliseconds, computed as the cumulative time between a failed echo request and the next following successful error request, over this reporting interval",
-                                       "type": "number"
-                               },
-                               "durTunnelFailedStatus": {
-                                       "description": "Duration of errored state, computed as the cumulative time between a tunnel error indicator and the next following non-errored indicator, over this reporting interval",
-                                       "type": "number"
-                               },
-                               "flowActivatedBy": {
-                                       "description": "Endpoint activating the flow",
-                                       "type": "string"
-                               },
-                               "flowActivationEpoch": {
-                                       "description": "Time the connection is activated in the flow (connection) being reported on, or transmission time of the first packet if activation time is not available",
-                                       "type": "number"
-                               },
-                               "flowActivationMicrosec": {
-                                       "description": "Integer microseconds for the start of the flow connection",
-                                       "type": "number"
-                               },
-                               "flowActivationTime": {
-                                       "description": "time the connection is activated in the flow being reported on, or transmission time of the first packet if activation time is not available; with RFC 2822 compliant format: Sat, 13 Mar 2010 11:29:05 -0800",
-                                       "type": "string"
-                               },
-                               "flowDeactivatedBy": {
-                                       "description": "Endpoint deactivating the flow",
-                                       "type": "string"
-                               },
-                               "flowDeactivationEpoch": {
-                                       "description": "Time for the start of the flow connection, in integer UTC epoch time aka UNIX time",
-                                       "type": "number"
-                               },
-                               "flowDeactivationMicrosec": {
-                                       "description": "Integer microseconds for the start of the flow connection",
-                                       "type": "number"
-                               },
-                               "flowDeactivationTime": {
-                                       "description": "Transmission time of the first packet in the flow connection being reported on; with RFC 2822 compliant format: Sat, 13 Mar 2010 11:29:05 -0800",
-                                       "type": "string"
-                               },
-                               "flowStatus": {
-                                       "description": "connection status at reporting time as a working / inactive / failed indicator value",
-                                       "type": "string"
-                               },
-                               "gtpConnectionStatus": {
-                                       "description": "Current connection state at reporting time",
-                                       "type": "string"
-                               },
-                               "gtpTunnelStatus": {
-                                       "description": "Current tunnel state  at reporting time",
-                                       "type": "string"
-                               },
-                               "ipTosCountList": {
-                                       "description": "array of key: value pairs where the keys are drawn from the IP Type-of-Service identifiers which range from '0' to '255', and the values are the count of packets that had those ToS identifiers in the flow",
-                    "type": "array",
-                    "items": {
-                                               "type": "array",
-                                               "items": [
-                                                       { "type": "string" },
-                                                       { "type": "number" }
-                                               ]
-                                       }
-                               },
-                               "ipTosList": {
-                                       "description": "Array of unique IP Type-of-Service values observed in the flow where values range from '0' to '255'",
-                                       "type": "array",
-                                       "items": {
-                                               "type": "string"
-                                       }
-                               },
-                               "largePacketRtt": {
-                                       "description": "large packet round trip time",
-                                       "type": "number"
-                               },
-                               "largePacketThreshold": {
-                                       "description": "large packet threshold being applied",
-                                       "type": "number"
-                               },
-                               "maxPacketDelayVariation": {
-                                       "description": "Maximum packet delay variation or jitter in milliseconds for received packets: Maximum of the difference between the packet timestamp and time received for all pairs of consecutive packets",
-                                       "type": "number"
-                               },
-                               "maxReceiveBitRate": {
-                                       "description": "maximum receive bit rate",
-                                       "type": "number"
-                               },
-                               "maxTransmitBitRate": {
-                                       "description": "maximum transmit bit rate",
-                                       "type": "number"
-                               },
-                               "mobileQciCosCountList": {
-                                       "description": "array of key: value pairs where the keys are drawn from LTE QCI or UMTS class of service strings, and the values are the count of packets that had those strings in the flow",
-                    "type": "array",
-                    "items": {
-                                               "type": "array",
-                                               "items": [
-                                                       { "type": "string" },
-                                                       { "type": "number" }
-                                               ]
-                                       }
-                               },
-                               "mobileQciCosList": {
-                                       "description": "Array of unique LTE QCI or UMTS class-of-service values observed in the flow",
-                                       "type": "array",
-                                       "items": {
-                                               "type": "string"
-                                       }
-                               },
-                               "numActivationFailures": {
-                                       "description": "Number of failed activation requests, as observed by the reporting node",
-                                       "type": "number"
-                               },
-                               "numBitErrors": {
-                                       "description": "number of errored bits",
-                                       "type": "number"
-                               },
-                               "numBytesReceived": {
-                                       "description": "number of bytes received, including retransmissions",
-                                       "type": "number"
-                               },
-                               "numBytesTransmitted": {
-                                       "description": "number of bytes transmitted, including retransmissions",
-                                       "type": "number"
-                               },
-                               "numDroppedPackets": {
-                                       "description": "number of received packets dropped due to errors per virtual interface",
-                                       "type": "number"
-                               },
-                               "numGtpEchoFailures": {
-                                       "description": "Number of Echo request path failures where failed paths are defined in 3GPP TS 29.281 sec 7.2.1 and 3GPP TS 29.060 sec. 11.2",
-                                       "type": "number"
-                               },
-                               "numGtpTunnelErrors": {
-                                       "description": "Number of tunnel error indications where errors are defined in 3GPP TS 29.281 sec 7.3.1 and 3GPP TS 29.060 sec. 11.1",
-                                       "type": "number"
-                               },
-                               "numHttpErrors": {
-                                       "description": "Http error count",
-                                       "type": "number"
-                               },
-                               "numL7BytesReceived": {
-                                       "description": "number of tunneled layer 7 bytes received, including retransmissions",
-                                       "type": "number"
-                               },
-                               "numL7BytesTransmitted": {
-                                       "description": "number of tunneled layer 7 bytes transmitted, excluding retransmissions",
-                                       "type": "number"
-                               },
-                               "numLostPackets": {
-                                       "description": "number of lost packets",
-                                       "type": "number"
-                               },
-                               "numOutOfOrderPackets": {
-                                       "description": "number of out-of-order packets",
-                                       "type": "number"
-                               },
-                               "numPacketErrors": {
-                                       "description": "number of errored packets",
-                                       "type": "number"
-                               },
-                               "numPacketsReceivedExclRetrans": {
-                                       "description": "number of packets received, excluding retransmission",
-                                       "type": "number"
-                               },
-                               "numPacketsReceivedInclRetrans": {
-                                       "description": "number of packets received, including retransmission",
-                                       "type": "number"
-                               },
-                               "numPacketsTransmittedInclRetrans": {
-                                       "description": "number of packets transmitted, including retransmissions",
-                                       "type": "number"
-                               },
-                               "numRetries": {
-                                       "description": "number of packet retries",
-                                       "type": "number"
-                               },
-                               "numTimeouts": {
-                                       "description": "number of packet timeouts",
-                                       "type": "number"
-                               },
-                               "numTunneledL7BytesReceived": {
-                                       "description": "number of tunneled layer 7 bytes received, excluding retransmissions",
-                                       "type": "number"
-                               },
-                               "roundTripTime": {
-                                       "description": "round trip time",
-                                       "type": "number"
-                               },
-                               "tcpFlagCountList": {
-                                       "description": "array of key: value pairs where the keys are drawn from TCP Flags and the values are the count of packets that had that TCP Flag in the flow",
-                    "type": "array",
-                    "items": {
-                                               "type": "array",
-                                               "items": [
-                                                       { "type": "string" },
-                                                       { "type": "number" }
-                                               ]
-                                       }
-                               },
-                               "tcpFlagList": {
-                                       "description": "Array of unique TCP Flags observed in the flow",
-                                       "type": "array",
-                                       "items": {
-                                               "type": "string"
-                                       }
-                               },
-                               "timeToFirstByte": {
-                                       "description": "Time in milliseconds between the connection activation and first byte received",
-                                       "type": "number"
-                               }
-                       },
-                       "required": [ "avgBitErrorRate", "avgPacketDelayVariation", "avgPacketLatency",
-                          "avgReceiveThroughput", "avgTransmitThroughput",
-                                                 "flowActivationEpoch", "flowActivationMicrosec",
-                                                 "flowDeactivationEpoch", "flowDeactivationMicrosec",
-                          "flowDeactivationTime", "flowStatus",
-                                                 "maxPacketDelayVariation", "numActivationFailures",
-                                                 "numBitErrors", "numBytesReceived", "numBytesTransmitted",
-                                                 "numDroppedPackets", "numL7BytesReceived",
-                                                 "numL7BytesTransmitted", "numLostPackets",
-                                                 "numOutOfOrderPackets", "numPacketErrors",
-                                                 "numPacketsReceivedExclRetrans",
-                                                 "numPacketsReceivedInclRetrans",
-                                                 "numPacketsTransmittedInclRetrans",
-                                                 "numRetries", "numTimeouts", "numTunneledL7BytesReceived",
-                                                 "roundTripTime", "timeToFirstByte"
-                       ]
-               },
-               "heartbeatFields": {
-                       "description": "optional field block for fields specific to heartbeat events",
-                       "type": "object",
-                       "properties": {
-                               "additionalFields": {
-                                       "description": "additional heartbeat fields if needed",
-                                       "type": "array",
-                                       "items": {
-                                               "$ref": "#/definitions/field"
-                                       }
-                               },
-                               "heartbeatFieldsVersion": {
-                                       "description": "version of the heartbeatFields block",
-                                       "type": "number"
-                               },
-                               "heartbeatInterval": {
-                                       "description": "current heartbeat interval in seconds",
-                                       "type": "integer"
-                               }
-                       },
-                       "required": [ "heartbeatFieldsVersion", "heartbeatInterval" ]
-               },
-               "internalHeaderFields": {
-                       "description": "enrichment fields for internal VES Event Listener service use only, not supplied by event sources",
-                       "type": "object"
-               },
-               "jsonObject": {
-                       "description": "json object schema, name and other meta-information along with one or more object instances",
-                       "type": "object",
-                       "properties": {
-                               "objectInstances":  {
-                    "description": "one or more instances of the jsonObject", 
-                    "type": "array",
-                    "items": {
-                        "$ref": "#/definitions/jsonObjectInstance"     
-                    }                                  
-                },
-                               "objectName":  {
-                    "description": "name of the JSON Object", 
-                    "type": "string" 
-                },
-                               "objectSchema":  {
-                    "description": "json schema for the object", 
-                    "type": "string" 
-                },
-                               "objectSchemaUrl":  {
-                    "description": "Url to the json schema for the object", 
-                    "type": "string" 
-                },
-                               "nfSubscribedObjectName":  {
-                    "description": "name of the object associated with the nfSubscriptonId", 
-                    "type": "string" 
-                },
-                               "nfSubscriptionId":  {
-                    "description": "identifies an openConfig telemetry subscription on a network function, which configures the network function to send complex object data associated with the jsonObject", 
-                    "type": "string" 
-                }
-                       },
-                       "required": [ "objectInstances", "objectName" ]
-               },
-               "jsonObjectInstance": {
-                       "description": "meta-information about an instance of a jsonObject along with the actual object instance",
-                       "type": "object",
-                       "properties": {
-                               "objectInstance":  {
-                    "description": "an instance conforming to the jsonObject schema", 
-                    "type": "object" 
-                },
-                               "objectInstanceEpochMicrosec":  {
-                    "description": "the unix time aka epoch time associated with this objectInstance--as microseconds elapsed since 1 Jan 1970 not including leap seconds", 
-                    "type": "number" 
-                },
-                               "objectKeys":  {
-                    "description": "an ordered set of keys that identifies this particular instance of jsonObject", 
-                    "type": "array",
-                    "items": {
-                        "$ref": "#/definitions/key"
-                    }                                  
-                }
-                       },
-                       "required": [ "objectInstance" ]
-               },
-               "key": {
-                       "description": "tuple which provides the name of a key along with its value and relative order",
-                       "type": "object",
-                       "properties": {
-                               "keyName": { 
-                    "description": "name of the key", 
-                                   "type": "string" 
-                               },
-                               "keyOrder": { 
-                    "description": "relative sequence or order of the key with respect to other keys", 
-                                   "type": "integer" 
-                               },
-                               "keyValue": { 
-                    "description": "value of the key", 
-                                   "type": "string" 
-                               }
-                       },
-                       "required": [ "keyName" ]
-               },
-               "latencyBucketMeasure": {
-                       "description": "number of counts falling within a defined latency bucket",
-                       "type": "object",
-                       "properties": {
-                               "countsInTheBucket": { "type": "number" },
-                               "highEndOfLatencyBucket": { "type": "number" },
-                               "lowEndOfLatencyBucket":  { "type": "number" }
-                       },
-                       "required": [ "countsInTheBucket" ]
-               },
-               "measurementsForVfScalingFields": {
-                       "description": "measurementsForVfScaling fields",
-                       "type": "object",
-                       "properties": {
-                               "additionalFields": {
-                                       "description": "additional name-value-pair fields",
-                                       "type": "array",
-                                       "items": {
-                                               "$ref": "#/definitions/field"
-                                       }
-                               },
-                               "additionalMeasurements": {
-                                       "description": "array of named name-value-pair arrays",
-                                       "type": "array",
-                                       "items": {
-                                               "$ref": "#/definitions/namedArrayOfFields"
-                                       }
-                               },
-                "additionalObjects": {
-                    "description": "array of JSON objects described by name, schema and other meta-information",
-                                       "type": "array",
-                                       "items": {
-                        "$ref": "#/definitions/jsonObject"
-                                       }
-                },
-                               "codecUsageArray": {
-                                       "description": "array of codecs in use",
-                                       "type": "array",
-                                       "items": {
-                                               "$ref": "#/definitions/codecsInUse"
-                                       }
-                               },
-                               "concurrentSessions": {
-                                       "description": "peak concurrent sessions for the VM or VNF over the measurementInterval",
-                                       "type": "integer"
-                               },
-                               "configuredEntities": {
-                                       "description": "over the measurementInterval, peak total number of: users, subscribers, devices, adjacencies, etc., for the VM, or subscribers, devices, etc., for the VNF",
-                                       "type": "integer"
-                               },
-                               "cpuUsageArray": {
-                                       "description": "usage of an array of CPUs",
-                                       "type": "array",
-                                       "items": {
-                                               "$ref": "#/definitions/cpuUsage"
-                                       }
-                               },
-                "diskUsageArray": {
-                                       "description": "usage of an array of disks",
-                                       "type": "array",
-                                       "items": {
-                                               "$ref": "#/definitions/diskUsage"
-                                       }
-                               },
-                               "featureUsageArray": {
-                                       "description": "array of features in use",
-                                       "type": "array",
-                                       "items": {
-                                               "$ref": "#/definitions/featuresInUse"
-                                       }
-                               },
-                               "filesystemUsageArray": {
-                                       "description": "filesystem usage of the VM on which the VNFC reporting the event is running",
-                                       "type": "array",
-                                       "items": {
-                                               "$ref": "#/definitions/filesystemUsage"
-                                       }
-                               },
-                               "latencyDistribution": {
-                                       "description": "array of integers representing counts of requests whose latency in milliseconds falls within per-VNF configured ranges",
-                                       "type": "array",
-                                       "items": {
-                                               "$ref": "#/definitions/latencyBucketMeasure"
-                                       }
-                               },
-                               "meanRequestLatency": {
-                                       "description": "mean seconds required to respond to each request for the VM on which the VNFC reporting the event is running",
-                                       "type": "number"
-                               },
-                               "measurementInterval": {
-                                       "description": "interval over which measurements are being reported in seconds",
-                                       "type": "number"
-                               },
-                               "measurementsForVfScalingVersion": {
-                                       "description": "version of the measurementsForVfScaling block",
-                                       "type": "number"
-                               },
-                               "memoryUsageArray": {
-                                       "description": "memory usage of an array of VMs",
-                                       "type": "array",
-                                       "items": {
-                                               "$ref": "#/definitions/memoryUsage"
-                                       }
-                               },
-                               "numberOfMediaPortsInUse": {
-                                       "description": "number of media ports in use",
-                                       "type": "integer"
-                               },
-                               "requestRate": {
-                                       "description": "peak rate of service requests per second to the VNF over the measurementInterval",
-                                       "type": "number"
-                               },
-                               "vnfcScalingMetric": {
-                                       "description": "represents busy-ness of the VNF from 0 to 100 as reported by the VNFC",
-                                       "type": "integer"
-                               },
-                               "vNicPerformanceArray": {
-                                       "description": "usage of an array of virtual network interface cards",
-                                       "type": "array",
-                                       "items": {
-                                               "$ref": "#/definitions/vNicPerformance"
-                                       }
-                               }
-                       },
-                       "required": [ "measurementInterval", "measurementsForVfScalingVersion" ]
-               },
-               "memoryUsage": {
-                       "description": "memory usage of an identified virtual machine",
-                       "type": "object",
-                       "properties": {
-                               "memoryBuffered": { 
-                    "description": "kibibytes of temporary storage for raw disk blocks", 
-                    "type": "number" 
-                },
-                               "memoryCached": { 
-                    "description": "kibibytes of memory used for cache", 
-                    "type": "number" 
-                },
-                               "memoryConfigured": { 
-                    "description": "kibibytes of memory configured in the virtual machine on which the VNFC reporting the event is running", 
-                    "type": "number" 
-                },
-                               "memoryFree": { 
-                    "description": "kibibytes of physical RAM left unused by the system", 
-                    "type": "number" 
-                },
-                               "memorySlabRecl": { 
-                    "description": "the part of the slab that can be reclaimed such as caches measured in kibibytes", 
-                    "type": "number" 
-                },
-                               "memorySlabUnrecl": { 
-                    "description": "the part of the slab that cannot be reclaimed even when lacking memory measured in kibibytes", 
-                    "type": "number" 
-                },
-                               "memoryUsed": { 
-                    "description": "total memory minus the sum of free, buffered, cached and slab memory measured in kibibytes", 
-                    "type": "number" 
-                },
-                               "vmIdentifier": { 
-                    "description": "virtual machine identifier associated with the memory metrics", 
-                    "type": "string" 
-                }
-                       },
-                       "required": [ "memoryFree", "memoryUsed", "vmIdentifier" ]
-               },
-               "mobileFlowFields": {
-                       "description": "mobileFlow fields",
-                       "type": "object",
-                       "properties": {
-                               "additionalFields": {
-                                       "description": "additional mobileFlow fields if needed",
-                                       "type": "array",
-                                       "items": {
-                                               "$ref": "#/definitions/field"
-                                       }
-                               },
-                               "applicationType": {
-                                       "description": "Application type inferred",
-                                       "type": "string"
-                               },
-                               "appProtocolType": {
-                                       "description": "application protocol",
-                                       "type": "string"
-                               },
-                               "appProtocolVersion": {
-                                       "description": "application protocol version",
-                                       "type": "string"
-                               },
-                               "cid": {
-                                       "description": "cell id",
-                                       "type": "string"
-                               },
-                               "connectionType": {
-                                       "description": "Abbreviation referencing a 3GPP reference point e.g., S1-U, S11, etc",
-                                       "type": "string"
-                               },
-                               "ecgi": {
-                                       "description": "Evolved Cell Global Id",
-                                       "type": "string"
-                               },
-                               "flowDirection": {
-                                       "description": "Flow direction, indicating if the reporting node is the source of the flow or destination for the flow",
-                                       "type": "string"
-                               },
-                               "gtpPerFlowMetrics": { "$ref": "#/definitions/gtpPerFlowMetrics" },
-                               "gtpProtocolType": {
-                                       "description": "GTP protocol",
-                                       "type": "string"
-                               },
-                               "gtpVersion": {
-                                       "description": "GTP protocol version",
-                                       "type": "string"
-                               },
-                               "httpHeader": {
-                                       "description": "HTTP request header, if the flow connects to a node referenced by HTTP",
-                                       "type": "string"
-                               },
-                               "imei": {
-                                       "description": "IMEI for the subscriber UE used in this flow, if the flow connects to a mobile device",
-                                       "type": "string"
-                               },
-                               "imsi": {
-                                       "description": "IMSI for the subscriber UE used in this flow, if the flow connects to a mobile device",
-                                       "type": "string"
-                               },
-                               "ipProtocolType": {
-                                       "description": "IP protocol type e.g., TCP, UDP, RTP...",
-                                       "type": "string"
-                               },
-                               "ipVersion": {
-                                       "description": "IP protocol version e.g., IPv4, IPv6",
-                                       "type": "string"
-                               },
-                               "lac": {
-                                       "description": "location area code",
-                                       "type": "string"
-                               },
-                               "mcc": {
-                                       "description": "mobile country code",
-                                       "type": "string"
-                               },
-                               "mnc": {
-                                       "description": "mobile network code",
-                                       "type": "string"
-                               },
-                "mobileFlowFieldsVersion": {
-                    "description": "version of the mobileFlowFields block",
-                    "type": "number"
-                },
-                               "msisdn": {
-                                       "description": "MSISDN for the subscriber UE used in this flow, as an integer, if the flow connects to a mobile device",
-                                       "type": "string"
-                               },
-                               "otherEndpointIpAddress": {
-                                       "description": "IP address for the other endpoint, as used for the flow being reported on",
-                                       "type": "string"
-                               },
-                               "otherEndpointPort": {
-                                       "description": "IP Port for the reporting entity, as used for the flow being reported on",
-                                       "type": "integer"
-                               },
-                               "otherFunctionalRole": {
-                                       "description": "Functional role of the other endpoint for the flow being reported on e.g., MME, S-GW, P-GW, PCRF...",
-                                       "type": "string"
-                               },
-                               "rac": {
-                                       "description": "routing area code",
-                                       "type": "string"
-                               },
-                               "radioAccessTechnology": {
-                                       "description": "Radio Access Technology e.g., 2G, 3G, LTE",
-                                       "type": "string"
-                               },
-                               "reportingEndpointIpAddr": {
-                                       "description": "IP address for the reporting entity, as used for the flow being reported on",
-                                       "type": "string"
-                               },
-                               "reportingEndpointPort": {
-                                       "description": "IP port for the reporting entity, as used for the flow being reported on",
-                                       "type": "integer"
-                               },
-                               "sac": {
-                                       "description": "service area code",
-                                       "type": "string"
-                               },
-                               "samplingAlgorithm": {
-                                       "description": "Integer identifier for the sampling algorithm or rule being applied in calculating the flow metrics if metrics are calculated based on a sample of packets, or 0 if no sampling is applied",
-                                       "type": "integer"
-                               },
-                               "tac": {
-                                       "description": "transport area code",
-                                       "type": "string"
-                               },
-                               "tunnelId": {
-                                       "description": "tunnel identifier",
-                                       "type": "string"
-                               },
-                               "vlanId": {
-                                       "description": "VLAN identifier used by this flow",
-                                       "type": "string"
-                               }
-                       },
-                       "required": [ "flowDirection", "gtpPerFlowMetrics", "ipProtocolType", "ipVersion",
-                                     "mobileFlowFieldsVersion", "otherEndpointIpAddress", "otherEndpointPort",
-                                     "reportingEndpointIpAddr", "reportingEndpointPort" ]
-               },
-               "namedArrayOfFields": {
-                       "description": "an array of name value pairs along with a name for the array",
-                       "type": "object",
-                       "properties": {
-                               "name":  { "type": "string" },
-                               "arrayOfFields": {
-                                       "description": "array of name value pairs",
-                                       "type": "array",
-                                       "items": {  
-                                               "$ref": "#/definitions/field" 
-                                       }
-                               }
-                       },
-                       "required": [ "name", "arrayOfFields" ]
-               },
-               "otherFields": {
-                       "description": "fields for events belonging to the 'other' domain of the commonEventHeader domain enumeration",
-                       "type": "object",
-                       "properties": {
-                               "hashOfNameValuePairArrays": {
-                                       "description": "array of named name-value-pair arrays",
-                                       "type": "array",
-                                       "items": {
-                                               "$ref": "#/definitions/namedArrayOfFields"
-                                       }
-                               },
-                "jsonObjects": {
-                    "description": "array of JSON objects described by name, schema and other meta-information",
-                                       "type": "array",
-                                       "items": {
-                        "$ref": "#/definitions/jsonObject"
-                                       }
-                },
-                               "nameValuePairs": {
-                                       "description": "array of name-value pairs",
-                                       "type": "array",
-                                       "items": {
-                                               "$ref": "#/definitions/field"
-                                       }
-                               },                              
-                "otherFieldsVersion": {
-                    "description": "version of the otherFields block",
-                    "type": "number"
-                }
-            },
-            "required": [ "otherFieldsVersion" ]
-               },
-               "requestError": {
-                       "description": "standard request error data structure",
-                       "type": "object",
-                       "properties": {
-                           "messageId": {
-                                       "description": "Unique message identifier of the format ABCnnnn where ABC is either SVC for Service Exceptions or POL for Policy Exception",
-                                       "type": "string"
-                               },
-                               "text": {
-                                       "description": "Message text, with replacement variables marked with %n, where n is an index into the list of <variables> elements, starting at 1",
-                                       "type": "string"
-                               },
-                               "url": {
-                                       "description": "Hyperlink to a detailed error resource e.g., an HTML page for browser user agents",
-                                       "type": "string"
-                               },
-                               "variables": {
-                                       "description": "List of zero or more strings that represent the contents of the variables used by the message text",
-                                       "type": "string"
-                               }
-                       },
-                       "required": [ "messageId", "text" ]
-               },
-        "sipSignalingFields": {
-            "description": "sip signaling fields",
-            "type": "object",
-            "properties": {
-                "additionalInformation": {
-                                       "description": "additional sip signaling fields if needed",
-                                       "type": "array",
-                                       "items": {  
-                                               "$ref": "#/definitions/field" 
-                                       }
-                },
-                "compressedSip": {
-                    "description": "the full SIP request/response including headers and bodies",
-                    "type": "string"
-                },
-                "correlator": {
-                    "description": "this is the same for all events on this call",
-                    "type": "string"
-                },
-                "localIpAddress": {
-                    "description": "IP address on VNF",
-                    "type": "string"
-                },
-                "localPort": {
-                    "description": "port on VNF",
-                    "type": "string"
-                },
-                "remoteIpAddress": {
-                    "description": "IP address of peer endpoint",
-                    "type": "string"
-                },
-                "remotePort": {
-                    "description": "port of peer endpoint",
-                    "type": "string"
-                },
-                "sipSignalingFieldsVersion": {
-                    "description": "version of the sipSignalingFields block",
-                    "type": "number"
-                },
-                "summarySip": {
-                    "description": "the SIP Method or Response (‘INVITE’, ‘200 OK’, ‘BYE’, etc)",
-                    "type": "string"
-                },
-                "vendorVnfNameFields": {
-                    "$ref": "#/definitions/vendorVnfNameFields"
-                }
-            },
-            "required": [ "correlator", "localIpAddress", "localPort", "remoteIpAddress", 
-                                     "remotePort", "sipSignalingFieldsVersion", "vendorVnfNameFields" ]
-        },
-               "stateChangeFields": {
-                       "description": "stateChange fields",
-                       "type": "object",
-                       "properties": {
-                               "additionalFields": {
-                                       "description": "additional stateChange fields if needed",
-                                       "type": "array",
-                                       "items": {
-                                               "$ref": "#/definitions/field"
-                                       }
-                               },
-                               "newState": {
-                                       "description": "new state of the entity",
-                                       "type": "string",
-                                       "enum": [
-                                               "inService",
-                                               "maintenance",
-                                               "outOfService"
-                                       ]
-                               },
-                               "oldState": {
-                                       "description": "previous state of the entity",
-                                       "type": "string",
-                                       "enum": [
-                                               "inService",
-                                               "maintenance",
-                                               "outOfService"
-                                       ]
-                               },
-                               "stateChangeFieldsVersion": {
-                                       "description": "version of the stateChangeFields block",
-                                       "type": "number"
-                               },
-                               "stateInterface": {
-                                       "description": "card or port name of the entity that changed state",
-                                       "type": "string"
-                               }
-                       },
-                       "required": [ "newState", "oldState", "stateChangeFieldsVersion", "stateInterface" ]
-               },
-               "suppressedNvPairs": {
-                       "description": "List of specific NvPairsNames to suppress within a given Name-Value Field for event Throttling",
-                       "type": "object",
-                       "properties": {
-                               "nvPairFieldName": {
-                                       "description": "Name of the field within which are the nvpair names to suppress",
-                                       "type": "string"
-                               },
-                               "suppressedNvPairNames": {
-                                       "description": "Array of nvpair names to suppress within the nvpairFieldName",
-                               "type": "array",
-                                       "items": {
-                                           "type": "string"
-                                       }
-                               }
-                       },
-                       "required": [ "nvPairFieldName", "suppressedNvPairNames" ]
-               },
-               "syslogFields": {
-                       "description": "sysLog fields",
-                       "type": "object",
-                       "properties": {
-                               "additionalFields": {
-                                       "description": "additional syslog fields if needed provided as name=value delimited by a pipe ‘|’ symbol, for example: 'name1=value1|name2=value2|…'",
-                                       "type": "string"
-                               },
-                               "eventSourceHost": {
-                                       "description": "hostname of the device",
-                                       "type": "string"
-                               },
-                               "eventSourceType": {
-                                       "description": "type of event source; examples: other, router, switch, host, card, port, slotThreshold, portThreshold, virtualMachine, virtualNetworkFunction",
-                                       "type": "string"
-                               },
-                               "syslogFacility": {
-                                       "description": "numeric code from 0 to 23 for facility--see table in documentation",
-                                       "type": "integer"
-                               },
-                               "syslogFieldsVersion": {
-                                       "description": "version of the syslogFields block",
-                                       "type": "number"
-                               },
-                               "syslogMsg": {
-                                       "description": "syslog message",
-                                       "type": "string"
-                               },
-                               "syslogPri": {
-                                       "description": "0-192 combined severity and facility",
-                                       "type": "integer"
-                               },
-                               "syslogProc": {
-                                       "description": "identifies the application that originated the message",
-                                       "type": "string"
-                               },
-                               "syslogProcId": {
-                                       "description": "a change in the value of this field indicates a discontinuity in syslog reporting",
-                                       "type": "number"
-                               },
-                               "syslogSData": {
-                                       "description": "syslog structured data consisting of a structured data Id followed by a set of key value pairs",
-                                       "type": "string"
-                               },
-                               "syslogSdId": {
-                                       "description": "0-32 char in format name@number for example ourSDID@32473",
-                                       "type": "string"
-                               },
-                               "syslogSev": {
-                                       "description": "numerical Code for  severity derived from syslogPri as remaider of syslogPri / 8",
-                                       "type": "string",
-                                       "enum": [
-                                               "Alert",
-                                               "Critical",
-                                               "Debug",
-                                               "Emergency",
-                                               "Error",
-                                               "Info",
-                                               "Notice",
-                                               "Warning"
-                                       ]
-                               },
-                               "syslogTag": {
-                                       "description": "msgId indicating the type of message such as TCPOUT or TCPIN; NILVALUE should be used when no other value can be provided",
-                                       "type": "string"
-                               },
-                               "syslogVer": {
-                                       "description": "IANA assigned version of the syslog protocol specification - typically 1",
-                                       "type": "number"
-                               }
-                       },
-                       "required": [ "eventSourceType", "syslogFieldsVersion", "syslogMsg", "syslogTag" ]
-               },
-               "thresholdCrossingAlertFields": {
-                       "description": "fields specific to threshold crossing alert events",
-                       "type": "object",
-                       "properties": {
-                               "additionalFields": {
-                                       "description": "additional threshold crossing alert fields if needed",
-                                       "type": "array",
-                                       "items": {  
-                                               "$ref": "#/definitions/field" 
-                                       }
-                               },
-                               "additionalParameters": {
-                                       "description": "performance counters",
-                                       "type": "array",
-                                       "items": {
-                                               "$ref": "#/definitions/counter"
-                                       }
-                               },
-                               "alertAction": {
-                                       "description": "Event action",
-                                       "type": "string",
-                                       "enum": [
-                                               "CLEAR",
-                                               "CONT",
-                                               "SET"
-                                       ]
-                               },
-                               "alertDescription": {
-                                       "description": "Unique short alert description such as IF-SHUB-ERRDROP",
-                                       "type": "string"
-                               },
-                               "alertType": {
-                                       "description": "Event type",
-                                       "type": "string",
-                                       "enum": [
-                                               "CARD-ANOMALY",
-                                               "ELEMENT-ANOMALY",
-                                               "INTERFACE-ANOMALY",
-                                               "SERVICE-ANOMALY"
-                                       ]
-                               },
-                               "alertValue": {
-                                       "description": "Calculated API value (if applicable)",
-                                       "type": "string"
-                               },
-                               "associatedAlertIdList": {
-                                       "description": "List of eventIds associated with the event being reported",
-                                       "type": "array",
-                                       "items": { "type": "string" }
-                               },
-                               "collectionTimestamp": {
-                                       "description": "Time when the performance collector picked up the data; with RFC 2822 compliant format: Sat, 13 Mar 2010 11:29:05 -0800",
-                                       "type": "string"
-                               },
-                               "dataCollector": {
-                                       "description": "Specific performance collector instance used",
-                                       "type": "string"
-                               },
-                               "elementType": {
-                                       "description": "type of network element - internal ATT field",
-                                       "type": "string"
-                               },
-                               "eventSeverity": {
-                                       "description": "event severity or priority",
-                                       "type": "string",
-                                       "enum": [
-                                               "CRITICAL",
-                                               "MAJOR",
-                                               "MINOR",
-                                               "WARNING",
-                                               "NORMAL"
-                                       ]
-                               },
-                               "eventStartTimestamp": {
-                                       "description": "Time closest to when the measurement was made; with RFC 2822 compliant format: Sat, 13 Mar 2010 11:29:05 -0800",
-                                       "type": "string"
-                               },
-                               "interfaceName": {
-                                       "description": "Physical or logical port or card (if applicable)",
-                                       "type": "string"
-                               },
-                               "networkService": {
-                                       "description": "network name - internal ATT field",
-                                       "type": "string"
-                               },
-                               "possibleRootCause": {
-                                       "description": "Reserved for future use",
-                                       "type": "string"
-                               },
-                               "thresholdCrossingFieldsVersion": {
-                                       "description": "version of the thresholdCrossingAlertFields block",
-                                       "type": "number"
-                               }
-                       },
-                       "required": [
-                               "additionalParameters",
-                               "alertAction",
-                               "alertDescription",
-                               "alertType",
-                               "collectionTimestamp",
-                               "eventSeverity",
-                               "eventStartTimestamp",
-                               "thresholdCrossingFieldsVersion"
-                       ]
-               },
-               "vendorVnfNameFields": {
-                       "description": "provides vendor, vnf and vfModule identifying information",
-                       "type": "object",
-                       "properties": {
-                               "vendorName": {
-                                       "description": "VNF vendor name",
-                                       "type": "string"
-                               },
-                               "vfModuleName": {
-                                       "description": "ASDC vfModuleName for the vfModule generating the event",
-                                       "type": "string"
-                               },
-                               "vnfName": {
-                                       "description": "ASDC modelName for the VNF generating the event",
-                                       "type": "string"
-                               }
-                       },
-                       "required": [ "vendorName" ]
-               },
-               "vNicPerformance": {
-                       "description": "describes the performance and errors of an identified virtual network interface card",
-                       "type": "object",
-                       "properties": {
-                               "receivedBroadcastPacketsAccumulated": {
-                                       "description": "Cumulative count of broadcast packets received as read at the end of the measurement interval",
-                                       "type": "number"
-                               },
-                               "receivedBroadcastPacketsDelta": {
-                                       "description": "Count of broadcast packets received within the measurement interval",
-                                       "type": "number"
-                               },
-                               "receivedDiscardedPacketsAccumulated": {
-                                       "description": "Cumulative count of discarded packets received as read at the end of the measurement interval",
-                                       "type": "number"
-                               },
-                               "receivedDiscardedPacketsDelta": {
-                                       "description": "Count of discarded packets received within the measurement interval",
-                                       "type": "number"
-                               },
-                               "receivedErrorPacketsAccumulated": {
-                                       "description": "Cumulative count of error packets received as read at the end of the measurement interval",
-                                       "type": "number"
-                               },
-                               "receivedErrorPacketsDelta": {
-                                       "description": "Count of error packets received within the measurement interval",
-                                       "type": "number"
-                               },
-                               "receivedMulticastPacketsAccumulated": {
-                                       "description": "Cumulative count of multicast packets received as read at the end of the measurement interval",
-                                       "type": "number"
-                               },
-                               "receivedMulticastPacketsDelta": {
-                                       "description": "Count of multicast packets received within the measurement interval",
-                                       "type": "number"
-                               },
-                               "receivedOctetsAccumulated": {
-                                       "description": "Cumulative count of octets received as read at the end of the measurement interval",
-                                       "type": "number"
-                               },
-                               "receivedOctetsDelta": {
-                                       "description": "Count of octets received within the measurement interval",
-                                       "type": "number"
-                               },
-                               "receivedTotalPacketsAccumulated": {
-                                       "description": "Cumulative count of all packets received as read at the end of the measurement interval",
-                                       "type": "number"
-                               },
-                               "receivedTotalPacketsDelta": {
-                                       "description": "Count of all packets received within the measurement interval",
-                                       "type": "number"
-                               },
-                               "receivedUnicastPacketsAccumulated": {
-                                       "description": "Cumulative count of unicast packets received as read at the end of the measurement interval",
-                                       "type": "number"
-                               },
-                               "receivedUnicastPacketsDelta": {
-                                       "description": "Count of unicast packets received within the measurement interval",
-                                       "type": "number"
-                               },
-                               "transmittedBroadcastPacketsAccumulated": {
-                                       "description": "Cumulative count of broadcast packets transmitted as read at the end of the measurement interval",
-                                       "type": "number"
-                               },
-                               "transmittedBroadcastPacketsDelta": {
-                                       "description": "Count of broadcast packets transmitted within the measurement interval",
-                                       "type": "number"
-                               },
-                               "transmittedDiscardedPacketsAccumulated": {
-                                       "description": "Cumulative count of discarded packets transmitted as read at the end of the measurement interval",
-                                       "type": "number"
-                               },
-                               "transmittedDiscardedPacketsDelta": {
-                                       "description": "Count of discarded packets transmitted within the measurement interval",
-                                       "type": "number"
-                               },
-                               "transmittedErrorPacketsAccumulated": {
-                                       "description": "Cumulative count of error packets transmitted as read at the end of the measurement interval",
-                                       "type": "number"
-                               },
-                               "transmittedErrorPacketsDelta": {
-                                       "description": "Count of error packets transmitted within the measurement interval",
-                                       "type": "number"
-                               },
-                               "transmittedMulticastPacketsAccumulated": {
-                                       "description": "Cumulative count of multicast packets transmitted as read at the end of the measurement interval",
-                                       "type": "number"
-                               },
-                               "transmittedMulticastPacketsDelta": {
-                                       "description": "Count of multicast packets transmitted within the measurement interval",
-                                       "type": "number"
-                               },
-                               "transmittedOctetsAccumulated": {
-                                       "description": "Cumulative count of octets transmitted as read at the end of the measurement interval",
-                                       "type": "number"
-                               },
-                               "transmittedOctetsDelta": {
-                                       "description": "Count of octets transmitted within the measurement interval",
-                                       "type": "number"
-                               },
-                               "transmittedTotalPacketsAccumulated": {
-                                       "description": "Cumulative count of all packets transmitted as read at the end of the measurement interval",
-                                       "type": "number"
-                               },
-                               "transmittedTotalPacketsDelta": {
-                                       "description": "Count of all packets transmitted within the measurement interval",
-                                       "type": "number"
-                               },
-                               "transmittedUnicastPacketsAccumulated": {
-                                       "description": "Cumulative count of unicast packets transmitted as read at the end of the measurement interval",
-                                       "type": "number"
-                               },
-                               "transmittedUnicastPacketsDelta": {
-                                       "description": "Count of unicast packets transmitted within the measurement interval",
-                                       "type": "number"
-                               },
-                               "valuesAreSuspect": {
-                                       "description": "Indicates whether vNicPerformance values are likely inaccurate due to counter overflow or other condtions",
-                                       "type": "string",
-                                       "enum": [ "true", "false" ]
-                               },
-                               "vNicIdentifier": {
-                                       "description": "vNic identification",
-                                       "type": "string"
-                               }
-                       },
-                       "required": [ "valuesAreSuspect", "vNicIdentifier" ]
-               },
-        "voiceQualityFields": {
-            "description": "provides statistics related to customer facing voice products",
-            "type": "object",
-            "properties": {
-                "additionalInformation": {
-                                       "description": "additional voice quality fields if needed",
-                                       "type": "array",
-                                       "items": {  
-                                               "$ref": "#/definitions/field" 
-                                       }
-                },
-                "calleeSideCodec": {
-                    "description": "callee codec for the call",
-                    "type": "string"
-                },
-                "callerSideCodec": {
-                    "description": "caller codec for the call",
-                    "type": "string"
-                },
-                "correlator": {
-                    "description": "this is the same for all events on this call",
-                    "type": "string"
-                },
-                "endOfCallVqmSummaries": {
-                    "$ref": "#/definitions/endOfCallVqmSummaries"
-                },
-                "phoneNumber": {
-                    "description": "phone number associated with the correlator",
-                    "type": "string"
-                },
-                "midCallRtcp": {
-                    "description": "Base64 encoding of the binary RTCP data excluding Eth/IP/UDP headers",
-                    "type": "string"
-                },
-                "vendorVnfNameFields": {
-                    "$ref": "#/definitions/vendorVnfNameFields"
-                },
-                "voiceQualityFieldsVersion": {
-                    "description": "version of the voiceQualityFields block",
-                    "type": "number"
-                }
-            },
-            "required": [ "calleeSideCodec", "callerSideCodec", "correlator", "midCallRtcp",
-                                     "vendorVnfNameFields", "voiceQualityFieldsVersion" ]
-        }
-       }
-}
\ No newline at end of file
diff --git a/solution/integration/smo/resources/CommonEventFormat_30.0.1.json b/solution/integration/smo/resources/CommonEventFormat_30.0.1.json
deleted file mode 100644 (file)
index ee51f2c..0000000
+++ /dev/null
@@ -1,2744 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "title": "VES Event Listener Common Event Format",
-  "type": "object",
-  "properties": {
-    "event": {
-      "$ref": "#/definitions/event"
-    },
-    "eventList": {
-      "$ref": "#/definitions/eventList"
-    }
-  },
-  "definitions": {
-    "schemaHeaderBlock": {
-      "description": "schema date, version, author and associated API",
-      "type": "object",
-      "properties": {
-        "associatedApi": {
-          "description": "VES Event Listener",
-          "type": "string"
-        },
-        "lastUpdatedBy": {
-          "description": "re2947",
-          "type": "string"
-        },
-        "schemaDate": {
-          "description": "July 31, 2018",
-          "type": "string"
-        },
-        "schemaVersion": {
-          "description": "30.0.1",
-          "type": "number"
-        }
-      }
-    },
-    "schemaLicenseAndCopyrightNotice": {
-      "description": "Copyright (c) 2018, AT&T Intellectual Property.  All rights reserved",
-      "type": "object",
-      "properties": {
-        "apacheLicense2.0": {
-          "description": "Licensed under the Apache License, Version 2.0 (the 'License'); you may not use this file except in compliance with the License. You may obtain a copy of the License at:",
-          "type": "string"
-        },
-        "licenseUrl": {
-          "description": "http://www.apache.org/licenses/LICENSE-2.0",
-          "type": "string"
-        },
-        "asIsClause": {
-          "description": "Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.",
-          "type": "string"
-        },
-        "permissionsAndLimitations": {
-          "description": "See the License for the specific language governing permissions and limitations under the License.",
-          "type": "string"
-        }
-      }
-    },
-    "arrayOfJsonObject": {
-      "description": "array of json objects described by name, schema and other meta-information",
-      "type": "array",
-      "items": {
-        "$ref": "#/definitions/jsonObject"
-      }
-    },
-    "arrayOfNamedHashMap": {
-      "description": "array of named hashMaps",
-      "type": "array",
-      "items": {
-        "$ref": "#/definitions/namedHashMap"
-      }
-    },
-    "codecsInUse": {
-      "description": "number of times an identified codec was used over the measurementInterval",
-      "type": "object",
-      "properties": {
-        "codecIdentifier": {
-          "type": "string"
-        },
-        "numberInUse": {
-          "type": "integer"
-        }
-      },
-      "additionalProperties": false,
-      "required": [
-        "codecIdentifier",
-        "numberInUse"
-      ]
-    },
-    "commonEventHeader": {
-      "description": "fields common to all events",
-      "type": "object",
-      "properties": {
-        "domain": {
-          "description": "the eventing domain associated with the event",
-          "type": "string",
-          "enum": [
-            "fault",
-            "heartbeat",
-            "measurement",
-            "mobileFlow",
-            "notification",
-            "other",
-            "pnfRegistration",
-            "sipSignaling",
-            "stateChange",
-            "syslog",
-            "thresholdCrossingAlert",
-            "voiceQuality"
-          ]
-        },
-        "eventId": {
-          "description": "event key that is unique to the event source",
-          "type": "string"
-        },
-        "eventName": {
-          "description": "unique event name",
-          "type": "string"
-        },
-        "eventType": {
-          "description": "for example - applicationNf, guestOS, hostOS, platform",
-          "type": "string"
-        },
-        "internalHeaderFields": {
-          "$ref": "#/definitions/internalHeaderFields"
-        },
-        "lastEpochMicrosec": {
-          "description": "the latest unix time aka epoch time associated with the event from any component--as microseconds elapsed since 1 Jan 1970 not including leap seconds",
-          "type": "number"
-        },
-        "nfcNamingCode": {
-          "description": "3 character network function component type, aligned with vfc naming standards",
-          "type": "string"
-        },
-        "nfNamingCode": {
-          "description": "4 character network function type, aligned with nf naming standards",
-          "type": "string"
-        },
-        "nfVendorName": {
-          "description": "network function vendor name",
-          "type": "string"
-        },
-        "priority": {
-          "description": "processing priority",
-          "type": "string",
-          "enum": [
-            "High",
-            "Medium",
-            "Normal",
-            "Low"
-          ]
-        },
-        "reportingEntityId": {
-          "description": "UUID identifying the entity reporting the event, for example an OAM VM; must be populated by the ATT enrichment process",
-          "type": "string"
-        },
-        "reportingEntityName": {
-          "description": "name of the entity reporting the event, for example, an EMS name; may be the same as sourceName",
-          "type": "string"
-        },
-        "sequence": {
-          "description": "ordering of events communicated by an event source instance or 0 if not needed",
-          "type": "integer"
-        },
-        "sourceId": {
-          "description": "UUID identifying the entity experiencing the event issue; must be populated by the ATT enrichment process",
-          "type": "string"
-        },
-        "sourceName": {
-          "description": "name of the entity experiencing the event issue",
-          "type": "string"
-        },
-        "startEpochMicrosec": {
-          "description": "the earliest unix time aka epoch time associated with the event from any component--as microseconds elapsed since 1 Jan 1970 not including leap seconds",
-          "type": "number"
-        },
-        "timeZoneOffset": {
-          "description": "UTC offset for the local time zone of the device as UTC+/-hh.mm",
-          "type": "string"
-        },
-        "version": {
-          "description": "version of the event header",
-          "type": "string",
-          "enum": [
-            "4.0.1"
-          ]
-        },
-        "vesEventListenerVersion": {
-          "description": "version of the VES Event Listener API",
-          "type": "string",
-          "enum": [
-            "7.0.1"
-          ]
-        }
-      },
-      "additionalProperties": false,
-      "required": [
-        "domain",
-        "eventId",
-        "eventName",
-        "lastEpochMicrosec",
-        "priority",
-        "reportingEntityName",
-        "sequence",
-        "sourceName",
-        "startEpochMicrosec",
-        "version",
-        "vesEventListenerVersion"
-      ]
-    },
-    "counter": {
-      "description": "performance counter",
-      "type": "object",
-      "properties": {
-        "criticality": {
-          "type": "string",
-          "enum": [
-            "CRIT",
-            "MAJ"
-          ]
-        },
-        "hashMap": {
-          "$ref": "#/definitions/hashMap"
-        },
-        "thresholdCrossed": {
-          "type": "string"
-        }
-      },
-      "additionalProperties": false,
-      "required": [
-        "criticality",
-        "hashMap",
-        "thresholdCrossed"
-      ]
-    },
-    "cpuUsage": {
-      "description": "usage of an identified CPU",
-      "type": "object",
-      "properties": {
-        "cpuCapacityContention": {
-          "description": "the amount of time the CPU cannot run due to contention, in milliseconds over the measurementInterval",
-          "type": "number"
-        },
-        "cpuDemandAvg": {
-          "description": "the total CPU time that the NF/NFC/VM could use if there was no contention, in milliseconds over the measurementInterval",
-          "type": "number"
-        },
-        "cpuDemandMhz": {
-          "description": "CPU demand in megahertz",
-          "type": "number"
-        },
-        "cpuDemandPct": {
-          "description": "CPU demand as a percentage of the provisioned capacity",
-          "type": "number"
-        },
-        "cpuIdentifier": {
-          "description": "cpu identifer",
-          "type": "string"
-        },
-        "cpuIdle": {
-          "description": "percentage of CPU time spent in the idle task",
-          "type": "number"
-        },
-        "cpuLatencyAvg": {
-          "description": "percentage of time the VM is unable to run because it is contending for access to the physical CPUs",
-          "type": "number"
-        },
-        "cpuOverheadAvg": {
-          "description": "the overhead demand above available allocations and reservations, in milliseconds over the measurementInterval",
-          "type": "number"
-        },
-        "cpuSwapWaitTime": {
-          "description": "swap wait time. in milliseconds over the measurementInterval",
-          "type": "number"
-        },
-        "cpuUsageInterrupt": {
-          "description": "percentage of time spent servicing interrupts",
-          "type": "number"
-        },
-        "cpuUsageNice": {
-          "description": "percentage of time spent running user space processes that have been niced",
-          "type": "number"
-        },
-        "cpuUsageSoftIrq": {
-          "description": "percentage of time spent handling soft irq interrupts",
-          "type": "number"
-        },
-        "cpuUsageSteal": {
-          "description": "percentage of time spent in involuntary wait which is neither user, system or idle time and is effectively time that went missing",
-          "type": "number"
-        },
-        "cpuUsageSystem": {
-          "description": "percentage of time spent on system tasks running the kernel",
-          "type": "number"
-        },
-        "cpuUsageUser": {
-          "description": "percentage of time spent running un-niced user space processes",
-          "type": "number"
-        },
-        "cpuWait": {
-          "description": "percentage of CPU time spent waiting for I/O operations to complete",
-          "type": "number"
-        },
-        "percentUsage": {
-          "description": "aggregate cpu usage of the virtual machine on which the xNFC reporting the event is running",
-          "type": "number"
-        }
-      },
-      "additionalProperties": false,
-      "required": [
-        "cpuIdentifier",
-        "percentUsage"
-      ]
-    },
-    "diskUsage": {
-      "description": "usage of an identified disk",
-      "type": "object",
-      "properties": {
-        "diskBusResets": {
-          "description": "number of bus resets over the measurementInterval",
-          "type": "number"
-        },
-        "diskCommandsAborted": {
-          "description": "number of disk commands aborted over the measurementInterval",
-          "type": "number"
-        },
-        "diskCommandsAvg": {
-          "description": "average number of commands per second over the measurementInterval",
-          "type": "number"
-        },
-        "diskFlushRequests": {
-          "description": "total flush requests of the disk cache over the measurementInterval",
-          "type": "number"
-        },
-        "diskFlushTime": {
-          "description": "milliseconds spent on disk cache flushing over the measurementInterval",
-          "type": "number"
-        },
-        "diskIdentifier": {
-          "description": "disk identifier",
-          "type": "string"
-        },
-        "diskIoTimeAvg": {
-          "description": "milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms  matches 100% load; provide the average over the measurement interval",
-          "type": "number"
-        },
-        "diskIoTimeLast": {
-          "description": "milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms  matches 100% load; provide the last value measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskIoTimeMax": {
-          "description": "milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms  matches 100% load; provide the maximum value measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskIoTimeMin": {
-          "description": "milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms  matches 100% load; provide the minimum value measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskMergedReadAvg": {
-          "description": "number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the average measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskMergedReadLast": {
-          "description": "number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the last value measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskMergedReadMax": {
-          "description": "number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the maximum value measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskMergedReadMin": {
-          "description": "number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the minimum value measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskMergedWriteAvg": {
-          "description": "number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the average measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskMergedWriteLast": {
-          "description": "number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the last value measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskMergedWriteMax": {
-          "description": "number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the maximum value measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskMergedWriteMin": {
-          "description": "number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the minimum value measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskOctetsReadAvg": {
-          "description": "number of octets per second read from a disk or partition; provide the average measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskOctetsReadLast": {
-          "description": "number of octets per second read from a disk or partition; provide the last measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskOctetsReadMax": {
-          "description": "number of octets per second read from a disk or partition; provide the maximum measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskOctetsReadMin": {
-          "description": "number of octets per second read from a disk or partition; provide the minimum measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskOctetsWriteAvg": {
-          "description": "number of octets per second written to a disk or partition; provide the average measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskOctetsWriteLast": {
-          "description": "number of octets per second written to a disk or partition; provide the last measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskOctetsWriteMax": {
-          "description": "number of octets per second written to a disk or partition; provide the maximum measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskOctetsWriteMin": {
-          "description": "number of octets per second written to a disk or partition; provide the minimum measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskOpsReadAvg": {
-          "description": "number of read operations per second issued to the disk; provide the average measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskOpsReadLast": {
-          "description": "number of read operations per second issued to the disk; provide the last measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskOpsReadMax": {
-          "description": "number of read operations per second issued to the disk; provide the maximum measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskOpsReadMin": {
-          "description": "number of read operations per second issued to the disk; provide the minimum measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskOpsWriteAvg": {
-          "description": "number of write operations per second issued to the disk; provide the average measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskOpsWriteLast": {
-          "description": "number of write operations per second issued to the disk; provide the last measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskOpsWriteMax": {
-          "description": "number of write operations per second issued to the disk; provide the maximum measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskOpsWriteMin": {
-          "description": "number of write operations per second issued to the disk; provide the minimum measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskPendingOperationsAvg": {
-          "description": "queue size of pending I/O operations per second; provide the average measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskPendingOperationsLast": {
-          "description": "queue size of pending I/O operations per second; provide the last measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskPendingOperationsMax": {
-          "description": "queue size of pending I/O operations per second; provide the maximum measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskPendingOperationsMin": {
-          "description": "queue size of pending I/O operations per second; provide the minimum measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskReadCommandsAvg": {
-          "description": "average number of read commands issued per second to the disk over the measurementInterval",
-          "type": "number"
-        },
-        "diskTime": {
-          "description": "nanoseconds spent on disk cache reads/writes within the measurement interval",
-          "type": "number"
-        },
-        "diskTimeReadAvg": {
-          "description": "milliseconds a read operation took to complete; provide the average measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskTimeReadLast": {
-          "description": "milliseconds a read operation took to complete; provide the last measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskTimeReadMax": {
-          "description": "milliseconds a read operation took to complete; provide the maximum measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskTimeReadMin": {
-          "description": "milliseconds a read operation took to complete; provide the minimum measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskTimeWriteAvg": {
-          "description": "milliseconds a write operation took to complete; provide the average measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskTimeWriteLast": {
-          "description": "milliseconds a write operation took to complete; provide the last measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskTimeWriteMax": {
-          "description": "milliseconds a write operation took to complete; provide the maximum measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskTimeWriteMin": {
-          "description": "milliseconds a write operation took to complete; provide the minimum measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskTotalReadLatencyAvg": {
-          "description": "average read time from the perspective of a Guest OS: sum of the Kernel Read Latency and Physical Device Read Latency in milliseconds over the measurement interval",
-          "type": "number"
-        },
-        "diskTotalWriteLatencyAvg": {
-          "description": "average write time from the perspective of a Guest OS: sum of the Kernel Write Latency and Physical Device Write Latency in milliseconds over the measurement interval",
-          "type": "number"
-        },
-        "diskWeightedIoTimeAvg": {
-          "description": "measure in ms over 1 sec of both I/O completion time and the backlog that may be accumulating; value is the average within the collection interval",
-          "type": "number"
-        },
-        "diskWeightedIoTimeLast": {
-          "description": "measure in ms over 1 sec of both I/O completion time and the backlog that may be accumulating; value is the last within the collection interval",
-          "type": "number"
-        },
-        "diskWeightedIoTimeMax": {
-          "description": "measure in ms over 1 sec of both I/O completion time and the backlog that may be accumulating; value is the maximum within the collection interval",
-          "type": "number"
-        },
-        "diskWeightedIoTimeMin": {
-          "description": "measure in ms over 1 sec of both I/O completion time and the backlog that may be accumulating; value is the minimum within the collection interval",
-          "type": "number"
-        },
-        "diskWriteCommandsAvg": {
-          "description": "average number of write commands issued per second to the disk over the measurementInterval",
-          "type": "number"
-        }
-      },
-      "additionalProperties": false,
-      "required": [
-        "diskIdentifier"
-      ]
-    },
-    "endOfCallVqmSummaries": {
-      "description": "provides end of call voice quality metrics",
-      "type": "object",
-      "properties": {
-        "adjacencyName": {
-          "description": " adjacency name",
-          "type": "string"
-        },
-        "endpointAverageJitter": {
-          "description": "endpoint average jitter",
-          "type": "number"
-        },
-        "endpointDescription": {
-          "description": "either Caller or Callee",
-          "type": "string",
-          "enum": [
-            "Caller",
-            "Callee"
-          ]
-        },
-        "endpointMaxJitter": {
-          "description": "endpoint maximum jitter",
-          "type": "number"
-        },
-        "endpointRtpOctetsDiscarded": {
-          "description": "",
-          "type": "number"
-        },
-        "endpointRtpOctetsLost": {
-          "description": "endpoint RTP octets lost",
-          "type": "number"
-        },
-        "endpointRtpOctetsReceived": {
-          "description": "",
-          "type": "number"
-        },
-        "endpointRtpOctetsSent": {
-          "description": "",
-          "type": "number"
-        },
-        "endpointRtpPacketsDiscarded": {
-          "description": "",
-          "type": "number"
-        },
-        "endpointRtpPacketsLost": {
-          "description": "endpoint RTP packets lost",
-          "type": "number"
-        },
-        "endpointRtpPacketsReceived": {
-          "description": "",
-          "type": "number"
-        },
-        "endpointRtpPacketsSent": {
-          "description": "",
-          "type": "number"
-        },
-        "localAverageJitter": {
-          "description": "Local average jitter",
-          "type": "number"
-        },
-        "localAverageJitterBufferDelay": {
-          "description": "Local average jitter delay",
-          "type": "number"
-        },
-        "localMaxJitter": {
-          "description": "Local maximum jitter",
-          "type": "number"
-        },
-        "localMaxJitterBufferDelay": {
-          "description": "Local maximum jitter delay",
-          "type": "number"
-        },
-        "localRtpOctetsDiscarded": {
-          "description": "",
-          "type": "number"
-        },
-        "localRtpOctetsLost": {
-          "description": "Local RTP octets lost",
-          "type": "number"
-        },
-        "localRtpOctetsReceived": {
-          "description": "",
-          "type": "number"
-        },
-        "localRtpOctetsSent": {
-          "description": "",
-          "type": "number"
-        },
-        "localRtpPacketsDiscarded": {
-          "description": "",
-          "type": "number"
-        },
-        "localRtpPacketsLost": {
-          "description": "Local RTP packets lost",
-          "type": "number"
-        },
-        "localRtpPacketsReceived": {
-          "description": "",
-          "type": "number"
-        },
-        "localRtpPacketsSent": {
-          "description": "",
-          "type": "number"
-        },
-        "mosCqe": {
-          "description": "1-5 1dp",
-          "type": "number"
-        },
-        "oneWayDelay": {
-          "description": "one-way path delay in milliseconds",
-          "type": "number"
-        },
-        "packetLossPercent": {
-          "description": "Calculated percentage packet loss based on Endpoint RTP packets lost (as reported in RTCP) and Local RTP packets sent. Direction is based on Endpoint description (Caller, Callee). Decimal (2 dp)",
-          "type": "number"
-        },
-        "rFactor": {
-          "description": "0-100",
-          "type": "number"
-        },
-        "roundTripDelay": {
-          "description": "millisecs",
-          "type": "number"
-        }
-      },
-      "additionalProperties": false,
-      "required": [
-        "adjacencyName",
-        "endpointDescription"
-      ]
-    },
-    "event": {
-      "description": "the root level of the common event format",
-      "type": "object",
-      "properties": {
-        "commonEventHeader": {
-          "$ref": "#/definitions/commonEventHeader"
-        },
-        "faultFields": {
-          "$ref": "#/definitions/faultFields"
-        },
-        "heartbeatFields": {
-          "$ref": "#/definitions/heartbeatFields"
-        },
-        "measurementFields": {
-          "$ref": "#/definitions/measurementFields"
-        },
-        "mobileFlowFields": {
-          "$ref": "#/definitions/mobileFlowFields"
-        },
-        "notificationFields": {
-          "$ref": "#/definitions/notificationFields"
-        },
-        "otherFields": {
-          "$ref": "#/definitions/otherFields"
-        },
-        "pnfRegistrationFields": {
-          "$ref": "#/definitions/pnfRegistrationFields"
-        },
-        "sipSignalingFields": {
-          "$ref": "#/definitions/sipSignalingFields"
-        },
-        "stateChangeFields": {
-          "$ref": "#/definitions/stateChangeFields"
-        },
-        "syslogFields": {
-          "$ref": "#/definitions/syslogFields"
-        },
-        "thresholdCrossingAlertFields": {
-          "$ref": "#/definitions/thresholdCrossingAlertFields"
-        },
-        "voiceQualityFields": {
-          "$ref": "#/definitions/voiceQualityFields"
-        }
-      },
-      "additionalProperties": false,
-      "required": [
-        "commonEventHeader"
-      ]
-    },
-    "eventList": {
-      "description": "array of events",
-      "type": "array",
-      "items": {
-        "$ref": "#/definitions/event"
-      }
-    },
-    "faultFields": {
-      "description": "fields specific to fault events",
-      "type": "object",
-      "properties": {
-        "alarmAdditionalInformation": {
-          "$ref": "#/definitions/hashMap"
-        },
-        "alarmCondition": {
-          "description": "alarm condition reported by the device",
-          "type": "string"
-        },
-        "alarmInterfaceA": {
-          "description": "card, port, channel or interface name of the device generating the alarm",
-          "type": "string"
-        },
-        "eventCategory": {
-          "description": "Event category, for example: license, link, routing, security, signaling",
-          "type": "string"
-        },
-        "eventSeverity": {
-          "description": "event severity",
-          "type": "string",
-          "enum": [
-            "CRITICAL",
-            "MAJOR",
-            "MINOR",
-            "WARNING",
-            "NORMAL"
-          ]
-        },
-        "eventSourceType": {
-          "description": "type of event source; examples: card, host, other, port, portThreshold, router, slotThreshold, switch, virtualMachine, virtualNetworkFunction",
-          "type": "string"
-        },
-        "faultFieldsVersion": {
-          "description": "version of the faultFields block",
-          "type": "string",
-          "enum": [
-            "4.0"
-          ]
-        },
-        "specificProblem": {
-          "description": "short description of the alarm or problem",
-          "type": "string"
-        },
-        "vfStatus": {
-          "description": "virtual function status enumeration",
-          "type": "string",
-          "enum": [
-            "Active",
-            "Idle",
-            "Preparing to terminate",
-            "Ready to terminate",
-            "Requesting termination"
-          ]
-        }
-      },
-      "additionalProperties": false,
-      "required": [
-        "alarmCondition",
-        "eventSeverity",
-        "eventSourceType",
-        "faultFieldsVersion",
-        "specificProblem",
-        "vfStatus"
-      ]
-    },
-    "filesystemUsage": {
-      "description": "disk usage of an identified virtual machine in gigabytes and/or gigabytes per second",
-      "type": "object",
-      "properties": {
-        "blockConfigured": {
-          "type": "number"
-        },
-        "blockIops": {
-          "type": "number"
-        },
-        "blockUsed": {
-          "type": "number"
-        },
-        "ephemeralConfigured": {
-          "type": "number"
-        },
-        "ephemeralIops": {
-          "type": "number"
-        },
-        "ephemeralUsed": {
-          "type": "number"
-        },
-        "filesystemName": {
-          "type": "string"
-        }
-      },
-      "additionalProperties": false,
-      "required": [
-        "blockConfigured",
-        "blockIops",
-        "blockUsed",
-        "ephemeralConfigured",
-        "ephemeralIops",
-        "ephemeralUsed",
-        "filesystemName"
-      ]
-    },
-    "gtpPerFlowMetrics": {
-      "description": "Mobility GTP Protocol per flow metrics",
-      "type": "object",
-      "properties": {
-        "avgBitErrorRate": {
-          "description": "average bit error rate",
-          "type": "number"
-        },
-        "avgPacketDelayVariation": {
-          "description": "Average packet delay variation or jitter in milliseconds for received packets: Average difference between the packet timestamp and time received for all pairs of consecutive packets",
-          "type": "number"
-        },
-        "avgPacketLatency": {
-          "description": "average delivery latency",
-          "type": "number"
-        },
-        "avgReceiveThroughput": {
-          "description": "average receive throughput",
-          "type": "number"
-        },
-        "avgTransmitThroughput": {
-          "description": "average transmit throughput",
-          "type": "number"
-        },
-        "durConnectionFailedStatus": {
-          "description": "duration of failed state in milliseconds, computed as the cumulative time between a failed echo request and the next following successful error request, over this reporting interval",
-          "type": "number"
-        },
-        "durTunnelFailedStatus": {
-          "description": "Duration of errored state, computed as the cumulative time between a tunnel error indicator and the next following non-errored indicator, over this reporting interval",
-          "type": "number"
-        },
-        "flowActivatedBy": {
-          "description": "Endpoint activating the flow",
-          "type": "string"
-        },
-        "flowActivationEpoch": {
-          "description": "Time the connection is activated in the flow (connection) being reported on, or transmission time of the first packet if activation time is not available",
-          "type": "number"
-        },
-        "flowActivationMicrosec": {
-          "description": "Integer microseconds for the start of the flow connection",
-          "type": "number"
-        },
-        "flowActivationTime": {
-          "description": "time the connection is activated in the flow being reported on, or transmission time of the first packet if activation time is not available; with RFC 2822 compliant format: Sat, 13 Mar 2010 11:29:05 -0800",
-          "type": "string"
-        },
-        "flowDeactivatedBy": {
-          "description": "Endpoint deactivating the flow",
-          "type": "string"
-        },
-        "flowDeactivationEpoch": {
-          "description": "Time for the start of the flow connection, in integer UTC epoch time aka UNIX time",
-          "type": "number"
-        },
-        "flowDeactivationMicrosec": {
-          "description": "Integer microseconds for the start of the flow connection",
-          "type": "number"
-        },
-        "flowDeactivationTime": {
-          "description": "Transmission time of the first packet in the flow connection being reported on; with RFC 2822 compliant format: Sat, 13 Mar 2010 11:29:05 -0800",
-          "type": "string"
-        },
-        "flowStatus": {
-          "description": "connection status at reporting time as a working / inactive / failed indicator value",
-          "type": "string"
-        },
-        "gtpConnectionStatus": {
-          "description": "Current connection state at reporting time",
-          "type": "string"
-        },
-        "gtpTunnelStatus": {
-          "description": "Current tunnel state  at reporting time",
-          "type": "string"
-        },
-        "ipTosCountList": {
-          "$ref": "#/definitions/hashMap"
-        },
-        "ipTosList": {
-          "description": "Array of unique IP Type-of-Service values observed in the flow where values range from '0' to '255'",
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        },
-        "largePacketRtt": {
-          "description": "large packet round trip time",
-          "type": "number"
-        },
-        "largePacketThreshold": {
-          "description": "large packet threshold being applied",
-          "type": "number"
-        },
-        "maxPacketDelayVariation": {
-          "description": "Maximum packet delay variation or jitter in milliseconds for received packets: Maximum of the difference between the packet timestamp and time received for all pairs of consecutive packets",
-          "type": "number"
-        },
-        "maxReceiveBitRate": {
-          "description": "maximum receive bit rate",
-          "type": "number"
-        },
-        "maxTransmitBitRate": {
-          "description": "maximum transmit bit rate",
-          "type": "number"
-        },
-        "mobileQciCosCountList": {
-          "$ref": "#/definitions/hashMap"
-        },
-        "mobileQciCosList": {
-          "description": "Array of unique LTE QCI or UMTS class-of-service values observed in the flow",
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        },
-        "numActivationFailures": {
-          "description": "Number of failed activation requests, as observed by the reporting node",
-          "type": "number"
-        },
-        "numBitErrors": {
-          "description": "number of errored bits",
-          "type": "number"
-        },
-        "numBytesReceived": {
-          "description": "number of bytes received, including retransmissions",
-          "type": "number"
-        },
-        "numBytesTransmitted": {
-          "description": "number of bytes transmitted, including retransmissions",
-          "type": "number"
-        },
-        "numDroppedPackets": {
-          "description": "number of received packets dropped due to errors per virtual interface",
-          "type": "number"
-        },
-        "numGtpEchoFailures": {
-          "description": "Number of Echo request path failures where failed paths are defined in 3GPP TS 29.281 sec 7.2.1 and 3GPP TS 29.060 sec. 11.2",
-          "type": "number"
-        },
-        "numGtpTunnelErrors": {
-          "description": "Number of tunnel error indications where errors are defined in 3GPP TS 29.281 sec 7.3.1 and 3GPP TS 29.060 sec. 11.1",
-          "type": "number"
-        },
-        "numHttpErrors": {
-          "description": "Http error count",
-          "type": "number"
-        },
-        "numL7BytesReceived": {
-          "description": "number of tunneled layer 7 bytes received, including retransmissions",
-          "type": "number"
-        },
-        "numL7BytesTransmitted": {
-          "description": "number of tunneled layer 7 bytes transmitted, excluding retransmissions",
-          "type": "number"
-        },
-        "numLostPackets": {
-          "description": "number of lost packets",
-          "type": "number"
-        },
-        "numOutOfOrderPackets": {
-          "description": "number of out-of-order packets",
-          "type": "number"
-        },
-        "numPacketErrors": {
-          "description": "number of errored packets",
-          "type": "number"
-        },
-        "numPacketsReceivedExclRetrans": {
-          "description": "number of packets received, excluding retransmission",
-          "type": "number"
-        },
-        "numPacketsReceivedInclRetrans": {
-          "description": "number of packets received, including retransmission",
-          "type": "number"
-        },
-        "numPacketsTransmittedInclRetrans": {
-          "description": "number of packets transmitted, including retransmissions",
-          "type": "number"
-        },
-        "numRetries": {
-          "description": "number of packet retries",
-          "type": "number"
-        },
-        "numTimeouts": {
-          "description": "number of packet timeouts",
-          "type": "number"
-        },
-        "numTunneledL7BytesReceived": {
-          "description": "number of tunneled layer 7 bytes received, excluding retransmissions",
-          "type": "number"
-        },
-        "roundTripTime": {
-          "description": "round trip time",
-          "type": "number"
-        },
-        "tcpFlagCountList": {
-          "$ref": "#/definitions/hashMap"
-        },
-        "tcpFlagList": {
-          "description": "Array of unique TCP Flags observed in the flow",
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        },
-        "timeToFirstByte": {
-          "description": "Time in milliseconds between the connection activation and first byte received",
-          "type": "number"
-        }
-      },
-      "additionalProperties": false,
-      "required": [
-        "avgBitErrorRate",
-        "avgPacketDelayVariation",
-        "avgPacketLatency",
-        "avgReceiveThroughput",
-        "avgTransmitThroughput",
-        "flowActivationEpoch",
-        "flowActivationMicrosec",
-        "flowDeactivationEpoch",
-        "flowDeactivationMicrosec",
-        "flowDeactivationTime",
-        "flowStatus",
-        "maxPacketDelayVariation",
-        "numActivationFailures",
-        "numBitErrors",
-        "numBytesReceived",
-        "numBytesTransmitted",
-        "numDroppedPackets",
-        "numL7BytesReceived",
-        "numL7BytesTransmitted",
-        "numLostPackets",
-        "numOutOfOrderPackets",
-        "numPacketErrors",
-        "numPacketsReceivedExclRetrans",
-        "numPacketsReceivedInclRetrans",
-        "numPacketsTransmittedInclRetrans",
-        "numRetries",
-        "numTimeouts",
-        "numTunneledL7BytesReceived",
-        "roundTripTime",
-        "timeToFirstByte"
-      ]
-    },
-    "hashMap": {
-      "description": "an associative array which is an array of key:value pairs",
-      "type": "object",
-      "additionalProperties": {
-        "type": "string"
-      },
-      "default": {}
-    },
-    "heartbeatFields": {
-      "description": "optional field block for fields specific to heartbeat events",
-      "type": "object",
-      "properties": {
-        "additionalFields": {
-          "$ref": "#/definitions/hashMap"
-        },
-        "heartbeatFieldsVersion": {
-          "description": "version of the heartbeatFields block",
-          "type": "string",
-          "enum": [
-            "3.0"
-          ]
-        },
-        "heartbeatInterval": {
-          "description": "current heartbeat interval in seconds",
-          "type": "integer"
-        }
-      },
-      "additionalProperties": false,
-      "required": [
-        "heartbeatFieldsVersion",
-        "heartbeatInterval"
-      ]
-    },
-    "hugePages": {
-      "description": "metrics on system hugepages",
-      "type": "object",
-      "properties": {
-        "bytesFree": {
-          "description": "number of free hugepages in bytes",
-          "type": "number"
-        },
-        "bytesUsed": {
-          "description": "number of used hugepages in bytes",
-          "type": "number"
-        },
-        "hugePagesIdentifier": {
-          "description": "hugePages identifier",
-          "type": "number"
-        },
-        "percentFree": {
-          "description": "number of free hugepages in percent",
-          "type": "number"
-        },
-        "percentUsed": {
-          "description": "number of free hugepages in percent",
-          "type": "number"
-        },
-        "vmPageNumberFree": {
-          "description": "number of free vmPages in numbers",
-          "type": "number"
-        },
-        "vmPageNumberUsed": {
-          "description": "number of used vmPages in numbers",
-          "type": "number"
-        }
-      },
-      "additionalProperties": false,
-      "required": [
-        "hugePagesIdentifier"
-      ]
-    },
-    "internalHeaderFields": {
-      "description": "enrichment fields for internal VES Event Listener service use only, not supplied by event sources",
-      "type": "object"
-    },
-    "ipmi": {
-      "description": "intelligent platform management interface metrics",
-      "type": "object",
-      "properties": {
-        "exitAirTemperature": {
-          "description": "system fan exit air flow temperature in celsius",
-          "type": "number"
-        },
-        "frontPanelTemperature": {
-          "description": "front panel temperature in celsius",
-          "type": "number"
-        },
-        "ioModuleTemperature": {
-          "description": "io module temperature in celsius",
-          "type": "number"
-        },
-        "ipmiBaseboardTemperatureArray": {
-          "description": "array of ipmiBaseboardTemperature objects",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/ipmiBaseboardTemperature"
-          }
-        },
-        "ipmiBaseboardVoltageRegulatorArray": {
-          "description": "array of ipmiBaseboardVoltageRegulator objects",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/ipmiBaseboardVoltageRegulator"
-          }
-        },
-        "ipmiBatteryArray": {
-          "description": "array of ipmiBattery objects",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/ipmiBattery"
-          }
-        },
-        "ipmiFanArray": {
-          "description": "array of ipmiFan objects",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/ipmiFan"
-          }
-        },
-        "ipmiHsbpArray": {
-          "description": "array of ipmiHsbp objects",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/ipmiHsbp"
-          }
-        },
-        "ipmiGlobalAggregateTemperatureMarginArray": {
-          "description": "array of ipmiGlobalAggregateTemperatureMargin objects",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/ipmiGlobalAggregateTemperatureMargin"
-          }
-        },
-        "ipmiNicArray": {
-          "description": "array of ipmiNic objects",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/ipmiNic"
-          }
-        },
-        "ipmiPowerSupplyArray": {
-          "description": "array of ipmiPowerSupply objects",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/ipmiPowerSupply"
-          }
-        },
-        "ipmiProcessorArray": {
-          "description": "array of ipmiProcessor objects",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/ipmiProcessor"
-          }
-        },
-        "systemAirflow": {
-          "description": "airfflow in cubic feet per minute (cfm)",
-          "type": "number"
-        }
-      },
-      "additionalProperties": false
-    },
-    "ipmiBaseboardTemperature": {
-      "description": "intelligent platform management interface (ipmi) baseboard temperature metrics",
-      "type": "object",
-      "properties": {
-        "baseboardTemperatureIdentifier": {
-          "description": "identifier for the location where the temperature is taken",
-          "type": "string"
-        },
-        "baseboardTemperature": {
-          "description": "baseboard temperature in celsius",
-          "type": "number"
-        }
-      },
-      "additionalProperties": false,
-      "required": [
-        "baseboardTemperatureIdentifier"
-      ]
-    },
-    "ipmiBaseboardVoltageRegulator": {
-      "description": "intelligent platform management interface (ipmi) baseboard voltage regulator metrics",
-      "type": "object",
-      "properties": {
-        "baseboardVoltageRegulatorIdentifier": {
-          "description": "identifier for the baseboard voltage regulator",
-          "type": "string"
-        },
-        "voltageRegulatorTemperature": {
-          "description": "voltage regulator temperature in celsius",
-          "type": "number"
-        }
-      },
-      "additionalProperties": false,
-      "required": [
-        "baseboardVoltageRegulatorIdentifier"
-      ]
-    },
-    "ipmiBattery": {
-      "description": "intelligent platform management interface (ipmi) battery metrics",
-      "type": "object",
-      "properties": {
-        "batteryIdentifier": {
-          "description": "identifier for the battery",
-          "type": "string"
-        },
-        "batteryType": {
-          "description": "type of battery",
-          "type": "string"
-        },
-        "batteryVoltageLevel": {
-          "description": "battery voltage level",
-          "type": "number"
-        }
-      },
-      "additionalProperties": false,
-      "required": [
-        "batteryIdentifier"
-      ]
-    },
-    "ipmiFan": {
-      "description": "intelligent platform management interface (ipmi) fan metrics",
-      "type": "object",
-      "properties": {
-        "fanIdentifier": {
-          "description": "identifier for the fan",
-          "type": "string"
-        },
-        "fanSpeed": {
-          "description": "fan speed in revolutions per minute (rpm)",
-          "type": "number"
-        }
-      },
-      "additionalProperties": false,
-      "required": [
-        "fanIdentifier"
-      ]
-    },
-    "ipmiGlobalAggregateTemperatureMargin": {
-      "description": "intelligent platform management interface (ipmi) global aggregate temperature margin",
-      "type": "object",
-      "properties": {
-        "ipmiGlobalAggregateTemperatureMarginIdentifier": {
-          "description": "identifier for the ipmi global aggregate temperature margin metrics",
-          "type": "string"
-        },
-        "globalAggregateTemperatureMargin": {
-          "description": "the difference between the current global aggregate temperature, in celsius, and the global aggregate throttling thermal trip point",
-          "type": "number"
-        }
-      },
-      "additionalProperties": false,
-      "required": [
-        "ipmiGlobalAggregateTemperatureMarginIdentifier",
-        "globalAggregateTemperatureMargin"
-      ]
-    },
-    "ipmiHsbp": {
-      "description": "intelligent platform management interface (ipmi) hot swap backplane power metrics",
-      "type": "object",
-      "properties": {
-        "hsbpIdentifier": {
-          "description": "identifier for the hot swap backplane power unit",
-          "type": "string"
-        },
-        "hsbpTemperature": {
-          "description": "hot swap backplane power temperature in celsius",
-          "type": "number"
-        }
-      },
-      "additionalProperties": false,
-      "required": [
-        "hsbpIdentifier"
-      ]
-    },
-    "ipmiNic": {
-      "description": "intelligent platform management interface (ipmi) network interface control card (nic) metrics",
-      "type": "object",
-      "properties": {
-        "nicIdentifier": {
-          "description": "identifier for the network interface control card",
-          "type": "string"
-        },
-        "nicTemperature": {
-          "description": "nic temperature in celsius",
-          "type": "number"
-        }
-      },
-      "additionalProperties": false,
-      "required": [
-        "nicIdentifier"
-      ]
-    },
-    "ipmiPowerSupply": {
-      "description": "intelligent platform management interface (ipmi) power supply metrics",
-      "type": "object",
-      "properties": {
-        "powerSupplyIdentifier": {
-          "description": "identifier for the power supply",
-          "type": "string"
-        },
-        "powerSupplyInputPower": {
-          "description": "input power in watts",
-          "type": "number"
-        },
-        "powerSupplyCurrentOutputPercent": {
-          "description": "current output voltage as a percentage of the design specified level",
-          "type": "number"
-        },
-        "powerSupplyTemperature": {
-          "description": "power supply temperature in celsius",
-          "type": "number"
-        }
-      },
-      "additionalProperties": false,
-      "required": [
-        "powerSupplyIdentifier"
-      ]
-    },
-    "ipmiProcessor": {
-      "description": "intelligent platform management interface processor metrics",
-      "type": "object",
-      "properties": {
-        "processorIdentifier": {
-          "description": "identifier for an ipmi processor",
-          "type": "string"
-        },
-        "processorThermalControlPercent": {
-          "description": "io module temperature in celsius",
-          "type": "number"
-        },
-        "processorDtsThermalMargin": {
-          "description": "front panel temperature in celsius",
-          "type": "number"
-        },
-        "processorDimmAggregateThermalMarginArray": {
-          "description": "array of processorDimmAggregateThermalMargin objects",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/processorDimmAggregateThermalMargin"
-          }
-        }
-      },
-      "additionalProperties": false,
-      "required": [
-        "processorIdentifier"
-      ]
-    },
-    "jsonObject": {
-      "description": "json object schema, name and other meta-information along with one or more object instances",
-      "type": "object",
-      "properties": {
-        "objectInstances": {
-          "description": "one or more instances of the jsonObject",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/jsonObjectInstance"
-          }
-        },
-        "objectName": {
-          "description": "name of the JSON Object",
-          "type": "string"
-        },
-        "objectSchema": {
-          "description": "json schema for the object",
-          "type": "string"
-        },
-        "objectSchemaUrl": {
-          "description": "Url to the json schema for the object",
-          "type": "string"
-        },
-        "nfSubscribedObjectName": {
-          "description": "name of the object associated with the nfSubscriptonId",
-          "type": "string"
-        },
-        "nfSubscriptionId": {
-          "description": "identifies an openConfig telemetry subscription on a network function, which configures the network function to send complex object data associated with the jsonObject",
-          "type": "string"
-        }
-      },
-      "additionalProperties": false,
-      "required": [
-        "objectInstances",
-        "objectName"
-      ]
-    },
-    "jsonObjectInstance": {
-      "description": "meta-information about an instance of a jsonObject along with the actual object instance",
-      "type": "object",
-      "properties": {
-        "jsonObject": {
-          "$ref": "#/definitions/jsonObject"
-        },
-        "objectInstance": {
-          "description": "an instance conforming to the jsonObject objectSchema",
-          "type": "object"
-        },
-        "objectInstanceEpochMicrosec": {
-          "description": "the unix time aka epoch time associated with this objectInstance--as microseconds elapsed since 1 Jan 1970 not including leap seconds",
-          "type": "number"
-        },
-        "objectKeys": {
-          "description": "an ordered set of keys that identifies this particular instance of jsonObject",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/key"
-          }
-        }
-      },
-      "additionalProperties": false
-    },
-    "key": {
-      "description": "tuple which provides the name of a key along with its value and relative order",
-      "type": "object",
-      "properties": {
-        "keyName": {
-          "description": "name of the key",
-          "type": "string"
-        },
-        "keyOrder": {
-          "description": "relative sequence or order of the key with respect to other keys",
-          "type": "integer"
-        },
-        "keyValue": {
-          "description": "value of the key",
-          "type": "string"
-        }
-      },
-      "additionalProperties": false,
-      "required": [
-        "keyName"
-      ]
-    },
-    "latencyBucketMeasure": {
-      "description": "number of counts falling within a defined latency bucket",
-      "type": "object",
-      "properties": {
-        "countsInTheBucket": {
-          "type": "number"
-        },
-        "highEndOfLatencyBucket": {
-          "type": "number"
-        },
-        "lowEndOfLatencyBucket": {
-          "type": "number"
-        }
-      },
-      "additionalProperties": false,
-      "required": [
-        "countsInTheBucket"
-      ]
-    },
-    "load": {
-      "description": "/proc/loadavg cpu utilization and io utilization metrics",
-      "type": "object",
-      "properties": {
-        "longTerm": {
-          "description": "number of jobs in the run queue (state R, cpu utilization) or waiting for disk I/O (state D, io utilization) averaged over 15 minutes using /proc/loadavg",
-          "type": "number"
-        },
-        "midTerm": {
-          "description": "number of jobs in the run queue (state R, cpu utilization) or waiting for disk I/O (state D, io utilization) averaged over 5 minutes using /proc/loadavg",
-          "type": "number"
-        },
-        "shortTerm": {
-          "description": "number of jobs in the run queue (state R, cpu utilization) or waiting for disk I/O (state D, io utilization) averaged over 1 minute using /proc/loadavg",
-          "type": "number"
-        }
-      },
-      "additionalProperties": false
-    },
-    "machineCheckException": {
-      "description": "metrics on vm machine check exceptions",
-      "type": "object",
-      "properties": {
-        "correctedMemoryErrors": {
-          "description": "total hardware errors that were corrected by the hardware (e.g. data corruption corrected via  ECC) over the measurementInterval",
-          "type": "number"
-        },
-        "correctedMemoryErrorsIn1Hr": {
-          "description": "total hardware errors that were corrected by the hardware over the last one hour",
-          "type": "number"
-        },
-        "uncorrectedMemoryErrors": {
-          "description": "total uncorrected hardware errors that were detected by the hardware (e.g., causing data corruption) over the measurementInterval",
-          "type": "number"
-        },
-        "uncorrectedMemoryErrorsIn1Hr": {
-          "description": "total uncorrected hardware errors that were detected by the hardware over the last one hour",
-          "type": "number"
-        },
-        "vmIdentifier": {
-          "description": "virtual machine identifier associated with the machine check exception",
-          "type": "string"
-        }
-      },
-      "additionalProperties": false,
-      "required": [
-        "vmIdentifier"
-      ]
-    },
-    "measurementFields": {
-      "description": "measurement fields",
-      "type": "object",
-      "properties": {
-        "additionalFields": {
-          "$ref": "#/definitions/hashMap"
-        },
-        "additionalMeasurements": {
-          "$ref": "#/definitions/arrayOfNamedHashMap"
-        },
-        "additionalObjects": {
-          "$ref": "#/definitions/arrayOfJsonObject"
-        },
-        "codecUsageArray": {
-          "description": "array of codecs in use",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/codecsInUse"
-          }
-        },
-        "concurrentSessions": {
-          "description": "peak concurrent sessions for the VM or xNF over the measurementInterval",
-          "type": "integer"
-        },
-        "configuredEntities": {
-          "description": "over the measurementInterval, peak total number of: users, subscribers, devices, adjacencies, etc., for the VM, or subscribers, devices, etc., for the xNF",
-          "type": "integer"
-        },
-        "cpuUsageArray": {
-          "description": "usage of an array of CPUs",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/cpuUsage"
-          }
-        },
-        "diskUsageArray": {
-          "description": "usage of an array of disks",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/diskUsage"
-          }
-        },
-        "featureUsageArray": {
-          "$ref": "#/definitions/hashMap"
-        },
-        "filesystemUsageArray": {
-          "description": "filesystem usage of the VM on which the xNFC reporting the event is running",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/filesystemUsage"
-          }
-        },
-        "hugePagesArray": {
-          "description": "array of metrics on hugepPages",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/hugePages"
-          }
-        },
-        "ipmi": {
-          "$ref": "#/definitions/ipmi"
-        },
-        "latencyDistribution": {
-          "description": "array of integers representing counts of requests whose latency in milliseconds falls within per-xNF configured ranges",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/latencyBucketMeasure"
-          }
-        },
-        "loadArray": {
-          "description": "array of system load metrics",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/load"
-          }
-        },
-        "machineCheckExceptionArray": {
-          "description": "array of machine check exceptions",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/machineCheckException"
-          }
-        },
-        "meanRequestLatency": {
-          "description": "mean seconds required to respond to each request for the VM on which the xNFC reporting the event is running",
-          "type": "number"
-        },
-        "measurementInterval": {
-          "description": "interval over which measurements are being reported in seconds",
-          "type": "number"
-        },
-        "measurementFieldsVersion": {
-          "description": "version of the measurementFields block",
-          "type": "string",
-          "enum": [
-            "4.0"
-          ]
-        },
-        "memoryUsageArray": {
-          "description": "memory usage of an array of VMs",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/memoryUsage"
-          }
-        },
-        "numberOfMediaPortsInUse": {
-          "description": "number of media ports in use",
-          "type": "integer"
-        },
-        "requestRate": {
-          "description": "peak rate of service requests per second to the xNF over the measurementInterval",
-          "type": "number"
-        },
-        "nfcScalingMetric": {
-          "description": "represents busy-ness of the network function from 0 to 100 as reported by the xNFC",
-          "type": "integer"
-        },
-        "nicPerformanceArray": {
-          "description": "usage of an array of network interface cards",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/nicPerformance"
-          }
-        },
-        "processStatsArray": {
-          "description": "array of metrics on system processes",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/processStats"
-          }
-        }
-      },
-      "additionalProperties": false,
-      "required": [
-        "measurementInterval",
-        "measurementFieldsVersion"
-      ]
-    },
-    "memoryUsage": {
-      "description": "memory usage of an identified virtual machine",
-      "type": "object",
-      "properties": {
-        "memoryBuffered": {
-          "description": "kibibytes of temporary storage for raw disk blocks",
-          "type": "number"
-        },
-        "memoryCached": {
-          "description": "kibibytes of memory used for cache",
-          "type": "number"
-        },
-        "memoryConfigured": {
-          "description": "kibibytes of memory configured in the virtual machine on which the xNFC reporting the event is running",
-          "type": "number"
-        },
-        "memoryDemand": {
-          "description": "host demand in kibibytes",
-          "type": "number"
-        },
-        "memoryFree": {
-          "description": "kibibytes of physical RAM left unused by the system",
-          "type": "number"
-        },
-        "memoryLatencyAvg": {
-          "description": "Percentage of time the VM is waiting to access swapped or compressed memory",
-          "type": "number"
-        },
-        "memorySharedAvg": {
-          "description": "shared memory in kilobytes",
-          "type": "number"
-        },
-        "memorySlabRecl": {
-          "description": "the part of the slab that can be reclaimed such as caches measured in kibibytes",
-          "type": "number"
-        },
-        "memorySlabUnrecl": {
-          "description": "the part of the slab that cannot be reclaimed even when lacking memory measured in kibibytes",
-          "type": "number"
-        },
-        "memorySwapInAvg": {
-          "description": "Amount of memory swapped-in from host cache in kibibytes",
-          "type": "number"
-        },
-        "memorySwapInRateAvg": {
-          "description": "rate at which memory is swapped from disk into active memory during the interval in kilobytes per second",
-          "type": "number"
-        },
-        "memorySwapOutAvg": {
-          "description": "Amount of memory swapped-out to host cache in kibibytes",
-          "type": "number"
-        },
-        "memorySwapOutRateAvg": {
-          "description": "rate at which memory is being swapped from active memory to disk during the current interval in kilobytes per second",
-          "type": "number"
-        },
-        "memorySwapUsedAvg": {
-          "description": "space used for caching swapped pages in the host cache in kibibytes",
-          "type": "number"
-        },
-        "memoryUsed": {
-          "description": "total memory minus the sum of free, buffered, cached and slab memory measured in kibibytes",
-          "type": "number"
-        },
-        "percentMemoryUsage": {
-          "description": "Percentage of memory usage; value = (memoryUsed / (memoryUsed + memoryFree) x 100 if denomintor is nonzero, or 0, if otherwise",
-          "type": "number"
-        },
-        "vmIdentifier": {
-          "description": "virtual machine identifier associated with the memory metrics",
-          "type": "string"
-        }
-      },
-      "additionalProperties": false,
-      "required": [
-        "memoryFree",
-        "memoryUsed",
-        "vmIdentifier"
-      ]
-    },
-    "mobileFlowFields": {
-      "description": "mobileFlow fields",
-      "type": "object",
-      "properties": {
-        "additionalFields": {
-          "$ref": "#/definitions/hashMap"
-        },
-        "applicationType": {
-          "description": "Application type inferred",
-          "type": "string"
-        },
-        "appProtocolType": {
-          "description": "application protocol",
-          "type": "string"
-        },
-        "appProtocolVersion": {
-          "description": "application protocol version",
-          "type": "string"
-        },
-        "cid": {
-          "description": "cell id",
-          "type": "string"
-        },
-        "connectionType": {
-          "description": "Abbreviation referencing a 3GPP reference point e.g., S1-U, S11, etc",
-          "type": "string"
-        },
-        "ecgi": {
-          "description": "Evolved Cell Global Id",
-          "type": "string"
-        },
-        "flowDirection": {
-          "description": "Flow direction, indicating if the reporting node is the source of the flow or destination for the flow",
-          "type": "string"
-        },
-        "gtpPerFlowMetrics": {
-          "$ref": "#/definitions/gtpPerFlowMetrics"
-        },
-        "gtpProtocolType": {
-          "description": "GTP protocol",
-          "type": "string"
-        },
-        "gtpVersion": {
-          "description": "GTP protocol version",
-          "type": "string"
-        },
-        "httpHeader": {
-          "description": "HTTP request header, if the flow connects to a node referenced by HTTP",
-          "type": "string"
-        },
-        "imei": {
-          "description": "IMEI for the subscriber UE used in this flow, if the flow connects to a mobile device",
-          "type": "string"
-        },
-        "imsi": {
-          "description": "IMSI for the subscriber UE used in this flow, if the flow connects to a mobile device",
-          "type": "string"
-        },
-        "ipProtocolType": {
-          "description": "IP protocol type e.g., TCP, UDP, RTP...",
-          "type": "string"
-        },
-        "ipVersion": {
-          "description": "IP protocol version e.g., IPv4, IPv6",
-          "type": "string"
-        },
-        "lac": {
-          "description": "location area code",
-          "type": "string"
-        },
-        "mcc": {
-          "description": "mobile country code",
-          "type": "string"
-        },
-        "mnc": {
-          "description": "mobile network code",
-          "type": "string"
-        },
-        "mobileFlowFieldsVersion": {
-          "description": "version of the mobileFlowFields block",
-          "type": "string",
-          "enum": [
-            "4.0"
-          ]
-        },
-        "msisdn": {
-          "description": "MSISDN for the subscriber UE used in this flow, as an integer, if the flow connects to a mobile device",
-          "type": "string"
-        },
-        "otherEndpointIpAddress": {
-          "description": "IP address for the other endpoint, as used for the flow being reported on",
-          "type": "string"
-        },
-        "otherEndpointPort": {
-          "description": "IP Port for the reporting entity, as used for the flow being reported on",
-          "type": "integer"
-        },
-        "otherFunctionalRole": {
-          "description": "Functional role of the other endpoint for the flow being reported on e.g., MME, S-GW, P-GW, PCRF...",
-          "type": "string"
-        },
-        "rac": {
-          "description": "routing area code",
-          "type": "string"
-        },
-        "radioAccessTechnology": {
-          "description": "Radio Access Technology e.g., 2G, 3G, LTE",
-          "type": "string"
-        },
-        "reportingEndpointIpAddr": {
-          "description": "IP address for the reporting entity, as used for the flow being reported on",
-          "type": "string"
-        },
-        "reportingEndpointPort": {
-          "description": "IP port for the reporting entity, as used for the flow being reported on",
-          "type": "integer"
-        },
-        "sac": {
-          "description": "service area code",
-          "type": "string"
-        },
-        "samplingAlgorithm": {
-          "description": "Integer identifier for the sampling algorithm or rule being applied in calculating the flow metrics if metrics are calculated based on a sample of packets, or 0 if no sampling is applied",
-          "type": "integer"
-        },
-        "tac": {
-          "description": "transport area code",
-          "type": "string"
-        },
-        "tunnelId": {
-          "description": "tunnel identifier",
-          "type": "string"
-        },
-        "vlanId": {
-          "description": "VLAN identifier used by this flow",
-          "type": "string"
-        }
-      },
-      "additionalProperties": false,
-      "required": [
-        "flowDirection",
-        "gtpPerFlowMetrics",
-        "ipProtocolType",
-        "ipVersion",
-        "mobileFlowFieldsVersion",
-        "otherEndpointIpAddress",
-        "otherEndpointPort",
-        "reportingEndpointIpAddr",
-        "reportingEndpointPort"
-      ]
-    },
-    "namedHashMap": {
-      "description": "a hashMap which is associated with and described by a name",
-      "type": "object",
-      "properties": {
-        "name": {
-          "type": "string"
-        },
-        "hashMap": {
-          "$ref": "#/definitions/hashMap"
-        }
-      },
-      "additionalProperties": false,
-      "required": [
-        "name",
-        "hashMap"
-      ]
-    },
-    "nicPerformance": {
-      "description": "describes the performance and errors of an identified network interface card",
-      "type": "object",
-      "properties": {
-        "administrativeState": {
-          "description": "administrative state",
-          "type": "string",
-          "enum": [
-            "inService",
-            "outOfService"
-          ]
-        },
-        "nicIdentifier": {
-          "description": "nic identification",
-          "type": "string"
-        },
-        "operationalState": {
-          "description": "operational state",
-          "type": "string",
-          "enum": [
-            "inService",
-            "outOfService"
-          ]
-        },
-        "receivedBroadcastPacketsAccumulated": {
-          "description": "Cumulative count of broadcast packets received as read at the end of the measurement interval",
-          "type": "number"
-        },
-        "receivedBroadcastPacketsDelta": {
-          "description": "Count of broadcast packets received within the measurement interval",
-          "type": "number"
-        },
-        "receivedDiscardedPacketsAccumulated": {
-          "description": "Cumulative count of discarded packets received as read at the end of the measurement interval",
-          "type": "number"
-        },
-        "receivedDiscardedPacketsDelta": {
-          "description": "Count of discarded packets received within the measurement interval",
-          "type": "number"
-        },
-        "receivedErrorPacketsAccumulated": {
-          "description": "Cumulative count of error packets received as read at the end of the measurement interval",
-          "type": "number"
-        },
-        "receivedErrorPacketsDelta": {
-          "description": "Count of error packets received within the measurement interval",
-          "type": "number"
-        },
-        "receivedMulticastPacketsAccumulated": {
-          "description": "Cumulative count of multicast packets received as read at the end of the measurement interval",
-          "type": "number"
-        },
-        "receivedMulticastPacketsDelta": {
-          "description": "Count of multicast packets received within the measurement interval",
-          "type": "number"
-        },
-        "receivedOctetsAccumulated": {
-          "description": "Cumulative count of octets received as read at the end of the measurement interval",
-          "type": "number"
-        },
-        "receivedOctetsDelta": {
-          "description": "Count of octets received within the measurement interval",
-          "type": "number"
-        },
-        "receivedTotalPacketsAccumulated": {
-          "description": "Cumulative count of all packets received as read at the end of the measurement interval",
-          "type": "number"
-        },
-        "receivedPercentDiscard": {
-          "description": "Percentage of discarded packets received; value = (receivedDiscardedPacketsDelta / receivedTotalPacketsDelta) x 100, if denominator is nonzero, or 0, if otherwise",
-          "type": "number"
-        },
-        "receivedPercentError": {
-          "description": "Percentage of error packets received; value = (receivedErrorPacketsDelta / receivedTotalPacketsDelta) x 100, if denominator is nonzero, or 0, if otherwise.",
-          "type": "number"
-        },
-        "receivedTotalPacketsDelta": {
-          "description": "Count of all packets received within the measurement interval",
-          "type": "number"
-        },
-        "receivedUnicastPacketsAccumulated": {
-          "description": "Cumulative count of unicast packets received as read at the end of the measurement interval",
-          "type": "number"
-        },
-        "receivedUnicastPacketsDelta": {
-          "description": "Count of unicast packets received within the measurement interval",
-          "type": "number"
-        },
-        "receivedUtilization": {
-          "description": "Percentage of utilization received; value = (receivedOctetsDelta / (speed x (lastEpochMicrosec - startEpochMicrosec))) x 100, if denominator is nonzero, or 0, if otherwise",
-          "type": "number"
-        },
-        "speed": {
-          "description": "Speed configured in mbps",
-          "type": "number"
-        },
-        "transmittedBroadcastPacketsAccumulated": {
-          "description": "Cumulative count of broadcast packets transmitted as read at the end of the measurement interval",
-          "type": "number"
-        },
-        "transmittedBroadcastPacketsDelta": {
-          "description": "Count of broadcast packets transmitted within the measurement interval",
-          "type": "number"
-        },
-        "transmittedDiscardedPacketsAccumulated": {
-          "description": "Cumulative count of discarded packets transmitted as read at the end of the measurement interval",
-          "type": "number"
-        },
-        "transmittedDiscardedPacketsDelta": {
-          "description": "Count of discarded packets transmitted within the measurement interval",
-          "type": "number"
-        },
-        "transmittedErrorPacketsAccumulated": {
-          "description": "Cumulative count of error packets transmitted as read at the end of the measurement interval",
-          "type": "number"
-        },
-        "transmittedErrorPacketsDelta": {
-          "description": "Count of error packets transmitted within the measurement interval",
-          "type": "number"
-        },
-        "transmittedMulticastPacketsAccumulated": {
-          "description": "Cumulative count of multicast packets transmitted as read at the end of the measurement interval",
-          "type": "number"
-        },
-        "transmittedMulticastPacketsDelta": {
-          "description": "Count of multicast packets transmitted within the measurement interval",
-          "type": "number"
-        },
-        "transmittedOctetsAccumulated": {
-          "description": "Cumulative count of octets transmitted as read at the end of the measurement interval",
-          "type": "number"
-        },
-        "transmittedOctetsDelta": {
-          "description": "Count of octets transmitted within the measurement interval",
-          "type": "number"
-        },
-        "transmittedTotalPacketsAccumulated": {
-          "description": "Cumulative count of all packets transmitted as read at the end of the measurement interval",
-          "type": "number"
-        },
-        "transmittedTotalPacketsDelta": {
-          "description": "Count of all packets transmitted within the measurement interval",
-          "type": "number"
-        },
-        "transmittedUnicastPacketsAccumulated": {
-          "description": "Cumulative count of unicast packets transmitted as read at the end of the measurement interval",
-          "type": "number"
-        },
-        "transmittedUnicastPacketsDelta": {
-          "description": "Count of unicast packets transmitted within the measurement interval",
-          "type": "number"
-        },
-        "transmittedPercentDiscard": {
-          "description": "Percentage of discarded packets transmitted; value = (transmittedDiscardedPacketsDelta / transmittedTotalPacketsDelta) x 100, if denominator is nonzero, or 0, if otherwise",
-          "type": "number"
-        },
-        "transmittedPercentError": {
-          "description": "Percentage of error packets received; value = (transmittedErrorPacketsDelta / transmittedTotalPacketsDelta) x 100, if denominator is nonzero, or 0, if otherwise",
-          "type": "number"
-        },
-        "transmittedUtilization": {
-          "description": "Percentage of utilization transmitted; value = (transmittedOctetsDelta / (speed x (lastEpochMicrosec - startEpochMicrosec))) x 100, if denominator is nonzero, or 0, if otherwise.",
-          "type": "number"
-        },
-        "valuesAreSuspect": {
-          "description": "Indicates whether vNicPerformance values are likely inaccurate due to counter overflow or other condtions",
-          "type": "string",
-          "enum": [
-            "true",
-            "false"
-          ]
-        }
-      },
-      "additionalProperties": false,
-      "required": [
-        "nicIdentifier",
-        "valuesAreSuspect"
-      ]
-    },
-    "notificationFields": {
-      "description": "notification fields",
-      "type": "object",
-      "properties": {
-        "additionalFields": {
-          "$ref": "#/definitions/hashMap"
-        },
-        "arrayOfNamedHashMap": {
-          "$ref": "#/definitions/arrayOfNamedHashMap"
-        },
-        "changeContact": {
-          "description": "identifier for a contact related to the change",
-          "type": "string"
-        },
-        "changeIdentifier": {
-          "description": "system or session identifier associated with the change",
-          "type": "string"
-        },
-        "changeType": {
-          "description": "describes what has changed for the entity",
-          "type": "string"
-        },
-        "newState": {
-          "description": "new state of the entity",
-          "type": "string"
-        },
-        "oldState": {
-          "description": "previous state of the entity",
-          "type": "string"
-        },
-        "notificationFieldsVersion": {
-          "description": "version of the notificationFields block",
-          "type": "string",
-          "enum": [
-            "2.0"
-          ]
-        },
-        "stateInterface": {
-          "description": "card or port name of the entity that changed state",
-          "type": "string"
-        }
-      },
-      "additionalProperties": false,
-      "required": [
-        "changeIdentifier",
-        "changeType",
-        "notificationFieldsVersion"
-      ]
-    },
-    "otherFields": {
-      "description": "fields for events belonging to the 'other' domain of the commonEventHeader domain enumeration",
-      "type": "object",
-      "properties": {
-        "arrayOfNamedHashMap": {
-          "$ref": "#/definitions/arrayOfNamedHashMap"
-        },
-        "hashMap": {
-          "$ref": "#/definitions/hashMap"
-        },
-        "jsonObjects": {
-          "$ref": "#/definitions/arrayOfJsonObject"
-        },
-        "otherFieldsVersion": {
-          "description": "version of the otherFields block",
-          "type": "string",
-          "enum": [
-            "3.0"
-          ]
-        }
-      },
-      "additionalProperties": false,
-      "required": [
-        "otherFieldsVersion"
-      ]
-    },
-    "pnfRegistrationFields": {
-      "description": "hardware device registration fields",
-      "type": "object",
-      "properties": {
-        "additionalFields": {
-          "$ref": "#/definitions/hashMap"
-        },
-        "lastServiceDate": {
-          "description": "TS 32.692 dateOfLastService = date of last service; e.g. 15022017",
-          "type": "string"
-        },
-        "macAddress": {
-          "description": "MAC address of OAM interface of the unit",
-          "type": "string"
-        },
-        "manufactureDate": {
-          "description": "TS 32.692 dateOfManufacture = manufacture date of the unit; 24032016",
-          "type": "string"
-        },
-        "modelNumber": {
-          "description": "TS 32.692 versionNumber = version of the unit from vendor; e.g. AJ02.  Maps to AAI equip-model",
-          "type": "string"
-        },
-        "oamV4IpAddress": {
-          "description": "IPv4 m-plane IP address to be used by the manager to contact the PNF",
-          "type": "string"
-        },
-        "oamV6IpAddress": {
-          "description": "IPv6 m-plane IP address to be used by the manager to contact the PNF",
-          "type": "string"
-        },
-        "pnfRegistrationFieldsVersion": {
-          "description": "version of the pnfRegistrationFields block",
-          "type": "string",
-          "enum": [
-            "2.0"
-          ]
-        },
-        "serialNumber": {
-          "description": "TS 32.692 serialNumber = serial number of the unit; e.g. 6061ZW3",
-          "type": "string"
-        },
-        "softwareVersion": {
-          "description": "TS 32.692 swName = active SW running on the unit; e.g. 5gDUv18.05.201",
-          "type": "string"
-        },
-        "unitFamily": {
-          "description": "TS 32.692 vendorUnitFamilyType = general type of HW unit; e.g. BBU",
-          "type": "string"
-        },
-        "unitType": {
-          "description": "TS 32.692 vendorUnitTypeNumber = vendor name for the unit; e.g. Airscale",
-          "type": "string"
-        },
-        "vendorName": {
-          "description": "TS 32.692 vendorName = name of manufacturer; e.g. Nokia. Maps to AAI equip-vendor",
-          "type": "string"
-        }
-      },
-      "additionalProperties": false,
-      "required": [
-        "pnfRegistrationFieldsVersion"
-      ]
-    },
-    "processorDimmAggregateThermalMargin": {
-      "description": "intelligent platform management interface (ipmi) processor dual inline memory module aggregate thermal margin metrics",
-      "type": "object",
-      "properties": {
-        "processorDimmAggregateThermalMarginIdentifier": {
-          "description": "identifier for the aggregate thermal margin metrics from the processor dual inline memory module",
-          "type": "string"
-        },
-        "thermalMargin": {
-          "description": "the difference between the DIMM's current temperature, in celsius, and the DIMM's throttling thermal trip point",
-          "type": "number"
-        }
-      },
-      "additionalProperties": false,
-      "required": [
-        "processorDimmAggregateThermalMarginIdentifier",
-        "thermalMargin"
-      ]
-    },
-    "processStats": {
-      "description": "metrics on system processes",
-      "type": "object",
-      "properties": {
-        "forkRate": {
-          "description": "the number of threads created since the last reboot",
-          "type": "number"
-        },
-        "processIdentifier": {
-          "description": "processIdentifier",
-          "type": "string"
-        },
-        "psStateBlocked": {
-          "description": "the number of processes in a blocked state",
-          "type": "number"
-        },
-        "psStatePaging": {
-          "description": "the number of processes in a paging state",
-          "type": "number"
-        },
-        "psStateRunning": {
-          "description": "the number of processes in a running state",
-          "type": "number"
-        },
-        "psStateSleeping": {
-          "description": "the number of processes in a sleeping state",
-          "type": "number"
-        },
-        "psStateStopped": {
-          "description": "the number of processes in a stopped state",
-          "type": "number"
-        },
-        "psStateZombie": {
-          "description": "the number of processes in a zombie state",
-          "type": "number"
-        }
-      },
-      "additionalProperties": false,
-      "required": [
-        "processIdentifier"
-      ]
-    },
-    "requestError": {
-      "description": "standard request error data structure",
-      "type": "object",
-      "properties": {
-        "messageId": {
-          "description": "Unique message identifier of the format ABCnnnn where ABC is either SVC for Service Exceptions or POL for Policy Exception",
-          "type": "string"
-        },
-        "text": {
-          "description": "Message text, with replacement variables marked with %n, where n is an index into the list of <variables> elements, starting at 1",
-          "type": "string"
-        },
-        "url": {
-          "description": "Hyperlink to a detailed error resource e.g., an HTML page for browser user agents",
-          "type": "string"
-        },
-        "variables": {
-          "description": "List of zero or more strings that represent the contents of the variables used by the message text",
-          "type": "string"
-        }
-      },
-      "additionalProperties": false,
-      "required": [
-        "messageId",
-        "text"
-      ]
-    },
-    "sipSignalingFields": {
-      "description": "sip signaling fields",
-      "type": "object",
-      "properties": {
-        "additionalInformation": {
-          "$ref": "#/definitions/hashMap"
-        },
-        "compressedSip": {
-          "description": "the full SIP request/response including headers and bodies",
-          "type": "string"
-        },
-        "correlator": {
-          "description": "this is the same for all events on this call",
-          "type": "string"
-        },
-        "localIpAddress": {
-          "description": "IP address on xNF",
-          "type": "string"
-        },
-        "localPort": {
-          "description": "port on xNF",
-          "type": "string"
-        },
-        "remoteIpAddress": {
-          "description": "IP address of peer endpoint",
-          "type": "string"
-        },
-        "remotePort": {
-          "description": "port of peer endpoint",
-          "type": "string"
-        },
-        "sipSignalingFieldsVersion": {
-          "description": "version of the sipSignalingFields block",
-          "type": "string",
-          "enum": [
-            "3.0"
-          ]
-        },
-        "summarySip": {
-          "description": "the SIP Method or Response ('INVITE', '200 OK', 'BYE', etc)",
-          "type": "string"
-        },
-        "vendorNfNameFields": {
-          "$ref": "#/definitions/vendorNfNameFields"
-        }
-      },
-      "additionalProperties": false,
-      "required": [
-        "correlator",
-        "localIpAddress",
-        "localPort",
-        "remoteIpAddress",
-        "remotePort",
-        "sipSignalingFieldsVersion",
-        "vendorNfNameFields"
-      ]
-    },
-    "stateChangeFields": {
-      "description": "stateChange fields",
-      "type": "object",
-      "properties": {
-        "additionalFields": {
-          "$ref": "#/definitions/hashMap"
-        },
-        "newState": {
-          "description": "new state of the entity",
-          "type": "string",
-          "enum": [
-            "inService",
-            "maintenance",
-            "outOfService"
-          ]
-        },
-        "oldState": {
-          "description": "previous state of the entity",
-          "type": "string",
-          "enum": [
-            "inService",
-            "maintenance",
-            "outOfService"
-          ]
-        },
-        "stateChangeFieldsVersion": {
-          "description": "version of the stateChangeFields block",
-          "type": "string",
-          "enum": [
-            "4.0"
-          ]
-        },
-        "stateInterface": {
-          "description": "card or port name of the entity that changed state",
-          "type": "string"
-        }
-      },
-      "additionalProperties": false,
-      "required": [
-        "newState",
-        "oldState",
-        "stateChangeFieldsVersion",
-        "stateInterface"
-      ]
-    },
-    "syslogFields": {
-      "description": "sysLog fields",
-      "type": "object",
-      "properties": {
-        "additionalFields": {
-          "$ref": "#/definitions/hashMap"
-        },
-        "eventSourceHost": {
-          "description": "hostname of the device",
-          "type": "string"
-        },
-        "eventSourceType": {
-          "description": "type of event source; examples: other, router, switch, host, card, port, slotThreshold, portThreshold, virtualMachine, virtualNetworkFunction",
-          "type": "string"
-        },
-        "syslogFacility": {
-          "description": "numeric code from 0 to 23 for facility--see table in documentation",
-          "type": "integer"
-        },
-        "syslogFieldsVersion": {
-          "description": "version of the syslogFields block",
-          "type": "string",
-          "enum": [
-            "4.0"
-          ]
-        },
-        "syslogMsg": {
-          "description": "syslog message",
-          "type": "string"
-        },
-        "syslogMsgHost": {
-          "description": "hostname parsed from non-VES syslog message",
-          "type": "string"
-        },
-        "syslogPri": {
-          "description": "0-192 combined severity and facility",
-          "type": "integer"
-        },
-        "syslogProc": {
-          "description": "identifies the application that originated the message",
-          "type": "string"
-        },
-        "syslogProcId": {
-          "description": "a change in the value of this field indicates a discontinuity in syslog reporting",
-          "type": "number"
-        },
-        "syslogSData": {
-          "description": "syslog structured data consisting of a structured data Id followed by a set of key value pairs",
-          "type": "string"
-        },
-        "syslogSdId": {
-          "description": "0-32 char in format name@number for example ourSDID@32473",
-          "type": "string"
-        },
-        "syslogSev": {
-          "description": "numerical Code for  severity derived from syslogPri as remaider of syslogPri / 8",
-          "type": "string",
-          "enum": [
-            "Alert",
-            "Critical",
-            "Debug",
-            "Emergency",
-            "Error",
-            "Info",
-            "Notice",
-            "Warning"
-          ]
-        },
-        "syslogTag": {
-          "description": "msgId indicating the type of message such as TCPOUT or TCPIN; NILVALUE should be used when no other value can be provided",
-          "type": "string"
-        },
-        "syslogTs": {
-          "description": "timestamp parsed from non-VES syslog message",
-          "type": "string"
-        },
-        "syslogVer": {
-          "description": "IANA assigned version of the syslog protocol specification - typically 1",
-          "type": "number"
-        }
-      },
-      "additionalProperties": false,
-      "required": [
-        "eventSourceType",
-        "syslogFieldsVersion",
-        "syslogMsg",
-        "syslogTag"
-      ]
-    },
-    "thresholdCrossingAlertFields": {
-      "description": "fields specific to threshold crossing alert events",
-      "type": "object",
-      "properties": {
-        "additionalFields": {
-          "$ref": "#/definitions/hashMap"
-        },
-        "additionalParameters": {
-          "description": "performance counters",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/counter"
-          }
-        },
-        "alertAction": {
-          "description": "Event action",
-          "type": "string",
-          "enum": [
-            "CLEAR",
-            "CONT",
-            "SET"
-          ]
-        },
-        "alertDescription": {
-          "description": "Unique short alert description such as IF-SHUB-ERRDROP",
-          "type": "string"
-        },
-        "alertType": {
-          "description": "Event type",
-          "type": "string",
-          "enum": [
-            "CARD-ANOMALY",
-            "ELEMENT-ANOMALY",
-            "INTERFACE-ANOMALY",
-            "SERVICE-ANOMALY"
-          ]
-        },
-        "alertValue": {
-          "description": "Calculated API value (if applicable)",
-          "type": "string"
-        },
-        "associatedAlertIdList": {
-          "description": "List of eventIds associated with the event being reported",
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        },
-        "collectionTimestamp": {
-          "description": "Time when the performance collector picked up the data; with RFC 2822 compliant format: Sat, 13 Mar 2010 11:29:05 -0800",
-          "type": "string"
-        },
-        "dataCollector": {
-          "description": "Specific performance collector instance used",
-          "type": "string"
-        },
-        "elementType": {
-          "description": "type of network element - internal ATT field",
-          "type": "string"
-        },
-        "eventSeverity": {
-          "description": "event severity or priority",
-          "type": "string",
-          "enum": [
-            "CRITICAL",
-            "MAJOR",
-            "MINOR",
-            "WARNING",
-            "NORMAL"
-          ]
-        },
-        "eventStartTimestamp": {
-          "description": "Time closest to when the measurement was made; with RFC 2822 compliant format: Sat, 13 Mar 2010 11:29:05 -0800",
-          "type": "string"
-        },
-        "interfaceName": {
-          "description": "Physical or logical port or card (if applicable)",
-          "type": "string"
-        },
-        "networkService": {
-          "description": "network name - internal ATT field",
-          "type": "string"
-        },
-        "possibleRootCause": {
-          "description": "Reserved for future use",
-          "type": "string"
-        },
-        "thresholdCrossingFieldsVersion": {
-          "description": "version of the thresholdCrossingAlertFields block",
-          "type": "string",
-          "enum": [
-            "4.0"
-          ]
-        }
-      },
-      "additionalProperties": false,
-      "required": [
-        "additionalParameters",
-        "alertAction",
-        "alertDescription",
-        "alertType",
-        "collectionTimestamp",
-        "eventSeverity",
-        "eventStartTimestamp",
-        "thresholdCrossingFieldsVersion"
-      ]
-    },
-    "vendorNfNameFields": {
-      "description": "provides vendor, nf and nfModule identifying information",
-      "type": "object",
-      "properties": {
-        "vendorName": {
-          "description": "network function vendor name",
-          "type": "string"
-        },
-        "nfModuleName": {
-          "description": "name of the nfModule generating the event",
-          "type": "string"
-        },
-        "nfName": {
-          "description": "name of the network function generating the event",
-          "type": "string"
-        }
-      },
-      "additionalProperties": false,
-      "required": [
-        "vendorName"
-      ]
-    },
-    "voiceQualityFields": {
-      "description": "provides statistics related to customer facing voice products",
-      "type": "object",
-      "properties": {
-        "additionalInformation": {
-          "$ref": "#/definitions/hashMap"
-        },
-        "calleeSideCodec": {
-          "description": "callee codec for the call",
-          "type": "string"
-        },
-        "callerSideCodec": {
-          "description": "caller codec for the call",
-          "type": "string"
-        },
-        "correlator": {
-          "description": "this is the same for all events on this call",
-          "type": "string"
-        },
-        "endOfCallVqmSummaries": {
-          "$ref": "#/definitions/endOfCallVqmSummaries"
-        },
-        "phoneNumber": {
-          "description": "phone number associated with the correlator",
-          "type": "string"
-        },
-        "midCallRtcp": {
-          "description": "Base64 encoding of the binary RTCP data excluding Eth/IP/UDP headers",
-          "type": "string"
-        },
-        "vendorNfNameFields": {
-          "$ref": "#/definitions/vendorNfNameFields"
-        },
-        "voiceQualityFieldsVersion": {
-          "description": "version of the voiceQualityFields block",
-          "type": "string",
-          "enum": [
-            "4.0"
-          ]
-        }
-      },
-      "additionalProperties": false,
-      "required": [
-        "calleeSideCodec",
-        "callerSideCodec",
-        "correlator",
-        "midCallRtcp",
-        "vendorNfNameFields",
-        "voiceQualityFieldsVersion"
-      ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/solution/integration/smo/resources/devicemanager.properties b/solution/integration/smo/resources/devicemanager.properties
deleted file mode 100644 (file)
index 016de3d..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-[dcae]
-dcaeUrl=http://ves-test-collector-v5:30000/eventListener/v5
-dcaeUserCredentials=will:pill
-dcaeHeartbeatPeriodSeconds=30
-
-[toggleAlarmFilter]
-taEnabled=true
-taDelay=3000
-
-[es]
-esCluster=a9da396b3194
-esArchiveCheckIntervalSeconds=0
-esArchiveLifetimeSeconds=2592000
-
-[aai]
-aaiUrl=off
-aaiHeaders=["X-TransactionId: 9999"]
-aaiDeleteOnMountpointRemove=false
-aaiTrustAllCerts=false
-aaiApiVersion=aai/v13
-aaiApplicationId=SDNR
-aaiClientConnectionTimeout=30000
-
-[pm]
-pmEnabled=true
-pmCluster=a9da396b3194
-
-[devicemonitor]
-SeverityconnectionLossOAM=Major
-SeverityconnectionLossMediator=Major
-SeverityconnectionLossNeOAM=Major
-
diff --git a/solution/integration/smo/resources/go-collector.sh b/solution/integration/smo/resources/go-collector.sh
deleted file mode 100755 (executable)
index b915ffc..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-# Run the validating test collector.
-#  ===================================================================
-#  Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-#  ===================================================================
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-
-
-python ../../code/collector/collector.py \
-       --config ../../config/collector.conf \
-       --section windows \
-       --verbose \
-       --api-version ${VES_API}
-
diff --git a/solution/integration/smo/resources/org.ops4j.pax.logging.cfg b/solution/integration/smo/resources/org.ops4j.pax.logging.cfg
deleted file mode 100644 (file)
index 487783f..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-################################################################################
-#
-#    Licensed to the Apache Software Foundation (ASF) under one or more
-#    contributor license agreements.  See the NOTICE file distributed with
-#    this work for additional information regarding copyright ownership.
-#    The ASF licenses this file to You under the Apache License, Version 2.0
-#    (the "License"); you may not use this file except in compliance with
-#    the License.  You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#
-################################################################################
-
-# Common pattern layout for appenders
-log4j2.pattern = %d{ISO8601} | %-5p | %-16t | %-32c{1} | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n
-
-# Root logger
-log4j2.rootLogger.level = INFO
-# uncomment to use asynchronous loggers, which require mvn:com.lmax/disruptor/3.3.2 library
-#log4j2.rootLogger.type = asyncRoot
-#log4j2.rootLogger.includeLocation = false
-log4j2.rootLogger.appenderRef.RollingFile.ref = RollingFile
-log4j2.rootLogger.appenderRef.PaxOsgi.ref = PaxOsgi
-log4j2.rootLogger.appenderRef.Console.ref = Console
-log4j2.rootLogger.appenderRef.Console.filter.threshold.type = ThresholdFilter
-log4j2.rootLogger.appenderRef.Console.filter.threshold.level = ${karaf.log.console:-OFF}
-
-# Loggers configuration
-
-# Spifly logger
-log4j2.logger.spifly.name = org.apache.aries.spifly
-log4j2.logger.spifly.level = WARN
-
-# Security audit logger
-log4j2.logger.audit.name = org.apache.karaf.jaas.modules.audit
-log4j2.logger.audit.level = INFO
-log4j2.logger.audit.additivity = false
-log4j2.logger.audit.appenderRef.AuditRollingFile.ref = AuditRollingFile
-
-# Appenders configuration
-
-# Console appender not used by default (see log4j2.rootLogger.appenderRefs)
-log4j2.appender.console.type = Console
-log4j2.appender.console.name = Console
-log4j2.appender.console.layout.type = PatternLayout
-log4j2.appender.console.layout.pattern = ${log4j2.pattern}
-
-# Rolling file appender
-log4j2.appender.rolling.type = RollingRandomAccessFile
-log4j2.appender.rolling.name = RollingFile
-log4j2.appender.rolling.fileName = ${karaf.data}/log/karaf.log
-log4j2.appender.rolling.filePattern = ${karaf.data}/log/karaf.log.%i
-# uncomment to not force a disk flush
-#log4j2.appender.rolling.immediateFlush = false
-log4j2.appender.rolling.append = true
-log4j2.appender.rolling.layout.type = PatternLayout
-log4j2.appender.rolling.layout.pattern = ${log4j2.pattern}
-log4j2.appender.rolling.policies.type = Policies
-log4j2.appender.rolling.policies.size.type = SizeBasedTriggeringPolicy
-log4j2.appender.rolling.policies.size.size = 16MB
-
-# Audit file appender
-log4j2.appender.audit.type = RollingRandomAccessFile
-log4j2.appender.audit.name = AuditRollingFile
-log4j2.appender.audit.fileName = ${karaf.data}/security/audit.log
-log4j2.appender.audit.filePattern = ${karaf.data}/security/audit.log.%i
-log4j2.appender.audit.append = true
-log4j2.appender.audit.layout.type = PatternLayout
-log4j2.appender.audit.layout.pattern = ${log4j2.pattern}
-log4j2.appender.audit.policies.type = Policies
-log4j2.appender.audit.policies.size.type = SizeBasedTriggeringPolicy
-log4j2.appender.audit.policies.size.size = 8MB
-
-# OSGi appender
-log4j2.appender.osgi.type = PaxOsgi
-log4j2.appender.osgi.name = PaxOsgi
-log4j2.appender.osgi.filter = *
-
-# help with identification of maven-related problems with pax-url-aether
-#log4j2.logger.aether.name = shaded.org.eclipse.aether
-#log4j2.logger.aether.level = TRACE
-#log4j2.logger.http-headers.name = shaded.org.apache.http.headers
-#log4j2.logger.http-headers.level = DEBUG
-#log4j2.logger.maven.name = org.ops4j.pax.url.mvn
-#log4j2.logger.maven.level = TRACE
-
-
-log4j2.logger.org_opendaylight_netconf.level = TRACE
-log4j2.logger.org_opendaylight_netconf.name = org.opendaylight.netconf
-log4j2.logger.org_apache_sshd.level = INFO
-log4j2.logger.org_apache_sshd.name = org.apache.sshd
diff --git a/solution/integration/smo/resources/startODL.oom.sh b/solution/integration/smo/resources/startODL.oom.sh
deleted file mode 100755 (executable)
index 24b9d2b..0000000
+++ /dev/null
@@ -1,277 +0,0 @@
-#!/bin/bash
-
-###
-# ============LICENSE_START=======================================================
-# SDNC
-# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-# ================================================================================
-# Update by Copyright (C) 2020 highstreet technologies GmbH. All rights reserved.
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END=========================================================
-###
-# from helm oom resource file
-# Install SDN-C platform components if not already installed and start container
-
-# List of used constants, that are provided during container initialization
-
-ODL_HOME=${ODL_HOME:-/opt/opendaylight/current}
-ODL_ADMIN_USERNAME=${ODL_ADMIN_USERNAME:-admin}
-ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U}
-export ODL_ADMIN_PASSWORD ODL_ADMIN_USERNAME
-
-SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc}
-SDNC_BIN=${SDNC_BIN:-/opt/onap/sdnc/bin}
-CCSDK_HOME=${CCSDK_HOME:-/opt/onap/ccsdk}
-
-#- ODL Cluster
-ENABLE_ODL_CLUSTER=${ENABLE_ODL_CLUSTER:-false}
-#SDNC_REPLICAS
-
-#- ODL GEO cluster
-GEO_ENABLED=${GEO_ENABLED:-false}
-#IS_PRIMARY_CLUSTER
-#MY_ODL_CLUSTER
-#PEER_ODL_CLUSTER
-
-#- AAF
-SDNC_AAF_ENABLED=${SDNC_AAF_ENABLED:-false}
-
-#- SDN-R
-SDNRWT=${SDNRWT:-false}
-SDNRWT_BOOTFEATURES=${SDNRWT_BOOTFEATURES:-sdnr-wt-feature-aggregator}
-SDNRDM=${SDNRDM:-false}
-SDNRDM_BOOTFEATURES=${SDNRDM_BOOTFEATURES:-sdnr-wt-feature-aggregator-devicemanager}
-SDNRONLY=${SDNRONLY:-false}
-
-SDNRINIT=${SDNRINIT:-false}
-SDNRDBURL=${SDNRDBURL:-http://sdnrdb:9200}
-#SDNRDBUSERNAME
-#SDNRDBPASSWORD
-#SDNRDBPARAMETER
-SDNRDBCOMMAND=${SDNRDBCOMMAND:--c init -db $SDNRDBURL -dbu $SDNRDBUSERNAME -dbp $SDNRDBPASSWORD $SDNRDBPARAMETER}
-
-SDNR_NORTHBOUND=${SDNR_NORTHBOUND:-false}
-SDNR_NORTHBOUND_BOOTFEATURES=${SDNR_NORTHBOUND_BOOTFEATURES:-sdnr-northbound-all}
-
-# Functions
-
-# Append features to karaf boot feature configuration
-# $1 additional feature to be added
-# $2 repositories to be added (optional)
-function addToFeatureBoot() {
-  CFG=$ODL_HOME/etc/org.apache.karaf.features.cfg
-  ORIG=$CFG.orig
-  if [ -n "$2" ] ; then
-    echo "Add repository: $2"
-    mv $CFG $ORIG
-    cat $ORIG | sed -e "\|featuresRepositories|s|$|,$2|" > $CFG
-  fi
-  echo "Add boot feature: $1"
-  mv $CFG $ORIG
-  cat $ORIG | sed -e "\|featuresBoot *=|s|$|,$1|" > $CFG
-}
-
-# Append features to karaf boot feature configuration
-# $1 search pattern
-# $2 replacement
-function replaceFeatureBoot() {
-  CFG=$ODL_HOME/etc/org.apache.karaf.features.cfg
-  ORIG=$CFG.orig
-  echo "Replace boot feature $1 with: $2"
-  sed -i "/featuresBoot/ s/$1/$2/g" $CFG
-}
-
-# Remove features from karaf boot feature configuration
-# $1 search pattern
-function removeFeatureBoot() {
-  CFG=$ODL_HOME/etc/org.apache.karaf.features.cfg
-  ORIG=$CFG.orig
-  echo "Remove boot feature $1"
-  sed -i "/featuresBoot/ s/,\s*$1//g" $CFG
-}
-
-
-function initialize_sdnr() {
-  echo "SDN-R Database Initialization"
-  INITCMD="$JAVA_HOME/bin/java -jar "
-  INITCMD+="$ODL_HOME/system/org/onap/ccsdk/features/sdnr/wt/sdnr-wt-data-provider-setup/$CCSDKFEATUREVERSION/sdnr-dmt.jar "
-  INITCMD+="$SDNRDBCOMMAND"
-  echo "Execute: $INITCMD"
-  n=0
-  until [ $n -ge 5 ]
-  do
-    $INITCMD && break
-    n=$[$n+1]
-    sleep 15
-  done
-  return $?
-}
-
-function install_sdnrwt_features() {
-  # Repository setup provided via sdnc dockerfile
-  if $SDNRWT; then
-    #if $SDNRONLY; then
-    #  RUN sed -i -e /featuresBoot/d $ODL_HOME/etc/org.apache.karaf.features.cfg
-    #  RUN echo featuresBoot=config,standard,region,package,kar,ssh,management,odl-mdsal-all,odl-mdsal-apidocs,odl-daexim-all,odl-netconf-topology >> $ODL_HOME/etc/org.apache.karaf.features.cfg
-    #fi
-    if $SDNRDM; then
-      addToFeatureBoot "$SDNRDM_BOOTFEATURES"
-    else
-      addToFeatureBoot "$SDNRWT_BOOTFEATURES"
-    fi
-    if $SDNRONLY; then
-      removeFeatureBoot ccsdk-sli-core-all
-      removeFeatureBoot ccsdk-sli-adaptors-all
-      removeFeatureBoot ccsdk-sli-northbound-all
-      removeFeatureBoot ccsdk-sli-plugins-all
-      removeFeatureBoot ccsdk-features-all
-      removeFeatureBoot sdnc-northbound-all
-      removeFeatureBoot sdnr-northbound-all
-    fi
-  fi
-}
-
-function install_sdnr_northbound_features() {
-  # Repository setup provided via sdnc dockerfile
-  addToFeatureBoot "$SDNR_NORTHBOUND_BOOTFEATURES"
-}
-
-# Reconfigure ODL from default single node configuration to cluster
-
-function enable_odl_cluster(){
-  if [ -z $SDNC_REPLICAS ]; then
-     echo "SDNC_REPLICAS is not configured in Env field"
-     exit
-  fi
-
-  # ODL NETCONF setup
-  echo "Installing Opendaylight cluster features for mdsal and netconf"
-
-  #Be sure to remove feature odl-netconf-connector-all from list
-  replaceFeatureBoot "odl-netconf-connector-all,"
-  #Activate cluster
-  replaceFeatureBoot odl-netconf-topology odl-netconf-clustered-topology
-  replaceFeatureBoot odl-mdsal-all odl-mdsal-all,odl-mdsal-clustering
-  addToFeatureBoot odl-jolokia
-
-  # ODL Cluster or Geo cluster configuration
-
-  echo "Update cluster information statically"
-  fqdn=$(hostname -f)
-  echo "Get current fqdn ${fqdn}"
-
-  # Extract node index using first digit after "-"
-  # Example 2 from "sdnr-2.logo.ost.das.r32.com"
-  node_index=($(echo ${fqdn} | sed -r 's/.*-([0-9]).*/\1/g'))
-
-  if $GEO_ENABLED; then
-    echo "This is a Geo cluster"
-
-    if [ -z $IS_PRIMARY_CLUSTER ] || [ -z $MY_ODL_CLUSTER ] || [ -z $PEER_ODL_CLUSTER ]; then
-     echo "IS_PRIMARY_CLUSTER, MY_ODL_CLUSTER and PEER_ODL_CLUSTER must all be configured in Env field"
-     return
-    fi
-
-    member_offset=1
-    if $IS_PRIMARY_CLUSTER; then
-       PRIMARY_NODE=${MY_ODL_CLUSTER}
-       SECONDARY_NODE=${PEER_ODL_CLUSTER}
-    else
-       PRIMARY_NODE=${PEER_ODL_CLUSTER}
-       SECONDARY_NODE=${MY_ODL_CLUSTER}
-       member_offset=4
-    fi
-
-    node_list="${PRIMARY_NODE} ${SECONDARY_NODE}"
-    $SDNC_BIN/configure_geo_cluster.sh $((node_index+member_offset)) ${node_list}
-  else
-    echo "This is a local cluster"
-    for ((i=0;i<${SDNC_REPLICAS};i++)); do
-      #assemble node list by replaceing node-index in hostname with "i"
-      node_name=$(echo ${fqdn} | sed -r "s/-[0-9]/-$i/g")
-      node_list="${node_list} $node_name"
-    done
-    echo "Node index: $((node_index+1)) list: ${node_list[@]}"
-    $ODL_HOME/bin/configure_cluster.sh $((node_index+1)) ${node_list}
-  fi
-}
-
-# -----------------------
-# Main script starts here
-
-echo "Settings:"
-echo "  ENABLE_ODL_CLUSTER=$ENABLE_ODL_CLUSTER"
-echo "  SDNC_REPLICAS=$SDNC_REPLICAS"
-echo "  CCSDKFEATUREVERSION=$CCSDKFEATUREVERSION"
-echo "  SDNR_NORTHBOUND=$SDNR_NORTHBOUND"
-echo "  SDNRWT=$SDNRWT"
-echo "  SDNRDM=$SDNRDM"
-echo "  SDNRONLY=$SDNRONLY"
-echo "  SDNRINIT=$SDNRINIT"
-echo "  SDNRDBURL=$SDNRDBURL"
-echo "  SDNRDBUSERNAME=$SDNRDBUSERNAME"
-echo "  SDNRDBPASSWORD=$SDNRDBPASSWORD"
-echo "  GEO_ENABLED=$GEO_ENABLED"
-echo "  IS_PRIMARY_CLUSTER=$IS_PRIMARY_CLUSTER"
-echo "  MY_ODL_CLUSTER=$MY_ODL_CLUSTER"
-echo "  PEER_ODL_CLUSTER=$PEER_ODL_CLUSTER"
-echo "  AAF_ENABLED=$SDNC_AAF_ENABLED"
-
-
-if $SDNC_AAF_ENABLED; then
-    export SDNC_STORE_DIR=/opt/app/osaaf/local
-    export SDNC_CONFIG_DIR=/opt/app/osaaf/local
-    export SDNC_KEYPASS=`cat /opt/app/osaaf/local/.pass`
-    export SDNC_KEYSTORE=org.onap.sdnc.p12
-    sed -i '/cadi_prop_files/d' $ODL_HOME/etc/system.properties
-    echo "cadi_prop_files=$SDNC_CONFIG_DIR/org.onap.sdnc.props" >> $ODL_HOME/etc/system.properties
-
-    sed -i '/org.ops4j.pax.web.ssl.keystore/d' $ODL_HOME/etc/custom.properties
-    sed -i '/org.ops4j.pax.web.ssl.password/d' $ODL_HOME/etc/custom.properties
-    sed -i '/org.ops4j.pax.web.ssl.keypassword/d' $ODL_HOME/etc/custom.properties
-    echo org.ops4j.pax.web.ssl.keystore=$SDNC_STORE_DIR/$SDNC_KEYSTORE >> $ODL_HOME/etc/custom.properties
-    echo org.ops4j.pax.web.ssl.password=$SDNC_KEYPASS >> $ODL_HOME/etc/custom.properties
-    echo org.ops4j.pax.web.ssl.keypassword=$SDNC_KEYPASS >> $ODL_HOME/etc/custom.properties
-fi
-
-if $SDNRINIT ; then
-  #One time intialization action
-  initialize_sdnr
-  init_result=$?
-  echo "Result of init script: $init_result"
-  #exit $init_result
-fi
-
-if [ ! -f ${SDNC_HOME}/.installed ]
-then
-    echo "Installing SDN-C keyStore"
-    /bin/bash ${SDNC_HOME}/bin/addSdncKeyStore.sh
-
-    if $ENABLE_ODL_CLUSTER ; then enable_odl_cluster ; fi
-
-    if $SDNRWT ; then install_sdnrwt_features ; fi
-
-    if $SDNR_NORTHBOUND ; then install_sdnr_northbound_features ; fi
-
-    echo "Installed at `date`" > ${SDNC_HOME}/.installed
-fi
-
-if [ -d /opt/opendaylight/current/certs ] ; then
-  cp /opt/opendaylight/current/certs/* /tmp
-fi
-nohup python ${SDNC_BIN}/installCerts.py &
-
-exec ${ODL_HOME}/bin/karaf server
-
diff --git a/solution/integration/smo/sdnr/certs/certs.properties b/solution/integration/smo/sdnr/certs/certs.properties
new file mode 100644 (file)
index 0000000..32373a4
--- /dev/null
@@ -0,0 +1,2 @@
+keys0.zip
+***********
diff --git a/solution/integration/smo/sdnr/certs/keys0.zip b/solution/integration/smo/sdnr/certs/keys0.zip
new file mode 100644 (file)
index 0000000..588315f
Binary files /dev/null and b/solution/integration/smo/sdnr/certs/keys0.zip differ
diff --git a/solution/integration/smo/sdnr/mountpoint-registrar.properties b/solution/integration/smo/sdnr/mountpoint-registrar.properties
new file mode 100644 (file)
index 0000000..d6e01e2
--- /dev/null
@@ -0,0 +1,30 @@
+[general]
+dmaapEnabled=true
+baseUrl=http://localhost:8181
+sdnrUser=admin
+sdnrPasswd=${ODL_ADMIN_PASSWORD}
+
+[fault]
+faultConsumerClass=org.onap.ccsdk.features.sdnr.wt.mountpointregistrar.impl.DMaaPFaultVESMsgConsumer
+TransportType=HTTPNOAUTH
+host=onap-dmaap:3904
+topic=unauthenticated.SEC_FAULT_OUTPUT
+contenttype=application/json
+group=myG
+id=C1
+timeout=2000
+limit=1000
+fetchPause=5000
+
+[pnfRegistration]
+pnfRegConsumerClass=org.onap.ccsdk.features.sdnr.wt.mountpointregistrar.impl.DMaaPPNFRegVESMsgConsumer
+TransportType=HTTPNOAUTH
+host=onap-dmaap:3904
+topic=unauthenticated.VES_PNFREG_OUTPUT
+contenttype=application/json
+group=myG
+id=C1
+timeout=2000
+limit=1000
+fetchPause=5000
+
diff --git a/solution/integration/smo/vescollector/collector.properties b/solution/integration/smo/vescollector/collector.properties
new file mode 100644 (file)
index 0000000..ea4e2ac
--- /dev/null
@@ -0,0 +1,76 @@
+###############################################################################
+##
+## Collector Server config
+##
+##      - Default values are shown as commented settings.
+##
+###############################################################################
+##
+## HTTP(S) service
+##
+##      Normally:
+##
+##              - 8080 is http service
+##              - https is disabled by default
+##
+##              - At this time, the server always binds to 0.0.0.0
+##
+##
+#collector.service.port=8080
+
+## Authentication is only supported via secure port
+## When enabled - require valid keystore defined
+collector.service.secure.port=8443
+
+# auth.method flags:
+#
+# noAuth - default option - no security (http)
+# certBasicAuth - auth by certificate and basic auth username / password (https)
+auth.method=certBasicAuth
+
+## Combination of userid,hashPassword encoded pwd list to be supported
+## userid and pwd comma separated; pipe delimitation between each pair
+## Password is generated by crypt-password library using BCrypt algorithm stored in dcaegen2/sdk package
+## or https://nexus.onap.org/#nexus-search;quick~crypt-password
+header.authlist=sample1,$2a$10$0buh.2WeYwN868YMwnNNEuNEAMNYVU9.FSMJGyIKV3dGET/7oGOi6
+
+## The keystore must be setup per installation when secure port is configured
+collector.keystore.file.location=etc/keystore
+collector.keystore.passwordfile=etc/passwordfile
+
+collector.cert.subject.matcher=etc/certSubjectMatcher.properties
+
+## The truststore must be setup per installation when mutual tls support is configured
+collector.truststore.file.location=etc/truststore
+collector.truststore.passwordfile=etc/trustpasswordfile
+
+## Schema Validation checkflag
+## default no validation checkflag (-1)
+## If enabled (1) - schemafile location must be specified
+collector.schema.checkflag=1
+collector.schema.file={\"v1\":\"./etc/CommonEventFormat_27.2.json\",\"v2\":\"./etc/CommonEventFormat_27.2.json\",\"v3\":\"./etc/CommonEventFormat_27.2.json\",\"v4\":\"./etc/CommonEventFormat_27.2.json\",\"v5\":\"./etc/CommonEventFormat_28.4.1.json\",\"v7\":\"./etc/CommonEventFormat_30.2.1_ONAP.json\"}
+
+## Schema StndDefinedFields Validation checkflag
+## default no validation checkflag (-1)
+## If enabled (1) - schema files locations must be specified, mapping file path must be specified, schema reference path
+## in event json must be specified, path to stndDefined data field in event json must be specified
+collector.externalSchema.checkflag=1
+collector.externalSchema.schemasLocation=./etc/externalRepo/
+collector.externalSchema.mappingFileLocation=./etc/externalRepo/schema-map.json
+event.externalSchema.schemaRefPath=$.event.stndDefinedFields.schemaReference
+event.externalSchema.stndDefinedDataPath=$.event.stndDefinedFields.data
+
+## List all streamid per domain to be supported. The streamid should match to channel name on dmaapfile
+collector.dmaap.streamid=fault=ves-fault|syslog=ves-syslog|heartbeat=ves-heartbeat|measurementsForVfScaling=ves-measurement|mobileFlow=ves-mobileflow|other=ves-other|stateChange=ves-statechange|thresholdCrossingAlert=ves-thresholdCrossingAlert|voiceQuality=ves-voicequality|sipSignaling=ves-sipsignaling|notification=ves-notification|pnfRegistration=ves-pnfRegistration|3GPP-FaultSupervision=ves-3gpp-fault-supervision|3GPP-Heartbeat=ves-3gpp-heartbeat|3GPP-Provisioning=ves-3gpp-provisioning|3GPP-PerformanceAssurance=ves-3gpp-performance-assurance
+collector.dmaapfile=./etc/DmaapConfig.json
+
+## Path to the file containing description of api versions
+collector.description.api.version.location=etc/api_version_description.json
+
+## Event transformation Flag - when set expects configurable transformation
+## defined under ./etc/eventTransform.json
+## Enabled by default; to disable set to 0
+event.transform.flag=1
+
+# Describes at what frequency (measured in minutes) should application try to fetch config from CBS
+collector.dynamic.config.update.frequency=5
diff --git a/solution/integration/smo/zk/zk_server_jaas.conf b/solution/integration/smo/zk/zk_server_jaas.conf
new file mode 100644 (file)
index 0000000..26bf460
--- /dev/null
@@ -0,0 +1,4 @@
+Server {
+       org.apache.zookeeper.server.auth.DigestLoginModule required
+       user_kafka=kafka_secret;
+};
\ No newline at end of file