Merge "Extension of Yang files for OpenROADM"
authorDan Timoney <dtimoney@att.com>
Wed, 12 Aug 2020 18:20:46 +0000 (18:20 +0000)
committerGerrit Code Review <gerrit@onap.org>
Wed, 12 Aug 2020 18:20:46 +0000 (18:20 +0000)
129 files changed:
sdnr/wt/devicemanager-gran/feature/pom.xml [deleted file]
sdnr/wt/devicemanager-gran/installer/pom.xml [deleted file]
sdnr/wt/devicemanager-gran/installer/src/assembly/assemble_mvnrepo_zip.xml [deleted file]
sdnr/wt/devicemanager-gran/model/pom.xml [deleted file]
sdnr/wt/devicemanager-gran/model/src/main/yang/devicemanager-gran.yang [deleted file]
sdnr/wt/devicemanager-gran/pom.xml [deleted file]
sdnr/wt/devicemanager-gran/provider/copyright [deleted file]
sdnr/wt/devicemanager-gran/provider/pom.xml [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/gran/GRanNetworkElement.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/gran/GRanNetworkElementFactory.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/gran/impl/DeviceManagerGRanImpl.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/top/rev180731/$YangModelBindingProvider.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/top/rev180731/$YangModuleInfoImpl.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/top/rev180731/TopGrp.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/$YangModelBindingProvider.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/$YangModuleInfoImpl.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/AMFIdentifier.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/BwpContext.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/DataSetId.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/DefaultNotificationSubscription.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/DnnUpfInfoItem.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/Guami.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/IdentityRange.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/InterfaceUpfInfoItem.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/IpEndPoint.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/Ipv4AddressRange.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/Ipv6PrefixRange.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/IsInitialBwp.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/N1MessageClass.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/N2InformationClass.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/NFServiceVersion.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/NFStatus.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/NFType.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/NotificationEventType.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/NotificationType.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/PLMNId.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/QOffsetRange.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/RRMPolicyRatio2.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/SnssaiUpfInfoItem.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/SupiRange.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/SupportedFeatures.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TAMFPointer.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TAMFRegionId.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TAMFSetId.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TAdministrativeState.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TAvailabilityStatus.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TCellState.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TCyclicPrefix.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TDistinguishedName.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TDnn.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TLoad.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TMcc.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TMnc.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TNCI.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TNCIBuilder.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TNRPCI.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TNsiId.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TOperationalState.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TQuotaType.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TResourceSharingLevel.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TSNSSAI.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TSNSSAIBuilder.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TSST.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TSubcarrierSpacing.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TTAC.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TTACBuilder.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TTransportProtocol.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TUEMobilityLevel.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/Tai.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TxDirection.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/UPInterfaceType.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/guami/AmfId.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/guami/AmfIdBuilder.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/guami/PlmnId.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/guami/PlmnIdBuilder.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/Address.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/EndpointFqdn.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/EndpointFqdnBuilder.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/Ipv4Address.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/Ipv4AddressBuilder.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/Ipv6Address.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/Ipv6AddressBuilder.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/Ipv6Prefix.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/Ipv6PrefixBuilder.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/Address.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/address/Ipv4Address.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/address/Ipv4AddressBuilder.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/address/Ipv6Address.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/address/Ipv6AddressBuilder.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/address/Ipv6Prefix.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/address/Ipv6PrefixBuilder.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/snssaiupfinfoitem/DnnUpfInfo.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/snssaiupfinfoitem/DnnUpfInfoBuilder.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/snssaiupfinfoitem/DnnUpfInfoKey.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/tai/PlmnId.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/tai/PlmnIdBuilder.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml [deleted file]
sdnr/wt/devicemanager-gran/provider/src/main/resources/version.properties [deleted file]
sdnr/wt/devicemanager-gran/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/gran/test/TestDeviceManagerGRanImpl.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/gran/test/TestGRanNetworkElement.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/gran/test/TestGRanNetworkElementFactory.java [deleted file]
sdnr/wt/devicemanager-gran/provider/src/test/resources/simplelogger.properties [deleted file]
sdnr/wt/odlux/apps/configurationApp/src/actions/deviceActions.ts
sdnr/wt/odlux/apps/configurationApp/src/services/restServices.ts
sdnr/wt/odlux/apps/configurationApp/webpack.config.js
sdnr/wt/odlux/apps/connectApp/src/services/connectService.ts
sdnr/wt/odlux/apps/connectApp/webpack.config.js
sdnr/wt/odlux/apps/faultApp/src/actions/clearStuckAlarmsAction.ts
sdnr/wt/odlux/apps/faultApp/src/components/clearStuckAlarmsDialog.tsx
sdnr/wt/odlux/apps/faultApp/src/handlers/faultAppRootHandler.ts
sdnr/wt/odlux/apps/faultApp/src/models/fault.ts
sdnr/wt/odlux/apps/faultApp/src/services/faultStatusService.ts
sdnr/wt/odlux/apps/faultApp/webpack.config.js
sdnr/wt/odlux/apps/helpApp/src/services/helpService.ts
sdnr/wt/odlux/apps/inventoryApp/src/services/inventoryService.ts
sdnr/wt/odlux/apps/inventoryApp/webpack.config.js
sdnr/wt/odlux/apps/maintenanceApp/src/services/maintenenceService.ts
sdnr/wt/odlux/apps/maintenanceApp/webpack.config.js
sdnr/wt/odlux/apps/mediatorApp/src/services/mediatorService.ts
sdnr/wt/odlux/apps/performanceHistoryApp/src/services/performanceHistoryService.ts
sdnr/wt/odlux/apps/performanceHistoryApp/webpack.config.js
sdnr/wt/odlux/framework/pom.xml
sdnr/wt/odlux/framework/src/models/elasticSearch.ts
sdnr/wt/odlux/framework/src/services/restService.ts
sdnr/wt/odlux/framework/src/utilities/elasticSearch.ts
sdnr/wt/odlux/framework/src/views/about.tsx
sdnr/wt/odlux/framework/src2/main/resources/version.json [new file with mode: 0644]
sdnr/wt/odlux/framework/webpack.config.js
sdnr/wt/odlux/yarn.lock

diff --git a/sdnr/wt/devicemanager-gran/feature/pom.xml b/sdnr/wt/devicemanager-gran/feature/pom.xml
deleted file mode 100644 (file)
index 7c0a9b4..0000000
+++ /dev/null
@@ -1,50 +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.onap.ccsdk.parent</groupId>
-        <artifactId>single-feature-parent</artifactId>
-        <version>2.0.1-SNAPSHOT</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-    <artifactId>sdnr-wt-devicemanager-gran-feature</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
-
-    <name>ccsdk-features :: ${project.artifactId}</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>sdnr-wt-devicemanager-gran-provider</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/sdnr/wt/devicemanager-gran/installer/pom.xml b/sdnr/wt/devicemanager-gran/installer/pom.xml
deleted file mode 100755 (executable)
index e515bf1..0000000
+++ /dev/null
@@ -1,127 +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.onap.ccsdk.parent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>2.0.1-SNAPSHOT</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-    <artifactId>sdnr-wt-devicemanager-gran-installer</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <name>ccsdk-features :: ${project.artifactId}</name>
-
-    <properties>
-        <application.name>sdnr-wt-devicemanager-gran</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>org.onap.ccsdk.features.sdnr.wt</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>org.onap.ccsdk.features.sdnr.wt</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/sdnr/wt/devicemanager-gran/installer/src/assembly/assemble_mvnrepo_zip.xml b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/model/pom.xml b/sdnr/wt/devicemanager-gran/model/pom.xml
deleted file mode 100644 (file)
index 8f6f2ad..0000000
+++ /dev/null
@@ -1,72 +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.onap.ccsdk.parent</groupId>
-        <artifactId>binding-parent</artifactId>
-        <version>2.0.1-SNAPSHOT</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-    <artifactId>sdnr-wt-devicemanager-gran-model</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-
-    <name>ccsdk-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>
-</project>
diff --git a/sdnr/wt/devicemanager-gran/model/src/main/yang/devicemanager-gran.yang b/sdnr/wt/devicemanager-gran/model/src/main/yang/devicemanager-gran.yang
deleted file mode 100644 (file)
index 4272892..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-module devicemanager-gran {
-
-  yang-version 1;
-  namespace "urn:opendaylight:params:xml:ns:yang:devicemanager-gran";
-  prefix devicemanager-gran;
-
-  organization
-    "highstreet technologies GmbH";
-  contact
-    "Web:    <https://highstreet-technologies.com>
-     O-RAN1: <https://wiki.o-ran-sc.org/display/OAM/Operations+and+Maintenance";
-
-  description
-    "DeviceManager 3gpp 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-29 {
-    description
-      "Initial revision";
-    reference
-      "https://jira.onap.org/browse/SDNC-877";
-  }
-}
diff --git a/sdnr/wt/devicemanager-gran/pom.xml b/sdnr/wt/devicemanager-gran/pom.xml
deleted file mode 100755 (executable)
index 6a219f1..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.onap.ccsdk.parent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>2.0.1-SNAPSHOT</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-    <artifactId>sdnr-wt-devicemanager-gran-top</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <name>ccsdk-features :: ${project.artifactId}</name>
-
-    <modules>
-        <module>model</module>
-        <module>provider</module>
-        <module>feature</module>
-        <module>installer</module>
-    </modules>
-
-    <properties>
-        <feature-name>sdnr-wt-devicemanager-gran</feature-name>
-    </properties>
-</project>
diff --git a/sdnr/wt/devicemanager-gran/provider/copyright b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/pom.xml b/sdnr/wt/devicemanager-gran/provider/pom.xml
deleted file mode 100644 (file)
index d7147f5..0000000
+++ /dev/null
@@ -1,136 +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=======================================================
-  ~
-  -->
-
-<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>binding-parent</artifactId>
-        <version>2.0.1-SNAPSHOT</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-    <artifactId>sdnr-wt-devicemanager-gran-provider</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-
-    <name>ccsdk-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>sdnr-wt-devicemanager-gran-model</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>sdnr-wt-netconfnode-state-service-model</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </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-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>
-</project>
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/gran/GRanNetworkElement.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/gran/GRanNetworkElement.java
deleted file mode 100644 (file)
index 7698a4a..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.onap.ccsdk.features.sdnr.wt.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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/gran/GRanNetworkElementFactory.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/gran/GRanNetworkElementFactory.java
deleted file mode 100644 (file)
index 81cdf75..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.onap.ccsdk.features.sdnr.wt.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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/gran/impl/DeviceManagerGRanImpl.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/gran/impl/DeviceManagerGRanImpl.java
deleted file mode 100644 (file)
index 891feda..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.onap.ccsdk.features.sdnr.wt.devicemanager.gran.impl;
-
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.gran.GRanNetworkElementFactory;
-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 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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/top/rev180731/$YangModelBindingProvider.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/top/rev180731/$YangModuleInfoImpl.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/top/rev180731/TopGrp.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/$YangModelBindingProvider.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/$YangModuleInfoImpl.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/AMFIdentifier.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/BwpContext.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/DataSetId.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/DefaultNotificationSubscription.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/DnnUpfInfoItem.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/Guami.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/IdentityRange.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/InterfaceUpfInfoItem.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/IpEndPoint.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/Ipv4AddressRange.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/Ipv6PrefixRange.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/IsInitialBwp.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/N1MessageClass.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/N2InformationClass.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/NFServiceVersion.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/NFStatus.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/NFType.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/NotificationEventType.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/NotificationType.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/PLMNId.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/QOffsetRange.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/RRMPolicyRatio2.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/SnssaiUpfInfoItem.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/SupiRange.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/SupportedFeatures.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TAMFPointer.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TAMFRegionId.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TAMFSetId.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TAdministrativeState.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TAvailabilityStatus.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TCellState.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TCyclicPrefix.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TDistinguishedName.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TDnn.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TLoad.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TMcc.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TMnc.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TNCI.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TNCIBuilder.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TNRPCI.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TNsiId.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TOperationalState.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TQuotaType.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TResourceSharingLevel.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TSNSSAI.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TSNSSAIBuilder.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TSST.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TSubcarrierSpacing.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TTAC.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TTACBuilder.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TTransportProtocol.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TUEMobilityLevel.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/Tai.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/TxDirection.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/UPInterfaceType.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/guami/AmfId.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/guami/AmfIdBuilder.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/guami/AmfIdBuilder.java
deleted file mode 100644 (file)
index 03348ba..0000000
+++ /dev/null
@@ -1,255 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.guami;
-import com.google.common.base.MoreObjects;
-import com.google.common.collect.ImmutableMap;
-import java.lang.Class;
-import java.lang.Object;
-import java.lang.Override;
-import java.lang.String;
-import java.lang.SuppressWarnings;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.TAMFPointer;
-import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.TAMFRegionId;
-import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.TAMFSetId;
-import org.opendaylight.yangtools.concepts.Builder;
-import org.opendaylight.yangtools.yang.binding.Augmentation;
-import org.opendaylight.yangtools.yang.binding.AugmentationHolder;
-import org.opendaylight.yangtools.yang.binding.CodeHelpers;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-
-/**
- * Class that builds {@link AmfIdBuilder} instances.
- *
- * @see AmfIdBuilder
- *
- */
-public class AmfIdBuilder implements Builder<AmfId> {
-
-    private TAMFPointer _aMFPointer;
-    private TAMFRegionId _aMFRegionId;
-    private TAMFSetId _aMFSetId;
-
-
-    Map<Class<? extends Augmentation<AmfId>>, Augmentation<AmfId>> augmentation = Collections.emptyMap();
-
-    public AmfIdBuilder() {
-    }
-    public AmfIdBuilder(org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.AMFIdentifier arg) {
-        this._aMFRegionId = arg.getAMFRegionId();
-        this._aMFSetId = arg.getAMFSetId();
-        this._aMFPointer = arg.getAMFPointer();
-    }
-
-    public AmfIdBuilder(AmfId base) {
-        this._aMFPointer = base.getAMFPointer();
-        this._aMFRegionId = base.getAMFRegionId();
-        this._aMFSetId = base.getAMFSetId();
-        if (base instanceof AmfIdImpl) {
-            AmfIdImpl impl = (AmfIdImpl) base;
-            if (!impl.augmentation.isEmpty()) {
-                this.augmentation = new HashMap<>(impl.augmentation);
-            }
-        } else if (base instanceof AugmentationHolder) {
-            @SuppressWarnings("unchecked")
-            Map<Class<? extends Augmentation<AmfId>>, Augmentation<AmfId>> aug =((AugmentationHolder<AmfId>) base).augmentations();
-            if (!aug.isEmpty()) {
-                this.augmentation = new HashMap<>(aug);
-            }
-        }
-    }
-
-    /**
-     * Set fields from given grouping argument. Valid argument is instance of one of following types:
-     * <ul>
-     * <li>org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.AMFIdentifier</li>
-     * </ul>
-     *
-     * @param arg grouping object
-     * @throws IllegalArgumentException if given argument is none of valid types
-    */
-    public void fieldsFrom(DataObject arg) {
-        boolean isValidArg = false;
-        if (arg instanceof org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.AMFIdentifier) {
-            this._aMFRegionId = ((org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.AMFIdentifier)arg).getAMFRegionId();
-            this._aMFSetId = ((org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.AMFIdentifier)arg).getAMFSetId();
-            this._aMFPointer = ((org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.AMFIdentifier)arg).getAMFPointer();
-            isValidArg = true;
-        }
-        CodeHelpers.validValue(isValidArg, arg, "[org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.AMFIdentifier]");
-    }
-
-    public TAMFPointer getAMFPointer() {
-        return _aMFPointer;
-    }
-    
-    public TAMFRegionId getAMFRegionId() {
-        return _aMFRegionId;
-    }
-    
-    public TAMFSetId getAMFSetId() {
-        return _aMFSetId;
-    }
-    
-    @SuppressWarnings({ "unchecked", "checkstyle:methodTypeParameterName"})
-    public <E$$ extends Augmentation<AmfId>> E$$ augmentation(Class<E$$> augmentationType) {
-        return (E$$) augmentation.get(CodeHelpers.nonNullValue(augmentationType, "augmentationType"));
-    }
-
-    
-    public AmfIdBuilder setAMFPointer(final TAMFPointer value) {
-        this._aMFPointer = value;
-        return this;
-    }
-    
-    public AmfIdBuilder setAMFRegionId(final TAMFRegionId value) {
-        this._aMFRegionId = value;
-        return this;
-    }
-    
-    public AmfIdBuilder setAMFSetId(final TAMFSetId value) {
-        this._aMFSetId = value;
-        return this;
-    }
-    
-    public AmfIdBuilder addAugmentation(Class<? extends Augmentation<AmfId>> augmentationType, Augmentation<AmfId> augmentationValue) {
-        if (augmentationValue == null) {
-            return removeAugmentation(augmentationType);
-        }
-    
-        if (!(this.augmentation instanceof HashMap)) {
-            this.augmentation = new HashMap<>();
-        }
-    
-        this.augmentation.put(augmentationType, augmentationValue);
-        return this;
-    }
-    
-    public AmfIdBuilder removeAugmentation(Class<? extends Augmentation<AmfId>> augmentationType) {
-        if (this.augmentation instanceof HashMap) {
-            this.augmentation.remove(augmentationType);
-        }
-        return this;
-    }
-
-    @Override
-    public AmfId build() {
-        return new AmfIdImpl(this);
-    }
-
-    private static final class AmfIdImpl implements AmfId {
-    
-        private final TAMFPointer _aMFPointer;
-        private final TAMFRegionId _aMFRegionId;
-        private final TAMFSetId _aMFSetId;
-    
-        private Map<Class<? extends Augmentation<AmfId>>, Augmentation<AmfId>> augmentation = Collections.emptyMap();
-    
-        AmfIdImpl(AmfIdBuilder base) {
-            this._aMFPointer = base.getAMFPointer();
-            this._aMFRegionId = base.getAMFRegionId();
-            this._aMFSetId = base.getAMFSetId();
-            this.augmentation = ImmutableMap.copyOf(base.augmentation);
-        }
-    
-        @Override
-        public Class<AmfId> getImplementedInterface() {
-            return AmfId.class;
-        }
-    
-        @Override
-        public TAMFPointer getAMFPointer() {
-            return _aMFPointer;
-        }
-        
-        @Override
-        public TAMFRegionId getAMFRegionId() {
-            return _aMFRegionId;
-        }
-        
-        @Override
-        public TAMFSetId getAMFSetId() {
-            return _aMFSetId;
-        }
-        
-        @SuppressWarnings({ "unchecked", "checkstyle:methodTypeParameterName"})
-        @Override
-        public <E$$ extends Augmentation<AmfId>> E$$ augmentation(Class<E$$> augmentationType) {
-            return (E$$) augmentation.get(CodeHelpers.nonNullValue(augmentationType, "augmentationType"));
-        }
-    
-        private int hash = 0;
-        private volatile boolean hashValid = false;
-        
-        @Override
-        public int hashCode() {
-            if (hashValid) {
-                return hash;
-            }
-        
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + Objects.hashCode(_aMFPointer);
-            result = prime * result + Objects.hashCode(_aMFRegionId);
-            result = prime * result + Objects.hashCode(_aMFSetId);
-            result = prime * result + Objects.hashCode(augmentation);
-        
-            hash = result;
-            hashValid = true;
-            return result;
-        }
-    
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (!(obj instanceof DataObject)) {
-                return false;
-            }
-            if (!AmfId.class.equals(((DataObject)obj).getImplementedInterface())) {
-                return false;
-            }
-            AmfId other = (AmfId)obj;
-            if (!Objects.equals(_aMFPointer, other.getAMFPointer())) {
-                return false;
-            }
-            if (!Objects.equals(_aMFRegionId, other.getAMFRegionId())) {
-                return false;
-            }
-            if (!Objects.equals(_aMFSetId, other.getAMFSetId())) {
-                return false;
-            }
-            if (getClass() == obj.getClass()) {
-                // Simple case: we are comparing against self
-                AmfIdImpl otherImpl = (AmfIdImpl) obj;
-                if (!Objects.equals(augmentation, otherImpl.augmentation)) {
-                    return false;
-                }
-            } else {
-                // Hard case: compare our augments with presence there...
-                for (Map.Entry<Class<? extends Augmentation<AmfId>>, Augmentation<AmfId>> e : augmentation.entrySet()) {
-                    if (!e.getValue().equals(other.augmentation(e.getKey()))) {
-                        return false;
-                    }
-                }
-                // .. and give the other one the chance to do the same
-                if (!obj.equals(this)) {
-                    return false;
-                }
-            }
-            return true;
-        }
-    
-        @Override
-        public String toString() {
-            final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper("AmfId");
-            CodeHelpers.appendValue(helper, "_aMFPointer", _aMFPointer);
-            CodeHelpers.appendValue(helper, "_aMFRegionId", _aMFRegionId);
-            CodeHelpers.appendValue(helper, "_aMFSetId", _aMFSetId);
-            CodeHelpers.appendValue(helper, "augmentation", augmentation.values());
-            return helper.toString();
-        }
-    }
-}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/guami/PlmnId.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/guami/PlmnIdBuilder.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/guami/PlmnIdBuilder.java
deleted file mode 100644 (file)
index d108725..0000000
+++ /dev/null
@@ -1,229 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.guami;
-import com.google.common.base.MoreObjects;
-import com.google.common.collect.ImmutableMap;
-import java.lang.Class;
-import java.lang.Object;
-import java.lang.Override;
-import java.lang.String;
-import java.lang.SuppressWarnings;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.TMcc;
-import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.TMnc;
-import org.opendaylight.yangtools.concepts.Builder;
-import org.opendaylight.yangtools.yang.binding.Augmentation;
-import org.opendaylight.yangtools.yang.binding.AugmentationHolder;
-import org.opendaylight.yangtools.yang.binding.CodeHelpers;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-
-/**
- * Class that builds {@link PlmnIdBuilder} instances.
- *
- * @see PlmnIdBuilder
- *
- */
-public class PlmnIdBuilder implements Builder<PlmnId> {
-
-    private TMcc _mCC;
-    private TMnc _mNC;
-
-
-    Map<Class<? extends Augmentation<PlmnId>>, Augmentation<PlmnId>> augmentation = Collections.emptyMap();
-
-    public PlmnIdBuilder() {
-    }
-    public PlmnIdBuilder(org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.PLMNId arg) {
-        this._mCC = arg.getMCC();
-        this._mNC = arg.getMNC();
-    }
-
-    public PlmnIdBuilder(PlmnId base) {
-        this._mCC = base.getMCC();
-        this._mNC = base.getMNC();
-        if (base instanceof PlmnIdImpl) {
-            PlmnIdImpl impl = (PlmnIdImpl) base;
-            if (!impl.augmentation.isEmpty()) {
-                this.augmentation = new HashMap<>(impl.augmentation);
-            }
-        } else if (base instanceof AugmentationHolder) {
-            @SuppressWarnings("unchecked")
-            Map<Class<? extends Augmentation<PlmnId>>, Augmentation<PlmnId>> aug =((AugmentationHolder<PlmnId>) base).augmentations();
-            if (!aug.isEmpty()) {
-                this.augmentation = new HashMap<>(aug);
-            }
-        }
-    }
-
-    /**
-     * Set fields from given grouping argument. Valid argument is instance of one of following types:
-     * <ul>
-     * <li>org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.PLMNId</li>
-     * </ul>
-     *
-     * @param arg grouping object
-     * @throws IllegalArgumentException if given argument is none of valid types
-    */
-    public void fieldsFrom(DataObject arg) {
-        boolean isValidArg = false;
-        if (arg instanceof org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.PLMNId) {
-            this._mCC = ((org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.PLMNId)arg).getMCC();
-            this._mNC = ((org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.PLMNId)arg).getMNC();
-            isValidArg = true;
-        }
-        CodeHelpers.validValue(isValidArg, arg, "[org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.PLMNId]");
-    }
-
-    public TMcc getMCC() {
-        return _mCC;
-    }
-    
-    public TMnc getMNC() {
-        return _mNC;
-    }
-    
-    @SuppressWarnings({ "unchecked", "checkstyle:methodTypeParameterName"})
-    public <E$$ extends Augmentation<PlmnId>> E$$ augmentation(Class<E$$> augmentationType) {
-        return (E$$) augmentation.get(CodeHelpers.nonNullValue(augmentationType, "augmentationType"));
-    }
-
-    
-    public PlmnIdBuilder setMCC(final TMcc value) {
-        this._mCC = value;
-        return this;
-    }
-    
-    public PlmnIdBuilder setMNC(final TMnc value) {
-        this._mNC = value;
-        return this;
-    }
-    
-    public PlmnIdBuilder addAugmentation(Class<? extends Augmentation<PlmnId>> augmentationType, Augmentation<PlmnId> augmentationValue) {
-        if (augmentationValue == null) {
-            return removeAugmentation(augmentationType);
-        }
-    
-        if (!(this.augmentation instanceof HashMap)) {
-            this.augmentation = new HashMap<>();
-        }
-    
-        this.augmentation.put(augmentationType, augmentationValue);
-        return this;
-    }
-    
-    public PlmnIdBuilder removeAugmentation(Class<? extends Augmentation<PlmnId>> augmentationType) {
-        if (this.augmentation instanceof HashMap) {
-            this.augmentation.remove(augmentationType);
-        }
-        return this;
-    }
-
-    @Override
-    public PlmnId build() {
-        return new PlmnIdImpl(this);
-    }
-
-    private static final class PlmnIdImpl implements PlmnId {
-    
-        private final TMcc _mCC;
-        private final TMnc _mNC;
-    
-        private Map<Class<? extends Augmentation<PlmnId>>, Augmentation<PlmnId>> augmentation = Collections.emptyMap();
-    
-        PlmnIdImpl(PlmnIdBuilder base) {
-            this._mCC = base.getMCC();
-            this._mNC = base.getMNC();
-            this.augmentation = ImmutableMap.copyOf(base.augmentation);
-        }
-    
-        @Override
-        public Class<PlmnId> getImplementedInterface() {
-            return PlmnId.class;
-        }
-    
-        @Override
-        public TMcc getMCC() {
-            return _mCC;
-        }
-        
-        @Override
-        public TMnc getMNC() {
-            return _mNC;
-        }
-        
-        @SuppressWarnings({ "unchecked", "checkstyle:methodTypeParameterName"})
-        @Override
-        public <E$$ extends Augmentation<PlmnId>> E$$ augmentation(Class<E$$> augmentationType) {
-            return (E$$) augmentation.get(CodeHelpers.nonNullValue(augmentationType, "augmentationType"));
-        }
-    
-        private int hash = 0;
-        private volatile boolean hashValid = false;
-        
-        @Override
-        public int hashCode() {
-            if (hashValid) {
-                return hash;
-            }
-        
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + Objects.hashCode(_mCC);
-            result = prime * result + Objects.hashCode(_mNC);
-            result = prime * result + Objects.hashCode(augmentation);
-        
-            hash = result;
-            hashValid = true;
-            return result;
-        }
-    
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (!(obj instanceof DataObject)) {
-                return false;
-            }
-            if (!PlmnId.class.equals(((DataObject)obj).getImplementedInterface())) {
-                return false;
-            }
-            PlmnId other = (PlmnId)obj;
-            if (!Objects.equals(_mCC, other.getMCC())) {
-                return false;
-            }
-            if (!Objects.equals(_mNC, other.getMNC())) {
-                return false;
-            }
-            if (getClass() == obj.getClass()) {
-                // Simple case: we are comparing against self
-                PlmnIdImpl otherImpl = (PlmnIdImpl) obj;
-                if (!Objects.equals(augmentation, otherImpl.augmentation)) {
-                    return false;
-                }
-            } else {
-                // Hard case: compare our augments with presence there...
-                for (Map.Entry<Class<? extends Augmentation<PlmnId>>, Augmentation<PlmnId>> e : augmentation.entrySet()) {
-                    if (!e.getValue().equals(other.augmentation(e.getKey()))) {
-                        return false;
-                    }
-                }
-                // .. and give the other one the chance to do the same
-                if (!obj.equals(this)) {
-                    return false;
-                }
-            }
-            return true;
-        }
-    
-        @Override
-        public String toString() {
-            final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper("PlmnId");
-            CodeHelpers.appendValue(helper, "_mCC", _mCC);
-            CodeHelpers.appendValue(helper, "_mNC", _mNC);
-            CodeHelpers.appendValue(helper, "augmentation", augmentation.values());
-            return helper.toString();
-        }
-    }
-}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/Address.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/EndpointFqdn.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/EndpointFqdnBuilder.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/EndpointFqdnBuilder.java
deleted file mode 100644 (file)
index 2abed8b..0000000
+++ /dev/null
@@ -1,183 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.interfaceupfinfoitem.address;
-import com.google.common.base.MoreObjects;
-import com.google.common.collect.ImmutableMap;
-import java.lang.Class;
-import java.lang.Object;
-import java.lang.Override;
-import java.lang.String;
-import java.lang.SuppressWarnings;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.DomainName;
-import org.opendaylight.yangtools.concepts.Builder;
-import org.opendaylight.yangtools.yang.binding.Augmentation;
-import org.opendaylight.yangtools.yang.binding.AugmentationHolder;
-import org.opendaylight.yangtools.yang.binding.CodeHelpers;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-
-/**
- * Class that builds {@link EndpointFqdnBuilder} instances.
- *
- * @see EndpointFqdnBuilder
- *
- */
-public class EndpointFqdnBuilder implements Builder<EndpointFqdn> {
-
-    private DomainName _endpointFqdn;
-
-
-    Map<Class<? extends Augmentation<EndpointFqdn>>, Augmentation<EndpointFqdn>> augmentation = Collections.emptyMap();
-
-    public EndpointFqdnBuilder() {
-    }
-
-    public EndpointFqdnBuilder(EndpointFqdn base) {
-        this._endpointFqdn = base.getEndpointFqdn();
-        if (base instanceof EndpointFqdnImpl) {
-            EndpointFqdnImpl impl = (EndpointFqdnImpl) base;
-            if (!impl.augmentation.isEmpty()) {
-                this.augmentation = new HashMap<>(impl.augmentation);
-            }
-        } else if (base instanceof AugmentationHolder) {
-            @SuppressWarnings("unchecked")
-            Map<Class<? extends Augmentation<EndpointFqdn>>, Augmentation<EndpointFqdn>> aug =((AugmentationHolder<EndpointFqdn>) base).augmentations();
-            if (!aug.isEmpty()) {
-                this.augmentation = new HashMap<>(aug);
-            }
-        }
-    }
-
-
-    public DomainName getEndpointFqdn() {
-        return _endpointFqdn;
-    }
-    
-    @SuppressWarnings({ "unchecked", "checkstyle:methodTypeParameterName"})
-    public <E$$ extends Augmentation<EndpointFqdn>> E$$ augmentation(Class<E$$> augmentationType) {
-        return (E$$) augmentation.get(CodeHelpers.nonNullValue(augmentationType, "augmentationType"));
-    }
-
-    
-    public EndpointFqdnBuilder setEndpointFqdn(final DomainName value) {
-        this._endpointFqdn = value;
-        return this;
-    }
-    
-    public EndpointFqdnBuilder addAugmentation(Class<? extends Augmentation<EndpointFqdn>> augmentationType, Augmentation<EndpointFqdn> augmentationValue) {
-        if (augmentationValue == null) {
-            return removeAugmentation(augmentationType);
-        }
-    
-        if (!(this.augmentation instanceof HashMap)) {
-            this.augmentation = new HashMap<>();
-        }
-    
-        this.augmentation.put(augmentationType, augmentationValue);
-        return this;
-    }
-    
-    public EndpointFqdnBuilder removeAugmentation(Class<? extends Augmentation<EndpointFqdn>> augmentationType) {
-        if (this.augmentation instanceof HashMap) {
-            this.augmentation.remove(augmentationType);
-        }
-        return this;
-    }
-
-    @Override
-    public EndpointFqdn build() {
-        return new EndpointFqdnImpl(this);
-    }
-
-    private static final class EndpointFqdnImpl implements EndpointFqdn {
-    
-        private final DomainName _endpointFqdn;
-    
-        private Map<Class<? extends Augmentation<EndpointFqdn>>, Augmentation<EndpointFqdn>> augmentation = Collections.emptyMap();
-    
-        EndpointFqdnImpl(EndpointFqdnBuilder base) {
-            this._endpointFqdn = base.getEndpointFqdn();
-            this.augmentation = ImmutableMap.copyOf(base.augmentation);
-        }
-    
-        @Override
-        public Class<EndpointFqdn> getImplementedInterface() {
-            return EndpointFqdn.class;
-        }
-    
-        @Override
-        public DomainName getEndpointFqdn() {
-            return _endpointFqdn;
-        }
-        
-        @SuppressWarnings({ "unchecked", "checkstyle:methodTypeParameterName"})
-        @Override
-        public <E$$ extends Augmentation<EndpointFqdn>> E$$ augmentation(Class<E$$> augmentationType) {
-            return (E$$) augmentation.get(CodeHelpers.nonNullValue(augmentationType, "augmentationType"));
-        }
-    
-        private int hash = 0;
-        private volatile boolean hashValid = false;
-        
-        @Override
-        public int hashCode() {
-            if (hashValid) {
-                return hash;
-            }
-        
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + Objects.hashCode(_endpointFqdn);
-            result = prime * result + Objects.hashCode(augmentation);
-        
-            hash = result;
-            hashValid = true;
-            return result;
-        }
-    
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (!(obj instanceof DataObject)) {
-                return false;
-            }
-            if (!EndpointFqdn.class.equals(((DataObject)obj).getImplementedInterface())) {
-                return false;
-            }
-            EndpointFqdn other = (EndpointFqdn)obj;
-            if (!Objects.equals(_endpointFqdn, other.getEndpointFqdn())) {
-                return false;
-            }
-            if (getClass() == obj.getClass()) {
-                // Simple case: we are comparing against self
-                EndpointFqdnImpl otherImpl = (EndpointFqdnImpl) obj;
-                if (!Objects.equals(augmentation, otherImpl.augmentation)) {
-                    return false;
-                }
-            } else {
-                // Hard case: compare our augments with presence there...
-                for (Map.Entry<Class<? extends Augmentation<EndpointFqdn>>, Augmentation<EndpointFqdn>> e : augmentation.entrySet()) {
-                    if (!e.getValue().equals(other.augmentation(e.getKey()))) {
-                        return false;
-                    }
-                }
-                // .. and give the other one the chance to do the same
-                if (!obj.equals(this)) {
-                    return false;
-                }
-            }
-            return true;
-        }
-    
-        @Override
-        public String toString() {
-            final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper("EndpointFqdn");
-            CodeHelpers.appendValue(helper, "_endpointFqdn", _endpointFqdn);
-            CodeHelpers.appendValue(helper, "augmentation", augmentation.values());
-            return helper.toString();
-        }
-    }
-}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/Ipv4Address.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/Ipv4AddressBuilder.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/Ipv4AddressBuilder.java
deleted file mode 100644 (file)
index 4ad474a..0000000
+++ /dev/null
@@ -1,182 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.interfaceupfinfoitem.address;
-import com.google.common.base.MoreObjects;
-import com.google.common.collect.ImmutableMap;
-import java.lang.Class;
-import java.lang.Object;
-import java.lang.Override;
-import java.lang.String;
-import java.lang.SuppressWarnings;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-import org.opendaylight.yangtools.concepts.Builder;
-import org.opendaylight.yangtools.yang.binding.Augmentation;
-import org.opendaylight.yangtools.yang.binding.AugmentationHolder;
-import org.opendaylight.yangtools.yang.binding.CodeHelpers;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-
-/**
- * Class that builds {@link Ipv4AddressBuilder} instances.
- *
- * @see Ipv4AddressBuilder
- *
- */
-public class Ipv4AddressBuilder implements Builder<Ipv4Address> {
-
-    private org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address _ipv4Address;
-
-
-    Map<Class<? extends Augmentation<Ipv4Address>>, Augmentation<Ipv4Address>> augmentation = Collections.emptyMap();
-
-    public Ipv4AddressBuilder() {
-    }
-
-    public Ipv4AddressBuilder(Ipv4Address base) {
-        this._ipv4Address = base.getIpv4Address();
-        if (base instanceof Ipv4AddressImpl) {
-            Ipv4AddressImpl impl = (Ipv4AddressImpl) base;
-            if (!impl.augmentation.isEmpty()) {
-                this.augmentation = new HashMap<>(impl.augmentation);
-            }
-        } else if (base instanceof AugmentationHolder) {
-            @SuppressWarnings("unchecked")
-            Map<Class<? extends Augmentation<Ipv4Address>>, Augmentation<Ipv4Address>> aug =((AugmentationHolder<Ipv4Address>) base).augmentations();
-            if (!aug.isEmpty()) {
-                this.augmentation = new HashMap<>(aug);
-            }
-        }
-    }
-
-
-    public org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address getIpv4Address() {
-        return _ipv4Address;
-    }
-    
-    @SuppressWarnings({ "unchecked", "checkstyle:methodTypeParameterName"})
-    public <E$$ extends Augmentation<Ipv4Address>> E$$ augmentation(Class<E$$> augmentationType) {
-        return (E$$) augmentation.get(CodeHelpers.nonNullValue(augmentationType, "augmentationType"));
-    }
-
-    
-    public Ipv4AddressBuilder setIpv4Address(final org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address value) {
-        this._ipv4Address = value;
-        return this;
-    }
-    
-    public Ipv4AddressBuilder addAugmentation(Class<? extends Augmentation<Ipv4Address>> augmentationType, Augmentation<Ipv4Address> augmentationValue) {
-        if (augmentationValue == null) {
-            return removeAugmentation(augmentationType);
-        }
-    
-        if (!(this.augmentation instanceof HashMap)) {
-            this.augmentation = new HashMap<>();
-        }
-    
-        this.augmentation.put(augmentationType, augmentationValue);
-        return this;
-    }
-    
-    public Ipv4AddressBuilder removeAugmentation(Class<? extends Augmentation<Ipv4Address>> augmentationType) {
-        if (this.augmentation instanceof HashMap) {
-            this.augmentation.remove(augmentationType);
-        }
-        return this;
-    }
-
-    @Override
-    public Ipv4Address build() {
-        return new Ipv4AddressImpl(this);
-    }
-
-    private static final class Ipv4AddressImpl implements Ipv4Address {
-    
-        private final org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address _ipv4Address;
-    
-        private Map<Class<? extends Augmentation<Ipv4Address>>, Augmentation<Ipv4Address>> augmentation = Collections.emptyMap();
-    
-        Ipv4AddressImpl(Ipv4AddressBuilder base) {
-            this._ipv4Address = base.getIpv4Address();
-            this.augmentation = ImmutableMap.copyOf(base.augmentation);
-        }
-    
-        @Override
-        public Class<Ipv4Address> getImplementedInterface() {
-            return Ipv4Address.class;
-        }
-    
-        @Override
-        public org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address getIpv4Address() {
-            return _ipv4Address;
-        }
-        
-        @SuppressWarnings({ "unchecked", "checkstyle:methodTypeParameterName"})
-        @Override
-        public <E$$ extends Augmentation<Ipv4Address>> E$$ augmentation(Class<E$$> augmentationType) {
-            return (E$$) augmentation.get(CodeHelpers.nonNullValue(augmentationType, "augmentationType"));
-        }
-    
-        private int hash = 0;
-        private volatile boolean hashValid = false;
-        
-        @Override
-        public int hashCode() {
-            if (hashValid) {
-                return hash;
-            }
-        
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + Objects.hashCode(_ipv4Address);
-            result = prime * result + Objects.hashCode(augmentation);
-        
-            hash = result;
-            hashValid = true;
-            return result;
-        }
-    
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (!(obj instanceof DataObject)) {
-                return false;
-            }
-            if (!Ipv4Address.class.equals(((DataObject)obj).getImplementedInterface())) {
-                return false;
-            }
-            Ipv4Address other = (Ipv4Address)obj;
-            if (!Objects.equals(_ipv4Address, other.getIpv4Address())) {
-                return false;
-            }
-            if (getClass() == obj.getClass()) {
-                // Simple case: we are comparing against self
-                Ipv4AddressImpl otherImpl = (Ipv4AddressImpl) obj;
-                if (!Objects.equals(augmentation, otherImpl.augmentation)) {
-                    return false;
-                }
-            } else {
-                // Hard case: compare our augments with presence there...
-                for (Map.Entry<Class<? extends Augmentation<Ipv4Address>>, Augmentation<Ipv4Address>> e : augmentation.entrySet()) {
-                    if (!e.getValue().equals(other.augmentation(e.getKey()))) {
-                        return false;
-                    }
-                }
-                // .. and give the other one the chance to do the same
-                if (!obj.equals(this)) {
-                    return false;
-                }
-            }
-            return true;
-        }
-    
-        @Override
-        public String toString() {
-            final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper("Ipv4Address");
-            CodeHelpers.appendValue(helper, "_ipv4Address", _ipv4Address);
-            CodeHelpers.appendValue(helper, "augmentation", augmentation.values());
-            return helper.toString();
-        }
-    }
-}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/Ipv6Address.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/Ipv6AddressBuilder.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/Ipv6AddressBuilder.java
deleted file mode 100644 (file)
index 4d0416e..0000000
+++ /dev/null
@@ -1,182 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.interfaceupfinfoitem.address;
-import com.google.common.base.MoreObjects;
-import com.google.common.collect.ImmutableMap;
-import java.lang.Class;
-import java.lang.Object;
-import java.lang.Override;
-import java.lang.String;
-import java.lang.SuppressWarnings;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-import org.opendaylight.yangtools.concepts.Builder;
-import org.opendaylight.yangtools.yang.binding.Augmentation;
-import org.opendaylight.yangtools.yang.binding.AugmentationHolder;
-import org.opendaylight.yangtools.yang.binding.CodeHelpers;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-
-/**
- * Class that builds {@link Ipv6AddressBuilder} instances.
- *
- * @see Ipv6AddressBuilder
- *
- */
-public class Ipv6AddressBuilder implements Builder<Ipv6Address> {
-
-    private org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address _ipv6Address;
-
-
-    Map<Class<? extends Augmentation<Ipv6Address>>, Augmentation<Ipv6Address>> augmentation = Collections.emptyMap();
-
-    public Ipv6AddressBuilder() {
-    }
-
-    public Ipv6AddressBuilder(Ipv6Address base) {
-        this._ipv6Address = base.getIpv6Address();
-        if (base instanceof Ipv6AddressImpl) {
-            Ipv6AddressImpl impl = (Ipv6AddressImpl) base;
-            if (!impl.augmentation.isEmpty()) {
-                this.augmentation = new HashMap<>(impl.augmentation);
-            }
-        } else if (base instanceof AugmentationHolder) {
-            @SuppressWarnings("unchecked")
-            Map<Class<? extends Augmentation<Ipv6Address>>, Augmentation<Ipv6Address>> aug =((AugmentationHolder<Ipv6Address>) base).augmentations();
-            if (!aug.isEmpty()) {
-                this.augmentation = new HashMap<>(aug);
-            }
-        }
-    }
-
-
-    public org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address getIpv6Address() {
-        return _ipv6Address;
-    }
-    
-    @SuppressWarnings({ "unchecked", "checkstyle:methodTypeParameterName"})
-    public <E$$ extends Augmentation<Ipv6Address>> E$$ augmentation(Class<E$$> augmentationType) {
-        return (E$$) augmentation.get(CodeHelpers.nonNullValue(augmentationType, "augmentationType"));
-    }
-
-    
-    public Ipv6AddressBuilder setIpv6Address(final org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address value) {
-        this._ipv6Address = value;
-        return this;
-    }
-    
-    public Ipv6AddressBuilder addAugmentation(Class<? extends Augmentation<Ipv6Address>> augmentationType, Augmentation<Ipv6Address> augmentationValue) {
-        if (augmentationValue == null) {
-            return removeAugmentation(augmentationType);
-        }
-    
-        if (!(this.augmentation instanceof HashMap)) {
-            this.augmentation = new HashMap<>();
-        }
-    
-        this.augmentation.put(augmentationType, augmentationValue);
-        return this;
-    }
-    
-    public Ipv6AddressBuilder removeAugmentation(Class<? extends Augmentation<Ipv6Address>> augmentationType) {
-        if (this.augmentation instanceof HashMap) {
-            this.augmentation.remove(augmentationType);
-        }
-        return this;
-    }
-
-    @Override
-    public Ipv6Address build() {
-        return new Ipv6AddressImpl(this);
-    }
-
-    private static final class Ipv6AddressImpl implements Ipv6Address {
-    
-        private final org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address _ipv6Address;
-    
-        private Map<Class<? extends Augmentation<Ipv6Address>>, Augmentation<Ipv6Address>> augmentation = Collections.emptyMap();
-    
-        Ipv6AddressImpl(Ipv6AddressBuilder base) {
-            this._ipv6Address = base.getIpv6Address();
-            this.augmentation = ImmutableMap.copyOf(base.augmentation);
-        }
-    
-        @Override
-        public Class<Ipv6Address> getImplementedInterface() {
-            return Ipv6Address.class;
-        }
-    
-        @Override
-        public org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address getIpv6Address() {
-            return _ipv6Address;
-        }
-        
-        @SuppressWarnings({ "unchecked", "checkstyle:methodTypeParameterName"})
-        @Override
-        public <E$$ extends Augmentation<Ipv6Address>> E$$ augmentation(Class<E$$> augmentationType) {
-            return (E$$) augmentation.get(CodeHelpers.nonNullValue(augmentationType, "augmentationType"));
-        }
-    
-        private int hash = 0;
-        private volatile boolean hashValid = false;
-        
-        @Override
-        public int hashCode() {
-            if (hashValid) {
-                return hash;
-            }
-        
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + Objects.hashCode(_ipv6Address);
-            result = prime * result + Objects.hashCode(augmentation);
-        
-            hash = result;
-            hashValid = true;
-            return result;
-        }
-    
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (!(obj instanceof DataObject)) {
-                return false;
-            }
-            if (!Ipv6Address.class.equals(((DataObject)obj).getImplementedInterface())) {
-                return false;
-            }
-            Ipv6Address other = (Ipv6Address)obj;
-            if (!Objects.equals(_ipv6Address, other.getIpv6Address())) {
-                return false;
-            }
-            if (getClass() == obj.getClass()) {
-                // Simple case: we are comparing against self
-                Ipv6AddressImpl otherImpl = (Ipv6AddressImpl) obj;
-                if (!Objects.equals(augmentation, otherImpl.augmentation)) {
-                    return false;
-                }
-            } else {
-                // Hard case: compare our augments with presence there...
-                for (Map.Entry<Class<? extends Augmentation<Ipv6Address>>, Augmentation<Ipv6Address>> e : augmentation.entrySet()) {
-                    if (!e.getValue().equals(other.augmentation(e.getKey()))) {
-                        return false;
-                    }
-                }
-                // .. and give the other one the chance to do the same
-                if (!obj.equals(this)) {
-                    return false;
-                }
-            }
-            return true;
-        }
-    
-        @Override
-        public String toString() {
-            final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper("Ipv6Address");
-            CodeHelpers.appendValue(helper, "_ipv6Address", _ipv6Address);
-            CodeHelpers.appendValue(helper, "augmentation", augmentation.values());
-            return helper.toString();
-        }
-    }
-}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/Ipv6Prefix.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/Ipv6PrefixBuilder.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/interfaceupfinfoitem/address/Ipv6PrefixBuilder.java
deleted file mode 100644 (file)
index 2fc6448..0000000
+++ /dev/null
@@ -1,182 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.interfaceupfinfoitem.address;
-import com.google.common.base.MoreObjects;
-import com.google.common.collect.ImmutableMap;
-import java.lang.Class;
-import java.lang.Object;
-import java.lang.Override;
-import java.lang.String;
-import java.lang.SuppressWarnings;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-import org.opendaylight.yangtools.concepts.Builder;
-import org.opendaylight.yangtools.yang.binding.Augmentation;
-import org.opendaylight.yangtools.yang.binding.AugmentationHolder;
-import org.opendaylight.yangtools.yang.binding.CodeHelpers;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-
-/**
- * Class that builds {@link Ipv6PrefixBuilder} instances.
- *
- * @see Ipv6PrefixBuilder
- *
- */
-public class Ipv6PrefixBuilder implements Builder<Ipv6Prefix> {
-
-    private org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix _ipv6Prefix;
-
-
-    Map<Class<? extends Augmentation<Ipv6Prefix>>, Augmentation<Ipv6Prefix>> augmentation = Collections.emptyMap();
-
-    public Ipv6PrefixBuilder() {
-    }
-
-    public Ipv6PrefixBuilder(Ipv6Prefix base) {
-        this._ipv6Prefix = base.getIpv6Prefix();
-        if (base instanceof Ipv6PrefixImpl) {
-            Ipv6PrefixImpl impl = (Ipv6PrefixImpl) base;
-            if (!impl.augmentation.isEmpty()) {
-                this.augmentation = new HashMap<>(impl.augmentation);
-            }
-        } else if (base instanceof AugmentationHolder) {
-            @SuppressWarnings("unchecked")
-            Map<Class<? extends Augmentation<Ipv6Prefix>>, Augmentation<Ipv6Prefix>> aug =((AugmentationHolder<Ipv6Prefix>) base).augmentations();
-            if (!aug.isEmpty()) {
-                this.augmentation = new HashMap<>(aug);
-            }
-        }
-    }
-
-
-    public org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix getIpv6Prefix() {
-        return _ipv6Prefix;
-    }
-    
-    @SuppressWarnings({ "unchecked", "checkstyle:methodTypeParameterName"})
-    public <E$$ extends Augmentation<Ipv6Prefix>> E$$ augmentation(Class<E$$> augmentationType) {
-        return (E$$) augmentation.get(CodeHelpers.nonNullValue(augmentationType, "augmentationType"));
-    }
-
-    
-    public Ipv6PrefixBuilder setIpv6Prefix(final org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix value) {
-        this._ipv6Prefix = value;
-        return this;
-    }
-    
-    public Ipv6PrefixBuilder addAugmentation(Class<? extends Augmentation<Ipv6Prefix>> augmentationType, Augmentation<Ipv6Prefix> augmentationValue) {
-        if (augmentationValue == null) {
-            return removeAugmentation(augmentationType);
-        }
-    
-        if (!(this.augmentation instanceof HashMap)) {
-            this.augmentation = new HashMap<>();
-        }
-    
-        this.augmentation.put(augmentationType, augmentationValue);
-        return this;
-    }
-    
-    public Ipv6PrefixBuilder removeAugmentation(Class<? extends Augmentation<Ipv6Prefix>> augmentationType) {
-        if (this.augmentation instanceof HashMap) {
-            this.augmentation.remove(augmentationType);
-        }
-        return this;
-    }
-
-    @Override
-    public Ipv6Prefix build() {
-        return new Ipv6PrefixImpl(this);
-    }
-
-    private static final class Ipv6PrefixImpl implements Ipv6Prefix {
-    
-        private final org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix _ipv6Prefix;
-    
-        private Map<Class<? extends Augmentation<Ipv6Prefix>>, Augmentation<Ipv6Prefix>> augmentation = Collections.emptyMap();
-    
-        Ipv6PrefixImpl(Ipv6PrefixBuilder base) {
-            this._ipv6Prefix = base.getIpv6Prefix();
-            this.augmentation = ImmutableMap.copyOf(base.augmentation);
-        }
-    
-        @Override
-        public Class<Ipv6Prefix> getImplementedInterface() {
-            return Ipv6Prefix.class;
-        }
-    
-        @Override
-        public org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix getIpv6Prefix() {
-            return _ipv6Prefix;
-        }
-        
-        @SuppressWarnings({ "unchecked", "checkstyle:methodTypeParameterName"})
-        @Override
-        public <E$$ extends Augmentation<Ipv6Prefix>> E$$ augmentation(Class<E$$> augmentationType) {
-            return (E$$) augmentation.get(CodeHelpers.nonNullValue(augmentationType, "augmentationType"));
-        }
-    
-        private int hash = 0;
-        private volatile boolean hashValid = false;
-        
-        @Override
-        public int hashCode() {
-            if (hashValid) {
-                return hash;
-            }
-        
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + Objects.hashCode(_ipv6Prefix);
-            result = prime * result + Objects.hashCode(augmentation);
-        
-            hash = result;
-            hashValid = true;
-            return result;
-        }
-    
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (!(obj instanceof DataObject)) {
-                return false;
-            }
-            if (!Ipv6Prefix.class.equals(((DataObject)obj).getImplementedInterface())) {
-                return false;
-            }
-            Ipv6Prefix other = (Ipv6Prefix)obj;
-            if (!Objects.equals(_ipv6Prefix, other.getIpv6Prefix())) {
-                return false;
-            }
-            if (getClass() == obj.getClass()) {
-                // Simple case: we are comparing against self
-                Ipv6PrefixImpl otherImpl = (Ipv6PrefixImpl) obj;
-                if (!Objects.equals(augmentation, otherImpl.augmentation)) {
-                    return false;
-                }
-            } else {
-                // Hard case: compare our augments with presence there...
-                for (Map.Entry<Class<? extends Augmentation<Ipv6Prefix>>, Augmentation<Ipv6Prefix>> e : augmentation.entrySet()) {
-                    if (!e.getValue().equals(other.augmentation(e.getKey()))) {
-                        return false;
-                    }
-                }
-                // .. and give the other one the chance to do the same
-                if (!obj.equals(this)) {
-                    return false;
-                }
-            }
-            return true;
-        }
-    
-        @Override
-        public String toString() {
-            final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper("Ipv6Prefix");
-            CodeHelpers.appendValue(helper, "_ipv6Prefix", _ipv6Prefix);
-            CodeHelpers.appendValue(helper, "augmentation", augmentation.values());
-            return helper.toString();
-        }
-    }
-}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/Address.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/address/Ipv4Address.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/address/Ipv4AddressBuilder.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/address/Ipv4AddressBuilder.java
deleted file mode 100644 (file)
index 530eafe..0000000
+++ /dev/null
@@ -1,182 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.ipendpoint.address;
-import com.google.common.base.MoreObjects;
-import com.google.common.collect.ImmutableMap;
-import java.lang.Class;
-import java.lang.Object;
-import java.lang.Override;
-import java.lang.String;
-import java.lang.SuppressWarnings;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-import org.opendaylight.yangtools.concepts.Builder;
-import org.opendaylight.yangtools.yang.binding.Augmentation;
-import org.opendaylight.yangtools.yang.binding.AugmentationHolder;
-import org.opendaylight.yangtools.yang.binding.CodeHelpers;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-
-/**
- * Class that builds {@link Ipv4AddressBuilder} instances.
- *
- * @see Ipv4AddressBuilder
- *
- */
-public class Ipv4AddressBuilder implements Builder<Ipv4Address> {
-
-    private org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address _ipv4Address;
-
-
-    Map<Class<? extends Augmentation<Ipv4Address>>, Augmentation<Ipv4Address>> augmentation = Collections.emptyMap();
-
-    public Ipv4AddressBuilder() {
-    }
-
-    public Ipv4AddressBuilder(Ipv4Address base) {
-        this._ipv4Address = base.getIpv4Address();
-        if (base instanceof Ipv4AddressImpl) {
-            Ipv4AddressImpl impl = (Ipv4AddressImpl) base;
-            if (!impl.augmentation.isEmpty()) {
-                this.augmentation = new HashMap<>(impl.augmentation);
-            }
-        } else if (base instanceof AugmentationHolder) {
-            @SuppressWarnings("unchecked")
-            Map<Class<? extends Augmentation<Ipv4Address>>, Augmentation<Ipv4Address>> aug =((AugmentationHolder<Ipv4Address>) base).augmentations();
-            if (!aug.isEmpty()) {
-                this.augmentation = new HashMap<>(aug);
-            }
-        }
-    }
-
-
-    public org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address getIpv4Address() {
-        return _ipv4Address;
-    }
-    
-    @SuppressWarnings({ "unchecked", "checkstyle:methodTypeParameterName"})
-    public <E$$ extends Augmentation<Ipv4Address>> E$$ augmentation(Class<E$$> augmentationType) {
-        return (E$$) augmentation.get(CodeHelpers.nonNullValue(augmentationType, "augmentationType"));
-    }
-
-    
-    public Ipv4AddressBuilder setIpv4Address(final org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address value) {
-        this._ipv4Address = value;
-        return this;
-    }
-    
-    public Ipv4AddressBuilder addAugmentation(Class<? extends Augmentation<Ipv4Address>> augmentationType, Augmentation<Ipv4Address> augmentationValue) {
-        if (augmentationValue == null) {
-            return removeAugmentation(augmentationType);
-        }
-    
-        if (!(this.augmentation instanceof HashMap)) {
-            this.augmentation = new HashMap<>();
-        }
-    
-        this.augmentation.put(augmentationType, augmentationValue);
-        return this;
-    }
-    
-    public Ipv4AddressBuilder removeAugmentation(Class<? extends Augmentation<Ipv4Address>> augmentationType) {
-        if (this.augmentation instanceof HashMap) {
-            this.augmentation.remove(augmentationType);
-        }
-        return this;
-    }
-
-    @Override
-    public Ipv4Address build() {
-        return new Ipv4AddressImpl(this);
-    }
-
-    private static final class Ipv4AddressImpl implements Ipv4Address {
-    
-        private final org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address _ipv4Address;
-    
-        private Map<Class<? extends Augmentation<Ipv4Address>>, Augmentation<Ipv4Address>> augmentation = Collections.emptyMap();
-    
-        Ipv4AddressImpl(Ipv4AddressBuilder base) {
-            this._ipv4Address = base.getIpv4Address();
-            this.augmentation = ImmutableMap.copyOf(base.augmentation);
-        }
-    
-        @Override
-        public Class<Ipv4Address> getImplementedInterface() {
-            return Ipv4Address.class;
-        }
-    
-        @Override
-        public org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address getIpv4Address() {
-            return _ipv4Address;
-        }
-        
-        @SuppressWarnings({ "unchecked", "checkstyle:methodTypeParameterName"})
-        @Override
-        public <E$$ extends Augmentation<Ipv4Address>> E$$ augmentation(Class<E$$> augmentationType) {
-            return (E$$) augmentation.get(CodeHelpers.nonNullValue(augmentationType, "augmentationType"));
-        }
-    
-        private int hash = 0;
-        private volatile boolean hashValid = false;
-        
-        @Override
-        public int hashCode() {
-            if (hashValid) {
-                return hash;
-            }
-        
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + Objects.hashCode(_ipv4Address);
-            result = prime * result + Objects.hashCode(augmentation);
-        
-            hash = result;
-            hashValid = true;
-            return result;
-        }
-    
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (!(obj instanceof DataObject)) {
-                return false;
-            }
-            if (!Ipv4Address.class.equals(((DataObject)obj).getImplementedInterface())) {
-                return false;
-            }
-            Ipv4Address other = (Ipv4Address)obj;
-            if (!Objects.equals(_ipv4Address, other.getIpv4Address())) {
-                return false;
-            }
-            if (getClass() == obj.getClass()) {
-                // Simple case: we are comparing against self
-                Ipv4AddressImpl otherImpl = (Ipv4AddressImpl) obj;
-                if (!Objects.equals(augmentation, otherImpl.augmentation)) {
-                    return false;
-                }
-            } else {
-                // Hard case: compare our augments with presence there...
-                for (Map.Entry<Class<? extends Augmentation<Ipv4Address>>, Augmentation<Ipv4Address>> e : augmentation.entrySet()) {
-                    if (!e.getValue().equals(other.augmentation(e.getKey()))) {
-                        return false;
-                    }
-                }
-                // .. and give the other one the chance to do the same
-                if (!obj.equals(this)) {
-                    return false;
-                }
-            }
-            return true;
-        }
-    
-        @Override
-        public String toString() {
-            final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper("Ipv4Address");
-            CodeHelpers.appendValue(helper, "_ipv4Address", _ipv4Address);
-            CodeHelpers.appendValue(helper, "augmentation", augmentation.values());
-            return helper.toString();
-        }
-    }
-}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/address/Ipv6Address.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/address/Ipv6AddressBuilder.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/address/Ipv6AddressBuilder.java
deleted file mode 100644 (file)
index 525e2b3..0000000
+++ /dev/null
@@ -1,182 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.ipendpoint.address;
-import com.google.common.base.MoreObjects;
-import com.google.common.collect.ImmutableMap;
-import java.lang.Class;
-import java.lang.Object;
-import java.lang.Override;
-import java.lang.String;
-import java.lang.SuppressWarnings;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-import org.opendaylight.yangtools.concepts.Builder;
-import org.opendaylight.yangtools.yang.binding.Augmentation;
-import org.opendaylight.yangtools.yang.binding.AugmentationHolder;
-import org.opendaylight.yangtools.yang.binding.CodeHelpers;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-
-/**
- * Class that builds {@link Ipv6AddressBuilder} instances.
- *
- * @see Ipv6AddressBuilder
- *
- */
-public class Ipv6AddressBuilder implements Builder<Ipv6Address> {
-
-    private org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address _ipv6Address;
-
-
-    Map<Class<? extends Augmentation<Ipv6Address>>, Augmentation<Ipv6Address>> augmentation = Collections.emptyMap();
-
-    public Ipv6AddressBuilder() {
-    }
-
-    public Ipv6AddressBuilder(Ipv6Address base) {
-        this._ipv6Address = base.getIpv6Address();
-        if (base instanceof Ipv6AddressImpl) {
-            Ipv6AddressImpl impl = (Ipv6AddressImpl) base;
-            if (!impl.augmentation.isEmpty()) {
-                this.augmentation = new HashMap<>(impl.augmentation);
-            }
-        } else if (base instanceof AugmentationHolder) {
-            @SuppressWarnings("unchecked")
-            Map<Class<? extends Augmentation<Ipv6Address>>, Augmentation<Ipv6Address>> aug =((AugmentationHolder<Ipv6Address>) base).augmentations();
-            if (!aug.isEmpty()) {
-                this.augmentation = new HashMap<>(aug);
-            }
-        }
-    }
-
-
-    public org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address getIpv6Address() {
-        return _ipv6Address;
-    }
-    
-    @SuppressWarnings({ "unchecked", "checkstyle:methodTypeParameterName"})
-    public <E$$ extends Augmentation<Ipv6Address>> E$$ augmentation(Class<E$$> augmentationType) {
-        return (E$$) augmentation.get(CodeHelpers.nonNullValue(augmentationType, "augmentationType"));
-    }
-
-    
-    public Ipv6AddressBuilder setIpv6Address(final org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address value) {
-        this._ipv6Address = value;
-        return this;
-    }
-    
-    public Ipv6AddressBuilder addAugmentation(Class<? extends Augmentation<Ipv6Address>> augmentationType, Augmentation<Ipv6Address> augmentationValue) {
-        if (augmentationValue == null) {
-            return removeAugmentation(augmentationType);
-        }
-    
-        if (!(this.augmentation instanceof HashMap)) {
-            this.augmentation = new HashMap<>();
-        }
-    
-        this.augmentation.put(augmentationType, augmentationValue);
-        return this;
-    }
-    
-    public Ipv6AddressBuilder removeAugmentation(Class<? extends Augmentation<Ipv6Address>> augmentationType) {
-        if (this.augmentation instanceof HashMap) {
-            this.augmentation.remove(augmentationType);
-        }
-        return this;
-    }
-
-    @Override
-    public Ipv6Address build() {
-        return new Ipv6AddressImpl(this);
-    }
-
-    private static final class Ipv6AddressImpl implements Ipv6Address {
-    
-        private final org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address _ipv6Address;
-    
-        private Map<Class<? extends Augmentation<Ipv6Address>>, Augmentation<Ipv6Address>> augmentation = Collections.emptyMap();
-    
-        Ipv6AddressImpl(Ipv6AddressBuilder base) {
-            this._ipv6Address = base.getIpv6Address();
-            this.augmentation = ImmutableMap.copyOf(base.augmentation);
-        }
-    
-        @Override
-        public Class<Ipv6Address> getImplementedInterface() {
-            return Ipv6Address.class;
-        }
-    
-        @Override
-        public org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address getIpv6Address() {
-            return _ipv6Address;
-        }
-        
-        @SuppressWarnings({ "unchecked", "checkstyle:methodTypeParameterName"})
-        @Override
-        public <E$$ extends Augmentation<Ipv6Address>> E$$ augmentation(Class<E$$> augmentationType) {
-            return (E$$) augmentation.get(CodeHelpers.nonNullValue(augmentationType, "augmentationType"));
-        }
-    
-        private int hash = 0;
-        private volatile boolean hashValid = false;
-        
-        @Override
-        public int hashCode() {
-            if (hashValid) {
-                return hash;
-            }
-        
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + Objects.hashCode(_ipv6Address);
-            result = prime * result + Objects.hashCode(augmentation);
-        
-            hash = result;
-            hashValid = true;
-            return result;
-        }
-    
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (!(obj instanceof DataObject)) {
-                return false;
-            }
-            if (!Ipv6Address.class.equals(((DataObject)obj).getImplementedInterface())) {
-                return false;
-            }
-            Ipv6Address other = (Ipv6Address)obj;
-            if (!Objects.equals(_ipv6Address, other.getIpv6Address())) {
-                return false;
-            }
-            if (getClass() == obj.getClass()) {
-                // Simple case: we are comparing against self
-                Ipv6AddressImpl otherImpl = (Ipv6AddressImpl) obj;
-                if (!Objects.equals(augmentation, otherImpl.augmentation)) {
-                    return false;
-                }
-            } else {
-                // Hard case: compare our augments with presence there...
-                for (Map.Entry<Class<? extends Augmentation<Ipv6Address>>, Augmentation<Ipv6Address>> e : augmentation.entrySet()) {
-                    if (!e.getValue().equals(other.augmentation(e.getKey()))) {
-                        return false;
-                    }
-                }
-                // .. and give the other one the chance to do the same
-                if (!obj.equals(this)) {
-                    return false;
-                }
-            }
-            return true;
-        }
-    
-        @Override
-        public String toString() {
-            final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper("Ipv6Address");
-            CodeHelpers.appendValue(helper, "_ipv6Address", _ipv6Address);
-            CodeHelpers.appendValue(helper, "augmentation", augmentation.values());
-            return helper.toString();
-        }
-    }
-}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/address/Ipv6Prefix.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/address/Ipv6PrefixBuilder.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/ipendpoint/address/Ipv6PrefixBuilder.java
deleted file mode 100644 (file)
index 8bb742c..0000000
+++ /dev/null
@@ -1,182 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.ipendpoint.address;
-import com.google.common.base.MoreObjects;
-import com.google.common.collect.ImmutableMap;
-import java.lang.Class;
-import java.lang.Object;
-import java.lang.Override;
-import java.lang.String;
-import java.lang.SuppressWarnings;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-import org.opendaylight.yangtools.concepts.Builder;
-import org.opendaylight.yangtools.yang.binding.Augmentation;
-import org.opendaylight.yangtools.yang.binding.AugmentationHolder;
-import org.opendaylight.yangtools.yang.binding.CodeHelpers;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-
-/**
- * Class that builds {@link Ipv6PrefixBuilder} instances.
- *
- * @see Ipv6PrefixBuilder
- *
- */
-public class Ipv6PrefixBuilder implements Builder<Ipv6Prefix> {
-
-    private org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix _ipv6Prefix;
-
-
-    Map<Class<? extends Augmentation<Ipv6Prefix>>, Augmentation<Ipv6Prefix>> augmentation = Collections.emptyMap();
-
-    public Ipv6PrefixBuilder() {
-    }
-
-    public Ipv6PrefixBuilder(Ipv6Prefix base) {
-        this._ipv6Prefix = base.getIpv6Prefix();
-        if (base instanceof Ipv6PrefixImpl) {
-            Ipv6PrefixImpl impl = (Ipv6PrefixImpl) base;
-            if (!impl.augmentation.isEmpty()) {
-                this.augmentation = new HashMap<>(impl.augmentation);
-            }
-        } else if (base instanceof AugmentationHolder) {
-            @SuppressWarnings("unchecked")
-            Map<Class<? extends Augmentation<Ipv6Prefix>>, Augmentation<Ipv6Prefix>> aug =((AugmentationHolder<Ipv6Prefix>) base).augmentations();
-            if (!aug.isEmpty()) {
-                this.augmentation = new HashMap<>(aug);
-            }
-        }
-    }
-
-
-    public org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix getIpv6Prefix() {
-        return _ipv6Prefix;
-    }
-    
-    @SuppressWarnings({ "unchecked", "checkstyle:methodTypeParameterName"})
-    public <E$$ extends Augmentation<Ipv6Prefix>> E$$ augmentation(Class<E$$> augmentationType) {
-        return (E$$) augmentation.get(CodeHelpers.nonNullValue(augmentationType, "augmentationType"));
-    }
-
-    
-    public Ipv6PrefixBuilder setIpv6Prefix(final org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix value) {
-        this._ipv6Prefix = value;
-        return this;
-    }
-    
-    public Ipv6PrefixBuilder addAugmentation(Class<? extends Augmentation<Ipv6Prefix>> augmentationType, Augmentation<Ipv6Prefix> augmentationValue) {
-        if (augmentationValue == null) {
-            return removeAugmentation(augmentationType);
-        }
-    
-        if (!(this.augmentation instanceof HashMap)) {
-            this.augmentation = new HashMap<>();
-        }
-    
-        this.augmentation.put(augmentationType, augmentationValue);
-        return this;
-    }
-    
-    public Ipv6PrefixBuilder removeAugmentation(Class<? extends Augmentation<Ipv6Prefix>> augmentationType) {
-        if (this.augmentation instanceof HashMap) {
-            this.augmentation.remove(augmentationType);
-        }
-        return this;
-    }
-
-    @Override
-    public Ipv6Prefix build() {
-        return new Ipv6PrefixImpl(this);
-    }
-
-    private static final class Ipv6PrefixImpl implements Ipv6Prefix {
-    
-        private final org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix _ipv6Prefix;
-    
-        private Map<Class<? extends Augmentation<Ipv6Prefix>>, Augmentation<Ipv6Prefix>> augmentation = Collections.emptyMap();
-    
-        Ipv6PrefixImpl(Ipv6PrefixBuilder base) {
-            this._ipv6Prefix = base.getIpv6Prefix();
-            this.augmentation = ImmutableMap.copyOf(base.augmentation);
-        }
-    
-        @Override
-        public Class<Ipv6Prefix> getImplementedInterface() {
-            return Ipv6Prefix.class;
-        }
-    
-        @Override
-        public org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix getIpv6Prefix() {
-            return _ipv6Prefix;
-        }
-        
-        @SuppressWarnings({ "unchecked", "checkstyle:methodTypeParameterName"})
-        @Override
-        public <E$$ extends Augmentation<Ipv6Prefix>> E$$ augmentation(Class<E$$> augmentationType) {
-            return (E$$) augmentation.get(CodeHelpers.nonNullValue(augmentationType, "augmentationType"));
-        }
-    
-        private int hash = 0;
-        private volatile boolean hashValid = false;
-        
-        @Override
-        public int hashCode() {
-            if (hashValid) {
-                return hash;
-            }
-        
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + Objects.hashCode(_ipv6Prefix);
-            result = prime * result + Objects.hashCode(augmentation);
-        
-            hash = result;
-            hashValid = true;
-            return result;
-        }
-    
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (!(obj instanceof DataObject)) {
-                return false;
-            }
-            if (!Ipv6Prefix.class.equals(((DataObject)obj).getImplementedInterface())) {
-                return false;
-            }
-            Ipv6Prefix other = (Ipv6Prefix)obj;
-            if (!Objects.equals(_ipv6Prefix, other.getIpv6Prefix())) {
-                return false;
-            }
-            if (getClass() == obj.getClass()) {
-                // Simple case: we are comparing against self
-                Ipv6PrefixImpl otherImpl = (Ipv6PrefixImpl) obj;
-                if (!Objects.equals(augmentation, otherImpl.augmentation)) {
-                    return false;
-                }
-            } else {
-                // Hard case: compare our augments with presence there...
-                for (Map.Entry<Class<? extends Augmentation<Ipv6Prefix>>, Augmentation<Ipv6Prefix>> e : augmentation.entrySet()) {
-                    if (!e.getValue().equals(other.augmentation(e.getKey()))) {
-                        return false;
-                    }
-                }
-                // .. and give the other one the chance to do the same
-                if (!obj.equals(this)) {
-                    return false;
-                }
-            }
-            return true;
-        }
-    
-        @Override
-        public String toString() {
-            final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper("Ipv6Prefix");
-            CodeHelpers.appendValue(helper, "_ipv6Prefix", _ipv6Prefix);
-            CodeHelpers.appendValue(helper, "augmentation", augmentation.values());
-            return helper.toString();
-        }
-    }
-}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/snssaiupfinfoitem/DnnUpfInfo.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/snssaiupfinfoitem/DnnUpfInfoBuilder.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/snssaiupfinfoitem/DnnUpfInfoBuilder.java
deleted file mode 100644 (file)
index 248c830..0000000
+++ /dev/null
@@ -1,224 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.snssaiupfinfoitem;
-import com.google.common.base.MoreObjects;
-import com.google.common.collect.ImmutableMap;
-import java.lang.Class;
-import java.lang.Object;
-import java.lang.Override;
-import java.lang.String;
-import java.lang.SuppressWarnings;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.TDnn;
-import org.opendaylight.yangtools.concepts.Builder;
-import org.opendaylight.yangtools.yang.binding.Augmentation;
-import org.opendaylight.yangtools.yang.binding.AugmentationHolder;
-import org.opendaylight.yangtools.yang.binding.CodeHelpers;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-
-/**
- * Class that builds {@link DnnUpfInfoBuilder} instances.
- *
- * @see DnnUpfInfoBuilder
- *
- */
-public class DnnUpfInfoBuilder implements Builder<DnnUpfInfo> {
-
-    private TDnn _dnn;
-    private DnnUpfInfoKey key;
-
-
-    Map<Class<? extends Augmentation<DnnUpfInfo>>, Augmentation<DnnUpfInfo>> augmentation = Collections.emptyMap();
-
-    public DnnUpfInfoBuilder() {
-    }
-    public DnnUpfInfoBuilder(org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.DnnUpfInfoItem arg) {
-        this._dnn = arg.getDnn();
-    }
-
-    public DnnUpfInfoBuilder(DnnUpfInfo base) {
-        this.key = base.key();
-        this._dnn = base.getDnn();
-        if (base instanceof DnnUpfInfoImpl) {
-            DnnUpfInfoImpl impl = (DnnUpfInfoImpl) base;
-            if (!impl.augmentation.isEmpty()) {
-                this.augmentation = new HashMap<>(impl.augmentation);
-            }
-        } else if (base instanceof AugmentationHolder) {
-            @SuppressWarnings("unchecked")
-            Map<Class<? extends Augmentation<DnnUpfInfo>>, Augmentation<DnnUpfInfo>> aug =((AugmentationHolder<DnnUpfInfo>) base).augmentations();
-            if (!aug.isEmpty()) {
-                this.augmentation = new HashMap<>(aug);
-            }
-        }
-    }
-
-    /**
-     * Set fields from given grouping argument. Valid argument is instance of one of following types:
-     * <ul>
-     * <li>org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.DnnUpfInfoItem</li>
-     * </ul>
-     *
-     * @param arg grouping object
-     * @throws IllegalArgumentException if given argument is none of valid types
-    */
-    public void fieldsFrom(DataObject arg) {
-        boolean isValidArg = false;
-        if (arg instanceof org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.DnnUpfInfoItem) {
-            this._dnn = ((org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.DnnUpfInfoItem)arg).getDnn();
-            isValidArg = true;
-        }
-        CodeHelpers.validValue(isValidArg, arg, "[org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.DnnUpfInfoItem]");
-    }
-
-    public DnnUpfInfoKey key() {
-        return key;
-    }
-    
-    public TDnn getDnn() {
-        return _dnn;
-    }
-    
-    @SuppressWarnings({ "unchecked", "checkstyle:methodTypeParameterName"})
-    public <E$$ extends Augmentation<DnnUpfInfo>> E$$ augmentation(Class<E$$> augmentationType) {
-        return (E$$) augmentation.get(CodeHelpers.nonNullValue(augmentationType, "augmentationType"));
-    }
-
-    public DnnUpfInfoBuilder withKey(final DnnUpfInfoKey key) {
-        this.key = key;
-        return this;
-    }
-    
-    public DnnUpfInfoBuilder setDnn(final TDnn value) {
-        this._dnn = value;
-        return this;
-    }
-    
-    public DnnUpfInfoBuilder addAugmentation(Class<? extends Augmentation<DnnUpfInfo>> augmentationType, Augmentation<DnnUpfInfo> augmentationValue) {
-        if (augmentationValue == null) {
-            return removeAugmentation(augmentationType);
-        }
-    
-        if (!(this.augmentation instanceof HashMap)) {
-            this.augmentation = new HashMap<>();
-        }
-    
-        this.augmentation.put(augmentationType, augmentationValue);
-        return this;
-    }
-    
-    public DnnUpfInfoBuilder removeAugmentation(Class<? extends Augmentation<DnnUpfInfo>> augmentationType) {
-        if (this.augmentation instanceof HashMap) {
-            this.augmentation.remove(augmentationType);
-        }
-        return this;
-    }
-
-    @Override
-    public DnnUpfInfo build() {
-        return new DnnUpfInfoImpl(this);
-    }
-
-    private static final class DnnUpfInfoImpl implements DnnUpfInfo {
-    
-        private final TDnn _dnn;
-        private final DnnUpfInfoKey key;
-    
-        private Map<Class<? extends Augmentation<DnnUpfInfo>>, Augmentation<DnnUpfInfo>> augmentation = Collections.emptyMap();
-    
-        DnnUpfInfoImpl(DnnUpfInfoBuilder base) {
-            if (base.key() != null) {
-                this.key = base.key();
-            } else {
-                this.key = new DnnUpfInfoKey(base.getDnn());
-            }
-            this._dnn = key.getDnn();
-            this.augmentation = ImmutableMap.copyOf(base.augmentation);
-        }
-    
-        @Override
-        public Class<DnnUpfInfo> getImplementedInterface() {
-            return DnnUpfInfo.class;
-        }
-    
-        @Override
-        public DnnUpfInfoKey key() {
-            return key;
-        }
-        
-        @Override
-        public TDnn getDnn() {
-            return _dnn;
-        }
-        
-        @SuppressWarnings({ "unchecked", "checkstyle:methodTypeParameterName"})
-        @Override
-        public <E$$ extends Augmentation<DnnUpfInfo>> E$$ augmentation(Class<E$$> augmentationType) {
-            return (E$$) augmentation.get(CodeHelpers.nonNullValue(augmentationType, "augmentationType"));
-        }
-    
-        private int hash = 0;
-        private volatile boolean hashValid = false;
-        
-        @Override
-        public int hashCode() {
-            if (hashValid) {
-                return hash;
-            }
-        
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + Objects.hashCode(_dnn);
-            result = prime * result + Objects.hashCode(augmentation);
-        
-            hash = result;
-            hashValid = true;
-            return result;
-        }
-    
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (!(obj instanceof DataObject)) {
-                return false;
-            }
-            if (!DnnUpfInfo.class.equals(((DataObject)obj).getImplementedInterface())) {
-                return false;
-            }
-            DnnUpfInfo other = (DnnUpfInfo)obj;
-            if (!Objects.equals(_dnn, other.getDnn())) {
-                return false;
-            }
-            if (getClass() == obj.getClass()) {
-                // Simple case: we are comparing against self
-                DnnUpfInfoImpl otherImpl = (DnnUpfInfoImpl) obj;
-                if (!Objects.equals(augmentation, otherImpl.augmentation)) {
-                    return false;
-                }
-            } else {
-                // Hard case: compare our augments with presence there...
-                for (Map.Entry<Class<? extends Augmentation<DnnUpfInfo>>, Augmentation<DnnUpfInfo>> e : augmentation.entrySet()) {
-                    if (!e.getValue().equals(other.augmentation(e.getKey()))) {
-                        return false;
-                    }
-                }
-                // .. and give the other one the chance to do the same
-                if (!obj.equals(this)) {
-                    return false;
-                }
-            }
-            return true;
-        }
-    
-        @Override
-        public String toString() {
-            final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper("DnnUpfInfo");
-            CodeHelpers.appendValue(helper, "_dnn", _dnn);
-            CodeHelpers.appendValue(helper, "augmentation", augmentation.values());
-            return helper.toString();
-        }
-    }
-}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/snssaiupfinfoitem/DnnUpfInfoKey.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/tai/PlmnId.java b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/tai/PlmnIdBuilder.java b/sdnr/wt/devicemanager-gran/provider/src/main/java/org/opendaylight/yang/gen/v1/urn/_3gpp/tsg/sa5/nrm/types/rev180731/tai/PlmnIdBuilder.java
deleted file mode 100644 (file)
index 530d59d..0000000
+++ /dev/null
@@ -1,229 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.tai;
-import com.google.common.base.MoreObjects;
-import com.google.common.collect.ImmutableMap;
-import java.lang.Class;
-import java.lang.Object;
-import java.lang.Override;
-import java.lang.String;
-import java.lang.SuppressWarnings;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.TMcc;
-import org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.TMnc;
-import org.opendaylight.yangtools.concepts.Builder;
-import org.opendaylight.yangtools.yang.binding.Augmentation;
-import org.opendaylight.yangtools.yang.binding.AugmentationHolder;
-import org.opendaylight.yangtools.yang.binding.CodeHelpers;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-
-/**
- * Class that builds {@link PlmnIdBuilder} instances.
- *
- * @see PlmnIdBuilder
- *
- */
-public class PlmnIdBuilder implements Builder<PlmnId> {
-
-    private TMcc _mCC;
-    private TMnc _mNC;
-
-
-    Map<Class<? extends Augmentation<PlmnId>>, Augmentation<PlmnId>> augmentation = Collections.emptyMap();
-
-    public PlmnIdBuilder() {
-    }
-    public PlmnIdBuilder(org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.PLMNId arg) {
-        this._mCC = arg.getMCC();
-        this._mNC = arg.getMNC();
-    }
-
-    public PlmnIdBuilder(PlmnId base) {
-        this._mCC = base.getMCC();
-        this._mNC = base.getMNC();
-        if (base instanceof PlmnIdImpl) {
-            PlmnIdImpl impl = (PlmnIdImpl) base;
-            if (!impl.augmentation.isEmpty()) {
-                this.augmentation = new HashMap<>(impl.augmentation);
-            }
-        } else if (base instanceof AugmentationHolder) {
-            @SuppressWarnings("unchecked")
-            Map<Class<? extends Augmentation<PlmnId>>, Augmentation<PlmnId>> aug =((AugmentationHolder<PlmnId>) base).augmentations();
-            if (!aug.isEmpty()) {
-                this.augmentation = new HashMap<>(aug);
-            }
-        }
-    }
-
-    /**
-     * Set fields from given grouping argument. Valid argument is instance of one of following types:
-     * <ul>
-     * <li>org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.PLMNId</li>
-     * </ul>
-     *
-     * @param arg grouping object
-     * @throws IllegalArgumentException if given argument is none of valid types
-    */
-    public void fieldsFrom(DataObject arg) {
-        boolean isValidArg = false;
-        if (arg instanceof org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.PLMNId) {
-            this._mCC = ((org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.PLMNId)arg).getMCC();
-            this._mNC = ((org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.PLMNId)arg).getMNC();
-            isValidArg = true;
-        }
-        CodeHelpers.validValue(isValidArg, arg, "[org.opendaylight.yang.gen.v1.urn._3gpp.tsg.sa5.nrm.types.rev180731.PLMNId]");
-    }
-
-    public TMcc getMCC() {
-        return _mCC;
-    }
-    
-    public TMnc getMNC() {
-        return _mNC;
-    }
-    
-    @SuppressWarnings({ "unchecked", "checkstyle:methodTypeParameterName"})
-    public <E$$ extends Augmentation<PlmnId>> E$$ augmentation(Class<E$$> augmentationType) {
-        return (E$$) augmentation.get(CodeHelpers.nonNullValue(augmentationType, "augmentationType"));
-    }
-
-    
-    public PlmnIdBuilder setMCC(final TMcc value) {
-        this._mCC = value;
-        return this;
-    }
-    
-    public PlmnIdBuilder setMNC(final TMnc value) {
-        this._mNC = value;
-        return this;
-    }
-    
-    public PlmnIdBuilder addAugmentation(Class<? extends Augmentation<PlmnId>> augmentationType, Augmentation<PlmnId> augmentationValue) {
-        if (augmentationValue == null) {
-            return removeAugmentation(augmentationType);
-        }
-    
-        if (!(this.augmentation instanceof HashMap)) {
-            this.augmentation = new HashMap<>();
-        }
-    
-        this.augmentation.put(augmentationType, augmentationValue);
-        return this;
-    }
-    
-    public PlmnIdBuilder removeAugmentation(Class<? extends Augmentation<PlmnId>> augmentationType) {
-        if (this.augmentation instanceof HashMap) {
-            this.augmentation.remove(augmentationType);
-        }
-        return this;
-    }
-
-    @Override
-    public PlmnId build() {
-        return new PlmnIdImpl(this);
-    }
-
-    private static final class PlmnIdImpl implements PlmnId {
-    
-        private final TMcc _mCC;
-        private final TMnc _mNC;
-    
-        private Map<Class<? extends Augmentation<PlmnId>>, Augmentation<PlmnId>> augmentation = Collections.emptyMap();
-    
-        PlmnIdImpl(PlmnIdBuilder base) {
-            this._mCC = base.getMCC();
-            this._mNC = base.getMNC();
-            this.augmentation = ImmutableMap.copyOf(base.augmentation);
-        }
-    
-        @Override
-        public Class<PlmnId> getImplementedInterface() {
-            return PlmnId.class;
-        }
-    
-        @Override
-        public TMcc getMCC() {
-            return _mCC;
-        }
-        
-        @Override
-        public TMnc getMNC() {
-            return _mNC;
-        }
-        
-        @SuppressWarnings({ "unchecked", "checkstyle:methodTypeParameterName"})
-        @Override
-        public <E$$ extends Augmentation<PlmnId>> E$$ augmentation(Class<E$$> augmentationType) {
-            return (E$$) augmentation.get(CodeHelpers.nonNullValue(augmentationType, "augmentationType"));
-        }
-    
-        private int hash = 0;
-        private volatile boolean hashValid = false;
-        
-        @Override
-        public int hashCode() {
-            if (hashValid) {
-                return hash;
-            }
-        
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + Objects.hashCode(_mCC);
-            result = prime * result + Objects.hashCode(_mNC);
-            result = prime * result + Objects.hashCode(augmentation);
-        
-            hash = result;
-            hashValid = true;
-            return result;
-        }
-    
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (!(obj instanceof DataObject)) {
-                return false;
-            }
-            if (!PlmnId.class.equals(((DataObject)obj).getImplementedInterface())) {
-                return false;
-            }
-            PlmnId other = (PlmnId)obj;
-            if (!Objects.equals(_mCC, other.getMCC())) {
-                return false;
-            }
-            if (!Objects.equals(_mNC, other.getMNC())) {
-                return false;
-            }
-            if (getClass() == obj.getClass()) {
-                // Simple case: we are comparing against self
-                PlmnIdImpl otherImpl = (PlmnIdImpl) obj;
-                if (!Objects.equals(augmentation, otherImpl.augmentation)) {
-                    return false;
-                }
-            } else {
-                // Hard case: compare our augments with presence there...
-                for (Map.Entry<Class<? extends Augmentation<PlmnId>>, Augmentation<PlmnId>> e : augmentation.entrySet()) {
-                    if (!e.getValue().equals(other.augmentation(e.getKey()))) {
-                        return false;
-                    }
-                }
-                // .. and give the other one the chance to do the same
-                if (!obj.equals(this)) {
-                    return false;
-                }
-            }
-            return true;
-        }
-    
-        @Override
-        public String toString() {
-            final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper("PlmnId");
-            CodeHelpers.appendValue(helper, "_mCC", _mCC);
-            CodeHelpers.appendValue(helper, "_mNC", _mNC);
-            CodeHelpers.appendValue(helper, "augmentation", augmentation.values());
-            return helper.toString();
-        }
-    }
-}
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/sdnr/wt/devicemanager-gran/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
deleted file mode 100644 (file)
index 0d4d047..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.onap.ccsdk.features.sdnr.wt.devicemanager.gran.impl.DeviceManagerGRanImpl"
-          init-method="init" destroy-method="close">
-        <property name="netconfNetworkElementService" ref="netconfNetworkElementService"/>
-    </bean>
-</blueprint>
diff --git a/sdnr/wt/devicemanager-gran/provider/src/main/resources/version.properties b/sdnr/wt/devicemanager-gran/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/sdnr/wt/devicemanager-gran/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/gran/test/TestDeviceManagerGRanImpl.java b/sdnr/wt/devicemanager-gran/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/gran/test/TestDeviceManagerGRanImpl.java
deleted file mode 100644 (file)
index 8686527..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.onap.ccsdk.features.sdnr.wt.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.gran.GRanNetworkElementFactory;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.gran.impl.DeviceManagerGRanImpl;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.service.DeviceManagerServiceProvider;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.service.NetconfNetworkElementService;
-
-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/sdnr/wt/devicemanager-gran/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/gran/test/TestGRanNetworkElement.java b/sdnr/wt/devicemanager-gran/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/gran/test/TestGRanNetworkElement.java
deleted file mode 100644 (file)
index a9393cd..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.onap.ccsdk.features.sdnr.wt.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.devicemanager.gran.GRanNetworkElement;
-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;
-
-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/sdnr/wt/devicemanager-gran/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/gran/test/TestGRanNetworkElementFactory.java b/sdnr/wt/devicemanager-gran/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/gran/test/TestGRanNetworkElementFactory.java
deleted file mode 100644 (file)
index b307d88..0000000
+++ /dev/null
@@ -1,68 +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.onap.ccsdk.features.sdnr.wt.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.gran.GRanNetworkElementFactory;
-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;
-
-
-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/sdnr/wt/devicemanager-gran/provider/src/test/resources/simplelogger.properties b/sdnr/wt/devicemanager-gran/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
index dbe95e0..1db66c0 100644 (file)
@@ -89,7 +89,8 @@ export const splitVPath = (vPath: string, vPathParser : RegExp): [string, string
 
 const getReferencedDataList = async (refPath: string, dataPath: string, modules: { [name: string]: Module }, views: ViewSpecification[]) => {
   const pathParts = splitVPath(refPath, /(?:(?:([^\/\:]+):)?([^\/]+))/g);  // 1 = opt: namespace / 2 = property
-  let referencedModule = modules[pathParts[0][0]];
+  const defaultNS = pathParts[0][0];
+  let referencedModule = modules[defaultNS];
 
   let dataMember: string;
   let view: ViewSpecification;
@@ -121,14 +122,17 @@ const getReferencedDataList = async (refPath: string, dataPath: string, modules:
             throw new Error(`Server Error. Status: [${restResult.status}]\n${message || restResult.message || ''}`);
           }
 
-          let dataRaw = restResult.data[dataMember!];
+          let dataRaw = restResult.data[`${defaultNS}:${dataMember!}`];
+          if (dataRaw === undefined) {
+              dataRaw = restResult.data[dataMember!];
+          }
           dataRaw = dataRaw instanceof Array
             ? dataRaw[0]
             : dataRaw;
 
           data = dataRaw && dataRaw[viewElement.label] || [];
           const keys: string[] = data.map((entry: { [key: string]: any } )=> entry[viewElement.key!]);
-          resultingDataUrls.push(...keys.map(key => `${dataUrl}/${viewElement.label.replace(/\//ig, "%2F")}/${key.replace(/\//ig, "%2F")}`));
+          resultingDataUrls.push(...keys.map(key => `${dataUrl}/${viewElement.label.replace(/\//ig, "%2F")}=${key.replace(/\//ig, "%2F")}`));
         }
         dataMember = viewElement.label;
       } else {
@@ -149,7 +153,10 @@ const getReferencedDataList = async (refPath: string, dataPath: string, modules:
           const message = restResult.data && restResult.data.errors && restResult.data.errors.error && restResult.data.errors.error[0] && restResult.data.errors.error[0]["error-message"] || "";
           throw new Error(`Server Error. Status: [${restResult.status}]\n${message || restResult.message || ''}`);
         }
-        let dataRaw = restResult.data[dataMember!];
+        let dataRaw = restResult.data[`${defaultNS}:${dataMember!}`];
+        if (dataRaw === undefined) {
+            dataRaw = restResult.data[dataMember!];
+        }
         dataRaw = dataRaw instanceof Array
           ? dataRaw[0]
           : dataRaw;
@@ -227,7 +234,7 @@ const flatenViewElements = (defaultNS: string | null, parentPath: string, elemen
 export const updateViewActionAsyncCreator = (vPath: string) => async (dispatch: Dispatch, getState: () => IApplicationStoreState) => {
   const pathParts = splitVPath(vPath, /(?:([^\/\["]+)(?:\[([^\]]*)\])?)/g); // 1 = property / 2 = optional key
   const { configuration: { deviceDescription: { nodeId, modules, views } }, framework: { navigationState } } = getState();
-  let dataPath = `/restconf/config/network-topology:network-topology/topology/topology-netconf/node/${nodeId}/yang-ext:mount`;
+  let dataPath = `/rests/data/network-topology:network-topology/topology=topology-netconf/node=${nodeId}/yang-ext:mount`;
 
   let inputViewSpecification: ViewSpecification | undefined = undefined;
   let outputViewSpecification: ViewSpecification | undefined = undefined;
@@ -302,7 +309,11 @@ export const updateViewActionAsyncCreator = (vPath: string) => async (dispatch:
         }
         extractList = true;
       } else {
-        dataPath += `/${property}${key ? `/${key.replace(/\//ig, "%2F")}` : ""}`;
+        // normal case 
+        dataPath += `/${property}${key ? `=${key.replace(/\//ig, "%2F")}` : ""}`;
+
+        // in case of the root element the required namespace will be added later,
+        // while extracting the data
         dataMember = namespace === defaultNS
           ? viewElement.label
           : `${namespace}:${viewElement.label}`;
@@ -352,7 +363,11 @@ export const updateViewActionAsyncCreator = (vPath: string) => async (dispatch:
         const message = restResult.data.errors && restResult.data.errors.error && restResult.data.errors.error[0] && restResult.data.errors.error[0]["error-message"] || "";
         throw new Error(`Server Error. Status: [${restResult.status}]\n${message}`);
       } else {
-        data = restResult.data[dataMember!]; // extract dataMember
+        // https://tools.ietf.org/html/rfc7951#section-4 the root element may countain a namesapce or not !  
+        data = restResult.data[`${defaultNS}:${dataMember!}`];
+        if (data === undefined) {
+           data = restResult.data[dataMember!]; // extract dataMember w/o namespace
+        }
       }
 
       // extract the first element list[key]
@@ -405,7 +420,7 @@ export const updateViewActionAsyncCreator = (vPath: string) => async (dispatch:
 export const updateDataActionAsyncCreator = (vPath: string, data: any) => async (dispatch: Dispatch, getState: () => IApplicationStoreState) => {
   const pathParts = splitVPath(vPath, /(?:([^\/\["]+)(?:\[([^\]]*)\])?)/g); // 1 = property / 2 = optional key
   const { configuration: { deviceDescription: { nodeId, views } } } = getState();
-  let dataPath = `/restconf/config/network-topology:network-topology/topology/topology-netconf/node/${nodeId}/yang-ext:mount`;
+  let dataPath = `/rests/data/network-topology:network-topology/topology=topology-netconf/node=${nodeId}/yang-ext:mount`;
   let viewSpecification: ViewSpecification = views[0];
   let viewElement: ViewElement;
   let dataMember: string;
@@ -445,7 +460,7 @@ export const updateDataActionAsyncCreator = (vPath: string, data: any) => async
         }
       }
 
-      dataPath += `/${property}${key ? `/${key.replace(/\//ig, "%2F")}` : ""}`;
+      dataPath += `/${property}${key ? `=${key.replace(/\//ig, "%2F")}` : ""}`;
       dataMember = viewElement.label;
       embedList = false;
 
@@ -466,7 +481,7 @@ export const updateDataActionAsyncCreator = (vPath: string, data: any) => async
 
     // do not extract root member (0)
     if (viewSpecification && viewSpecification.id !== "0") {
-      const updateResult = await restService.setConfigData(dataPath, { [dataMember!]: data }); // extractDataMember
+      const updateResult = await restService.setConfigData(dataPath, { [`${defaultNS}:${dataMember!}`]: data }); // addDataMember using defaultNS
       if (updateResult.status < 200 || updateResult.status > 299) {
         const message = updateResult.data && updateResult.data.errors && updateResult.data.errors.error && updateResult.data.errors.error[0] && updateResult.data.errors.error[0]["error-message"] || "";
         throw new Error(`Server Error. Status: [${updateResult.status}]\n${message || updateResult.message || ''}`);
@@ -499,7 +514,7 @@ export const updateDataActionAsyncCreator = (vPath: string, data: any) => async
 export const removeElementActionAsyncCreator = (vPath: string) => async (dispatch: Dispatch, getState: () => IApplicationStoreState) => {
   const pathParts = splitVPath(vPath, /(?:([^\/\["]+)(?:\[([^\]]*)\])?)/g); // 1 = property / 2 = optional key
   const { configuration: { deviceDescription: { nodeId, views } } } = getState();
-  let dataPath = `/restconf/config/network-topology:network-topology/topology/topology-netconf/node/${nodeId}/yang-ext:mount`;
+  let dataPath = `/rests/data/network-topology:network-topology/topology=topology-netconf/node=${nodeId}/yang-ext:mount`;
   let viewSpecification: ViewSpecification = views[0];
   let viewElement: ViewElement;
 
@@ -529,7 +544,7 @@ export const removeElementActionAsyncCreator = (vPath: string) => async (dispatc
         }
       }
 
-      dataPath += `/${property}${key ? `/${key.replace(/\//ig, "%2F")}` : ""}`;
+      dataPath += `/${property}${key ? `=${key.replace(/\//ig, "%2F")}` : ""}`;
 
       if (viewElement && "viewId" in viewElement) {
         viewSpecification = views[+viewElement.viewId];
@@ -555,7 +570,7 @@ export const removeElementActionAsyncCreator = (vPath: string) => async (dispatc
 export const executeRpcActionAsyncCreator = (vPath: string, data: any) => async (dispatch: Dispatch, getState: () => IApplicationStoreState) => {
   const pathParts = splitVPath(vPath, /(?:([^\/\["]+)(?:\[([^\]]*)\])?)/g); // 1 = property / 2 = optional key
   const { configuration: { deviceDescription: { nodeId, views }, viewDescription: oldViewDescription } } = getState();
-  let dataPath = `/restconf/operations/network-topology:network-topology/topology/topology-netconf/node/${nodeId}/yang-ext:mount`;
+  let dataPath = `/rests/operations/network-topology:network-topology/topology=topology-netconf/node=${nodeId}/yang-ext:mount`;
   let viewSpecification: ViewSpecification = views[0];
   let viewElement: ViewElement;
   let dataMember: string;
@@ -595,7 +610,7 @@ export const executeRpcActionAsyncCreator = (vPath: string, data: any) => async
       //   }
       }
 
-      dataPath += `/${property}${key ? `/${key.replace(/\//ig, "%2F")}` : ""}`;
+      dataPath += `/${property}${key ? `=${key.replace(/\//ig, "%2F")}` : ""}`;
       dataMember = viewElement.label;
       embedList = false;
 
@@ -637,8 +652,7 @@ export const executeRpcActionAsyncCreator = (vPath: string, data: any) => async
         const message = updateResult.data && updateResult.data.errors && updateResult.data.errors.error && updateResult.data.errors.error[0] && updateResult.data.errors.error[0]["error-message"] || "";
         throw new Error(`Server Error. Status: [${updateResult.status}]\n${message || updateResult.message || ''}`);
       }
-      const viewData = { ...oldViewDescription.viewData, output: updateResult.data || null};
-      dispatch(new UpdatOutputData(viewData));
+      dispatch(new UpdatOutputData(updateResult.data));
     } else {
       throw new Error(`There is NO RPC specified.`);
     }
index b260f1f..eb2c67c 100644 (file)
@@ -23,10 +23,10 @@ import { NetworkElementConnection } from "../models/networkElementConnection";
 
 class RestService {
   public async getCapabilitiesByMoutId(nodeId: string): Promise<{ "capabilityOrigin": string, "capability": string }[] | null> {
-    const path = `/restconf/operational/network-topology:network-topology/topology/topology-netconf/node/${nodeId}`;
-    const capabilitiesResult = await requestRest<{ node: { "node-id": string, "netconf-node-topology:available-capabilities": { "available-capability": { "capabilityOrigin": string, "capability": string }[] }}[] }>(path, { method: "GET" });
-    return capabilitiesResult && capabilitiesResult.node && capabilitiesResult.node.length > 0 &&
-      capabilitiesResult.node[0]["netconf-node-topology:available-capabilities"]["available-capability"].map(obj => convertPropertyNames(obj, replaceHyphen)) || null;
+    const path = `/rests/data/network-topology:network-topology/topology=topology-netconf/node=${nodeId}`;
+    const capabilitiesResult = await requestRest<{"network-topology:node": {"node-id": string, "netconf-node-topology:available-capabilities": { "available-capability": { "capability-origin": string, "capability": string }[] }}[] }>(path, { method: "GET" });
+    return capabilitiesResult && capabilitiesResult["network-topology:node"] && capabilitiesResult["network-topology:node"].length > 0 &&
+      capabilitiesResult["network-topology:node"][0]["netconf-node-topology:available-capabilities"]["available-capability"].map<any>(obj => convertPropertyNames(obj, replaceHyphen)) || null;
   }
 
   public async getMountedNetworkElementByMountId(nodeId: string): Promise<NetworkElementConnection | null> {
@@ -34,13 +34,13 @@ class RestService {
     // const connectedNetworkElement = await requestRest<NetworkElementConnection>(path, { method: "GET" });
     // return connectedNetworkElement || null;
 
-    const path = "/restconf/operations/data-provider:read-network-element-connection-list";
-    const body = { "input": { "filter": [{ "property": "node-id", "filtervalue": nodeId }], "sortorder": [], "pagination": { "size": 1, "page": 1 } } };
-    const networkElementResult = await requestRest<{ output: { data: NetworkElementConnection[] } }>(path, { method: "POST", body: JSON.stringify(body) });
-    return networkElementResult && networkElementResult.output && networkElementResult.output.data &&
-      networkElementResult.output.data.map(obj => convertPropertyNames(obj, replaceHyphen))[0] || null;
+    const path = "/rests/operations/data-provider:read-network-element-connection-list";
+    const body = { "data-provider:input": { "filter": [{ "property": "node-id", "filtervalue": nodeId }], "sortorder": [], "pagination": { "size": 1, "page": 1 } } };
+    const networkElementResult = await requestRest<{ "data-provider:output": { data: NetworkElementConnection[] } }>(path, { method: "POST", body: JSON.stringify(body) });
+    return networkElementResult && networkElementResult["data-provider:output"] && networkElementResult["data-provider:output"].data &&
+      networkElementResult["data-provider:output"].data.map(obj => convertPropertyNames(obj, replaceHyphen))[0] || null;
   }
-
   /** Reads the config data by restconf path.
   * @param path The restconf path to be used for read.
   * @returns The data.
index dccf349..329eb00 100644 (file)
@@ -107,8 +107,11 @@ module.exports = (env) => {
         ]
     ],
 
+     watchOptions: {
+       ignored: /node_modules/
+     },
+
     devServer: {
-      public: "http://localhost:3100",
       contentBase: frameworkPath,
 
       compress: true,
@@ -125,31 +128,39 @@ module.exports = (env) => {
       stats: {
         colors: true
       },
-      proxy: {
-        "/oauth2/": {
-          target: "http://localhost:48181",
-          secure: false
-        },
+       proxy: {
         "/yang-schema/": {
-          target: "http://localhost:48181",
+          target: "http://10.20.6.29:48181",
+          secure: false
+        },   
+        "/oauth2/": {
+          target: "http://10.20.6.29:48181",
           secure: false
         },
         "/database/": {
-          target: "http://localhost:48181",
+          target: "http://10.20.6.29:48181",
           secure: false
         },
         "/restconf/": {
-          target: "http://localhost:48181",
+          target: "http://10.20.6.29:48181",
+          secure: false
+        },
+        "/rests/": {
+          target: "http://10.20.6.29:48181",
           secure: false
         },
         "/help/": {
-          target: "http://localhost:48181",
+          target: "http://10.20.6.29:48181",
+          secure: false
+        },
+        "/tree/": {
+          target: "http://10.20.6.29:48181",
           secure: false
         },
         "/websocket": {
-          target: "http://localhost:48181",
+          target: "http://10.20.6.29:48181",
           ws: true,
-          changeOrigin: false,
+          changeOrigin: true,
           secure: false
         }
       }
index 41449e8..2aa9e39 100644 (file)
@@ -33,9 +33,9 @@ class ConnectService {
    * Inserts a network elements.
    */
   public async createNetworkElement(element: NetworkElementConnection): Promise<NetworkElementConnection | null> {
-    const path = `/restconf/operations/data-provider:create-network-element-connection`;
+    const path = `/rests/operations/data-provider:create-network-element-connection`;
     const result = await requestRest<NetworkElementConnection>(path, {
-      method: "POST", body: JSON.stringify(convertPropertyNames({ input: element }, replaceUpperCase))
+      method: "POST", body: JSON.stringify(convertPropertyNames({ "data-provider:input": element }, replaceUpperCase))
     });
     return result || null;
   }
@@ -44,9 +44,9 @@ class ConnectService {
   * Updates a network element.
   */
   public async updateNetworkElement(element: UpdateNetworkElement): Promise<NetworkElementConnection | null> {
-    const path = `/restconf/operations/data-provider:update-network-element-connection`;
+    const path = `/rests/operations/data-provider:update-network-element-connection`;
     const result = await requestRest<NetworkElementConnection>(path, {
-      method: "POST", body: JSON.stringify(convertPropertyNames({ input: element }, replaceUpperCase))
+      method: "POST", body: JSON.stringify(convertPropertyNames({ "data-provider:input": element }, replaceUpperCase))
     });
     return result || null;
   }
@@ -58,16 +58,16 @@ class ConnectService {
     const query = {
       "id": element.id
     };
-    const path = `/restconf/operations/data-provider:delete-network-element-connection`;
+    const path = `/rests/operations/data-provider:delete-network-element-connection`;
     const result = await requestRest<NetworkElementConnection>(path, {
-      method: "POST", body: JSON.stringify(convertPropertyNames({ input: query }, replaceUpperCase))
+      method: "POST", body: JSON.stringify(convertPropertyNames({ "data-provider:input": query }, replaceUpperCase))
     });
     return result || null;
   }
 
   /** Mounts network element. */
   public async mountNetworkElement(networkElement: NetworkElementConnection): Promise<boolean> {
-    const path = 'restconf/config/network-topology:network-topology/topology/topology-netconf/node/' + networkElement.nodeId;
+    const path = '/rests/data/network-topology:network-topology/topology=topology-netconf/node=' + networkElement.nodeId;
     const mountXml = [
       '<node xmlns="urn:TBD:params:xml:ns:yang:network-topology">',
       `<node-id>${networkElement.nodeId}</node-id>`,
@@ -106,7 +106,7 @@ class ConnectService {
 
   /** Unmounts a network element by its id. */
   public async unmountNetworkElement(nodeId: string): Promise<boolean> {
-    const path = 'restconf/config/network-topology:network-topology/topology/topology-netconf/node/' + nodeId;
+    const path = '/rests/data/network-topology:network-topology/topology=topology-netconf/node=' + nodeId;
 
     try {
       const result = await requestRest<string>(path, {
@@ -126,7 +126,7 @@ class ConnectService {
 
   /** Yang capabilities of the selected network elements. */
   public async infoNetworkElement(nodeId: string): Promise<TopologyNode | null> {
-    const path = 'restconf/operational/network-topology:network-topology/topology/topology-netconf/node/' + nodeId;
+    const path = '/rests/operational/network-topology:network-topology/topology=topology-netconf/node=' + nodeId;
     const topologyRequestPomise = requestRest<Topology>(path, { method: "GET" });
 
     return topologyRequestPomise && topologyRequestPomise.then(result => {
@@ -138,9 +138,9 @@ class ConnectService {
    * Get the connection state of the network element.
    */
   public async getNetworkElementConnectionStatus(element: string): Promise<(ConnectionStatus)[] | null> {
-    const path = `/restconf/operations/data-provider:read-network-element-connection-list`;
+    const path = `/rests/operations/data-provider:read-network-element-connection-list`;
     const query = {
-      "input": {
+      "data-provider:input": {
         "filter": [{
           "property": "node-id",
           "filtervalue": element
@@ -152,13 +152,13 @@ class ConnectService {
       }
     }
     const result = await requestRest<Result<ConnectionStatus>>(path, { method: "POST", body: JSON.stringify(query) });
-    return result && result.output && result.output.data && result.output.data.map(ne => ({
+    return result && result["data-provider:output"] && result["data-provider:output"].data && result["data-provider:output"].data.map(ne => ({
       status: ne.status
     })) || null;
   }
 
   public async getWebUriExtensionForNetworkElementAsync(ne: string) {
-    const path = 'restconf/config/network-topology:network-topology/topology/topology-netconf/node/' + ne + '/yang-ext:mount/core-model:network-element';
+    const path = '/rests/data/network-topology:network-topology/topology=topology-netconf/node=' + ne + '/yang-ext:mount/core-model:network-element';
     try {
       const result = await requestRest<any>(path, { method: "GET" });
 
@@ -182,7 +182,7 @@ class ConnectService {
     let webUris: guiCutThrough[] = []
 
     ne.forEach(nodeId => {
-      const path = 'restconf/config/network-topology:network-topology/topology/topology-netconf/node/' + nodeId + '/yang-ext:mount/core-model:network-element';
+      const path = '/rests/data/network-topology:network-topology/topology=topology-netconf/node=' + nodeId + '/yang-ext:mount/core-model:network-element';
 
       // add search request to array
       promises.push(requestRest<any>(path, { method: "GET" })
index b72f5da..7b0a517 100644 (file)
@@ -126,23 +126,27 @@ module.exports = (env) => {
       },
       proxy: {
         "/oauth2/": {
-          target: "http://localhost:48181",
+          target: "http://10.20.6.29:48181",
           secure: false
         },
         "/database/": {
-          target: "http://localhost:48181",
+          target: "http://10.20.6.29:48181",
           secure: false
         },
         "/restconf/": {
-          target: "http://localhost:48181",
+          target: "http://10.20.6.29:48181",
+          secure: false
+        },
+        "/rests/": {
+          target: "http://10.20.6.29:48181",
           secure: false
         },
         "/help/": {
-          target: "http://localhost:48181",
+          target: "http://10.20.6.29:48181",
           secure: false
         },
         "/websocket": {
-          target: "http://localhost:48181",
+          target: "http://10.20.6.29:48181",
           ws: true,
           changeOrigin: true,
           secure: false
index ba1a248..fea500d 100644 (file)
@@ -28,9 +28,9 @@ export class AreStuckAlarmsCleared extends FaultApplicationBaseAction {
 }
 
 
-export const clearStuckAlarmAsyncAction = (dispatcher: Dispatch) => async (nodeNames: string[]) => {
-    dispatcher(new AreStuckAlarmsCleared(true))
+export const clearStuckAlarmAsyncAction = (dispatch: Dispatch) => async (nodeNames: string[]) => {
+    dispatch(new AreStuckAlarmsCleared(true))
     const result = await clearStuckAlarms(nodeNames).catch(error => { console.error(error); return undefined });
-    dispatcher(new AreStuckAlarmsCleared(false))
+    dispatch(new AreStuckAlarmsCleared(false))
     return result;
 }
\ No newline at end of file
index 3b8b9b6..e131fa6 100644 (file)
@@ -30,25 +30,29 @@ export enum ClearStuckAlarmsDialogMode {
 const mapDispatch = (dispatcher: IDispatcher) => ({
     clearStuckAlarmsAsync: clearStuckAlarmAsyncAction(dispatcher.dispatch),
     reloadCurrentProblemsAction: () => dispatcher.dispatch(currentProblemsReloadAction)
-})
+});
 
 type clearStuckAlarmsProps = Connect<typeof undefined, typeof mapDispatch> & {
-    numberDevices: Number,
-    mode: ClearStuckAlarmsDialogMode,
-    stuckAlarms: string[]
-    onClose: () => void
+    numberDevices: Number;
+    mode: ClearStuckAlarmsDialogMode;
+    stuckAlarms: string[];
+    onClose: () => void;
 }
 
 type ClearStuckAlarmsState = {
-    clearAlarmsSuccessful: boolean,
-    errormessage: string,
-    unclearedAlarms: string[]
+    clearAlarmsSuccessful: boolean;
+    errormessage: string;
+    unclearedAlarms: string[];
 }
 
 class ClearStuckAlarmsDialogComponent extends React.Component<clearStuckAlarmsProps, ClearStuckAlarmsState>{
     constructor(props: clearStuckAlarmsProps) {
         super(props);
-        this.state = { clearAlarmsSuccessful: true, errormessage: '', unclearedAlarms: [] }
+        this.state = { 
+            clearAlarmsSuccessful: true, 
+            errormessage: '', 
+            unclearedAlarms: [] 
+        };
     }
 
     onClose = (event: React.MouseEvent) => {
@@ -62,19 +66,14 @@ class ClearStuckAlarmsDialogComponent extends React.Component<clearStuckAlarmsPr
         event.preventDefault();
         const result = await this.props.clearStuckAlarmsAsync(this.props.stuckAlarms);
 
-        if (result) {
-            if (result.output.nodenames) {
-                if (result.output.nodenames.length !== this.props.stuckAlarms.length) { //show errormessage if not all devices were cleared
-                    const undeletedAlarm = this.props.stuckAlarms.filter(item => !result.output.nodenames.includes(item))
-                    const error = "The alarms of the following devices couldn't be refreshed: ";
-                    this.setState({ clearAlarmsSuccessful: false, errormessage: error, unclearedAlarms: undeletedAlarm })
-                    return;
-                }
-            }
-        }
-        else { //show errormessage if no devices were cleared
-            this.setState({ clearAlarmsSuccessful: false, errormessage: "Alarms couldn't be refreshed.", unclearedAlarms: [] })
+        if (result && result["data-provider:output"].nodenames && result["data-provider:output"].nodenames.length !== this.props.stuckAlarms.length) { //show errormessage if not all devices were cleared
+            const undeletedAlarm = this.props.stuckAlarms.filter(item => !result["data-provider:output"].nodenames.includes(item));
+            const error = "The alarms of the following devices couldn't be refreshed: ";
+            this.setState({ clearAlarmsSuccessful: false, errormessage: error, unclearedAlarms: undeletedAlarm });
             return;
+
+        } else { //show errormessage if no devices were cleared
+            this.setState({ clearAlarmsSuccessful: false, errormessage: "Alarms couldn't be refreshed.", unclearedAlarms: [] });
         }
 
         this.props.reloadCurrentProblemsAction();
@@ -132,5 +131,5 @@ class ClearStuckAlarmsDialogComponent extends React.Component<clearStuckAlarmsPr
     }
 }
 
-const ClearStuckAlarmsDialog = connect(undefined, mapDispatch)(ClearStuckAlarmsDialogComponent)
+const ClearStuckAlarmsDialog = connect(undefined, mapDispatch)(ClearStuckAlarmsDialogComponent);
 export default ClearStuckAlarmsDialog;
index e03d2b5..5b51a10 100644 (file)
@@ -67,7 +67,6 @@ const actionHandlers = {
   alarmLogEntries: alarmLogEntriesActionHandler,
   currentOpenPanel: currentOpenPanelHandler,
   faultStatus: faultStatusHandler,
-  stuckAlarms: stuckAlarmHandler,
   listenForPartialUpdates: arePartialUpdatesActiveHandler
 };
 
index c657344..e4e43f1 100644 (file)
@@ -61,7 +61,5 @@ export type Faults = {
 };
 
 export type DeletedStuckAlarms = {
-  output: {
     nodenames: string[]
-  }
 }
\ No newline at end of file
index d3409e0..d1236d2 100644 (file)
  * ============LICENSE_END==========================================================================
  */
 import { requestRest } from "../../../../framework/src/services/restService";
-import { Result, PostResponse } from "../../../../framework/src/models/elasticSearch";
+import { Result, SingeResult } from "../../../../framework/src/models/elasticSearch";
 import { FaultType, Faults, DeletedStuckAlarms } from "../models/fault";
 
 
 export const getFaultStateFromDatabase = async (): Promise<FaultType | null> => {
-  const path = 'restconf/operations/data-provider:read-status';
+  const path = 'rests/operations/data-provider:read-status';
   const result = await requestRest<Result<Faults>>(path, { method: "POST" });
 
   let faultType: FaultType = {
@@ -32,8 +32,8 @@ export const getFaultStateFromDatabase = async (): Promise<FaultType | null> =>
   }
   let faults: Faults[] | null = null;
 
-  if (result && result.output && result.output.data) {
-    faults = result.output.data;
+  if (result && result["data-provider:output"] && result["data-provider:output"].data) {
+    faults = result["data-provider:output"].data;
     faultType = {
       Critical: faults[0].faults.criticals,
       Major: faults[0].faults.majors,
@@ -46,8 +46,8 @@ export const getFaultStateFromDatabase = async (): Promise<FaultType | null> =>
 }
 
 export const clearStuckAlarms = async (nodeNames: string[]) => {
-  const path = 'restconf/operations/devicemanager:clear-current-fault-by-nodename'
-  const result = await requestRest<DeletedStuckAlarms>(path, { method: 'Post', body: JSON.stringify({ input: { nodenames: nodeNames } }) })
+  const path = 'rests/operations/devicemanager:clear-current-fault-by-nodename'
+  const result = await requestRest<SingeResult<DeletedStuckAlarms>>(path, { method: 'Post', body: JSON.stringify({ input: { nodenames: nodeNames } }) })
   return result;
 
 }
\ No newline at end of file
index c91b1f4..8131c98 100644 (file)
@@ -123,25 +123,29 @@ module.exports = (env) => {
       stats: {
         colors: true
       },
-      proxy: {
+       proxy: {
         "/oauth2/": {
-          target: "http://localhost:48181",
+          target: "http://10.20.6.29:48181",
           secure: false
         },
         "/database/": {
-          target: "http://localhost:48181",
+          target: "http://10.20.6.29:48181",
           secure: false
         },
         "/restconf/": {
-          target: "http://localhost:48181",
+          target: "http://10.20.6.29:48181",
+          secure: false
+        },
+        "/rests/": {
+          target: "http://10.20.6.29:48181",
           secure: false
         },
         "/help/": {
-          target: "http://localhost:48181",
+          target: "http://10.20.6.29:48181",
           secure: false
         },
-        "/websocket/": {
-          target: "http://localhost:48181",
+        "/websocket": {
+          target: "http://10.20.6.29:48181",
           ws: true,
           changeOrigin: true,
           secure: false
index c8b2478..728f243 100644 (file)
@@ -55,7 +55,7 @@ class HelpService {
         }, []);
       }
 
-      this.tocNodeCollection = result && mapNodesCollection(result);
+      this.tocNodeCollection = result && mapNodesCollection(result) || null;
     }
     return this.tocNodeCollection || null;
   }
index b6025d4..d43d298 100644 (file)
@@ -36,9 +36,9 @@ class InventoryService {
   }
 
   public async getInventoryEntry(id: string): Promise<InventoryType | undefined> {
-    const path = `/restconf/operations/data-provider:read-inventory-list`;
+    const path = `/rests/operations/data-provider:read-inventory-list`;
     const body = {
-      "input": {
+      "data-provider:input": {
         "filter": [
           { property: "id", filtervalue: id },
         ],
index d81797c..66c8613 100644 (file)
@@ -127,33 +127,33 @@ module.exports = (env) => {
       },
       proxy: {
         "/oauth2/": {
-          target: "http://localhost:48181",
-          secure: false
-        },
-        "/yang-schema/": {
-          target: "http://localhost:48181",
+          target: "http://10.20.6.29:48181",
           secure: false
         },
         "/database/": {
-          target: "http://localhost:48181",
+          target: "http://10.20.6.29:48181",
           secure: false
         },
         "/restconf/": {
-          target: "http://localhost:48181",
+          target: "http://10.20.6.29:48181",
+          secure: false
+        },
+        "/rests/": {
+          target: "http://10.20.6.29:48181",
           secure: false
         },
         "/help/": {
-          target: "http://localhost:48181",
+          target: "http://10.20.6.29:48181",
           secure: false
         },
         "/tree/": {
-          target: "http://localhost:48181",
+          target: "http://10.20.6.29:48181",
           secure: false
         },
         "/websocket": {
-          target: "http://localhost:48181",
+          target: "http://10.20.6.29:48181",
           ws: true,
-          changeOrigin: false,
+          changeOrigin: true,
           secure: false
         }
       }
index daa6082..613b478 100644 (file)
@@ -34,7 +34,7 @@ class MaintenenceService {
   * Adds or updates one maintenence entry to the backend.
   */
   public async writeMaintenenceEntry(maintenenceEntry: MaintenenceEntry): Promise<PostResponse | null> {
-    const path = `/restconf/operations/data-provider:create-maintenance`;
+    const path = `/rests/operations/data-provider:create-maintenance`;
 
     const query = {
       "id": maintenenceEntry._id,
@@ -45,7 +45,7 @@ class MaintenenceService {
       "start": convertToISODateString(maintenenceEntry.start)
     };
 
-    const result = await requestRest<PostResponse>(path, { method: "POST", body: JSON.stringify(convertPropertyNames({ input: query }, replaceUpperCase)) });
+    const result = await requestRest<PostResponse>(path, { method: "POST", body: JSON.stringify(convertPropertyNames({ "data-provider:input": query }, replaceUpperCase)) });
     return result || null;
   }
 
@@ -53,7 +53,7 @@ class MaintenenceService {
   * Deletes one maintenence entry by its mountId from the backend.
   */
   public async deleteMaintenenceEntry(maintenenceEntry: MaintenenceEntry): Promise<(DeleteResponse) | null> {
-    const path = `/restconf/operations/data-provider:delete-maintenance`;
+    const path = `/rests/operations/data-provider:delete-maintenance`;
 
     const query = {
       "id": maintenenceEntry._id,
@@ -63,7 +63,7 @@ class MaintenenceService {
       "end": convertToISODateString(maintenenceEntry.end),
       "start": convertToISODateString(maintenenceEntry.start)
     };
-    const result = await requestRest<DeleteResponse>(path, { method: "POST", body: JSON.stringify(convertPropertyNames({ input: query }, replaceUpperCase)) });
+    const result = await requestRest<DeleteResponse>(path, { method: "POST", body: JSON.stringify(convertPropertyNames({ "data-provider:input": query }, replaceUpperCase)) });
     return result || null;
   }
 }
index 33a3bed..eb6f785 100644 (file)
@@ -125,25 +125,29 @@ module.exports = (env) => {
       stats: {
         colors: true
       },
-      proxy: {
+       proxy: {
         "/oauth2/": {
-          target: "http://localhost:48181",
+          target: "http://10.20.6.29:48181",
           secure: false
         },
         "/database/": {
-          target: "http://localhost:48181",
+          target: "http://10.20.6.29:48181",
           secure: false
         },
         "/restconf/": {
-          target: "http://localhost:48181",
+          target: "http://10.20.6.29:48181",
+          secure: false
+        },
+        "/rests/": {
+          target: "http://10.20.6.29:48181",
           secure: false
         },
         "/help/": {
-          target: "http://localhost:48181",
+          target: "http://10.20.6.29:48181",
           secure: false
         },
-        "/websocket/": {
-          target: "http://localhost:48181",
+        "/websocket": {
+          target: "http://10.20.6.29:48181",
           ws: true,
           changeOrigin: true,
           secure: false
index aee0866..ede6817 100644 (file)
@@ -83,8 +83,8 @@ class MediatorService {
 
     const result = await requestRest<Result<MediatorServer>>(path, { method: "POST", body: JSON.stringify({ input: data }) });
 
-    if (result && result.output.data[0]) {
-      const firstResult = result.output.data[0];
+    if (result && result["data-provider:output"].data[0]) {
+      const firstResult = result["data-provider:output"].data[0];
 
       return {
         id: firstResult.id,
index 6858598..70a8771 100644 (file)
@@ -47,13 +47,13 @@ class PerformanceService {
 
 
     if (selectedTimePeriod === "15min") {
-      path = '/restconf/operations/data-provider:read-pmdata-15m-ltp-list';
+      path = '/rests/operations/data-provider:read-pmdata-15m-ltp-list';
     } else {
-      path = '/restconf/operations/data-provider:read-pmdata-24h-ltp-list';
+      path = '/rests/operations/data-provider:read-pmdata-24h-ltp-list';
     }
 
     const result = await requestRest<Result<string>>(path, { method: "POST", body: JSON.stringify(convertPropertyNames({ input: query }, replaceUpperCase)) });
-    return result && result.output && result.output.data && result.output.data.map(ne => ({ key: ne })) || null;
+    return result && result["data-provider:output"] && result["data-provider:output"].data && result["data-provider:output"].data.map(ne => ({ key: ne })) || null;
   }
 
 
@@ -62,9 +62,9 @@ class PerformanceService {
   * Gets all devices from the performanceHistory 15min backend.
   */
   public async getDeviceListfromPerf15minHistory(): Promise<(DeviceListType)[] | null> {
-    const path = '/restconf/operations/data-provider:read-pmdata-15m-device-list';
+    const path = '/rests/operations/data-provider:read-pmdata-15m-device-list';
     const query = {
-      "input": {
+      "data-provider:input": {
         "filter": [],
         "sortorder": [],
         "pagination": {
@@ -75,7 +75,7 @@ class PerformanceService {
     };
 
     const result = await requestRest<Result<string>>(path, { method: "POST", body: JSON.stringify(query) });
-    return result && result.output && result.output.data && result.output.data.map(ne => ({
+    return result && result["data-provider:output"] && result["data-provider:output"].data && result["data-provider:output"].data.map(ne => ({
       nodeId: ne
     })) || null;
   }
@@ -84,9 +84,9 @@ class PerformanceService {
    * Gets all devices from the performanceHistory 24h backend.
    */
   public async getDeviceListfromPerf24hHistory(): Promise<(DeviceListType)[] | null> {
-    const path = '/restconf/operations/data-provider:read-pmdata-24h-device-list';
+    const path = '/rests/operations/data-provider:read-pmdata-24h-device-list';
     const query = {
-      "input": {
+      "data-provider:input": {
         "filter": [],
         "sortorder": [],
         "pagination": {
@@ -97,7 +97,7 @@ class PerformanceService {
     };
 
     const result = await requestRest<Result<string>>(path, { method: "POST", body: JSON.stringify(query) });
-    return result && result.output && result.output.data && result.output.data.map(ne => ({
+    return result && result["data-provider:output"] && result["data-provider:output"].data && result["data-provider:output"].data.map(ne => ({
       nodeId: ne
     })) || null;
   }
index 6579db3..5faf69e 100644 (file)
@@ -126,15 +126,29 @@ module.exports = (env) => {
       },
       proxy: {
         "/oauth2/": {
-          target: "http://10.20.6.29:28181",
+          target: "http://10.20.6.29:48181",
           secure: false
         },
-        "/restconf": {
-          target: "http://10.20.6.29:28181",
+        "/database/": {
+          target: "http://10.20.6.29:48181",
           secure: false
         },
-        "/database": {
-          target: "http://10.20.6.29:28181",
+        "/restconf/": {
+          target: "http://10.20.6.29:48181",
+          secure: false
+        },
+        "/rests/": {
+          target: "http://10.20.6.29:48181",
+          secure: false
+        },
+        "/help/": {
+          target: "http://10.20.6.29:48181",
+          secure: false
+        },
+        "/websocket": {
+          target: "http://10.20.6.29:48181",
+          ws: true,
+          changeOrigin: true,
           secure: false
         }
       }
index c7d9c32..db42ef1 100644 (file)
@@ -46,7 +46,7 @@
     <properties>
         <buildtime>${maven.build.timestamp}</buildtime>
         <distversion>ONAP Frankfurt (Neon, mdsal ${odl.mdsal.version})</distversion>
-        <buildno>56.139cd6d(20/07/08)</buildno>
+        <buildno>57.3e1d5cf(20/08/11)</buildno>
         <odlux.version>ONAP SDN-R | ONF Wireless for ${distversion} - Build: ${buildtime} ${buildno} ${project.version}</odlux.version>
     </properties>
 
                 <directory>dist</directory>
                 <targetPath>odlux</targetPath>
             </resource>
+            <resource>
+                <directory>src2/main/resources</directory>
+                <targetPath>odlux</targetPath>
+            </resource>
         </resources>
         <plugins>
             <plugin>
                     <basedir>${project.build.directory}/classes/odlux</basedir>
                     <includes>
                         <include>app.js</include>
+                        <include>version.json</include>
                     </includes>
                     <replacements>
                         <replacement>
                             <token>##odlux.version##</token>
                             <value>${odlux.version}</value>
                         </replacement>
+                         <replacement>
+                            <token>##buildno##</token>
+                            <value>${buildno}</value>
+                        </replacement>
+                        <replacement>
+                            <token>##build-timestamp##</token>
+                            <value>${buildtime}</value>
+                        </replacement>
                     </replacements>
                 </configuration>
             </plugin>
index 12cfd7d..b5f2509 100644 (file)
  * ============LICENSE_END==========================================================================\r
  */\r
 export type Result<TSource extends {}> = {\r
-  output: {\r
+  "data-provider:output": {\r
     pagination?: {\r
-      size: number,\r
-      page: number,\r
-      total: number\r
+      size: number;\r
+      page: number;\r
+      total: number;\r
     },\r
     data: TSource[];\r
   }\r
 }\r
 \r
+export type SingeResult<TSource extends {}> = {\r
+  "data-provider:output": TSource;\r
+}\r
+\r
+\r
 export type HitEntry<TSource extends {}> = {\r
   _index: string;\r
   _type: string;\r
index b02d7d1..19ef34f 100644 (file)
@@ -33,7 +33,7 @@ export const formEncode = (params: { [key: string]: string | number }) => Object
 /** Sends a rest request to the given path. 
  * @returns The data, or null it there was any error
  */
-export async function requestRest<TData>(path: string = '', init: RequestInit = {}, authenticate: boolean = true, isResource: boolean = false): Promise<TData | null> {
+export async function requestRest<TData>(path: string = '', init: RequestInit = {}, authenticate: boolean = true, isResource: boolean = false): Promise<TData | null | undefined> {
   const res = await requestRestExt<TData>(path, init, authenticate, isResource);
   if (res && res.status >= 200 && res.status < 300) {
     return res.data;
@@ -42,9 +42,9 @@ export async function requestRest<TData>(path: string = '', init: RequestInit =
 }
 
 /** Sends a rest request to the given path and reports the server state. 
- *  @returns An object with the server state, a message and the data.
+ *  @returns An object with the server state, a message and the data or undefined in case of a json parse error.
  */
-export async function requestRestExt<TData>(path: string = '', init: RequestInit = {}, authenticate: boolean = true, isResource: boolean = false): Promise<{ status: number, message?: string, data: TData | null }> {
+export async function requestRestExt<TData>(path: string = '', init: RequestInit = {}, authenticate: boolean = true, isResource: boolean = false): Promise<{ status: number, message?: string, data: TData | null | undefined }> {
   const result: { status: number, message?: string, data: TData | null } = {
     status: -1,
     data: null,
@@ -99,7 +99,7 @@ export async function requestRestExt<TData>(path: string = '', init: RequestInit
       ...result,
       status: fetchResult.status,
       message: error && error.message || String(error),
-      data: null
+      data: undefined
     };
   }
 }
\ No newline at end of file
index c18a40b..6f4c71e 100644 (file)
@@ -33,14 +33,14 @@ type dataType = { [prop: string]: propType };
 */
 export function createSearchDataHandler<TResult>(typeName: (() => string) | string, additionalFilters?: {} | null | undefined): DataCallback<(TResult)> {
   const fetchData: DataCallback<(TResult)> = async (pageIndex, rowsPerPage, orderBy, order, filter) => {
-    const url = `/restconf/operations/data-provider:read-${typeof typeName === "function" ? typeName(): typeName}-list`;
+    const url = `/rests/operations/data-provider:read-${typeof typeName === "function" ? typeName(): typeName}-list`;
 
     filter = { ...filter, ...additionalFilters };
 
     const filterKeys = filter && Object.keys(filter) || [];
 
     const query = {
-      input: {
+      "data-provider:input": {
         filter: filterKeys.filter(f => filter![f] != null && filter![f] !== "").map(property => ({ property, filtervalue: filter![property]})),
         sortorder: orderBy ? [{ property: orderBy, sortorder: order === "desc" ? "descending" : "ascending" }] : [],
         pagination: { size: rowsPerPage, page: (pageIndex != null && pageIndex > 0 && pageIndex || 0) +1 }
@@ -60,12 +60,12 @@ export function createSearchDataHandler<TResult>(typeName: (() => string) | stri
     if (result) {
       let rows: TResult[] = [];
 
-      if (result && result.output && result.output.data) {
-        rows = result.output.data.map(obj => convertPropertyNames(obj, replaceHyphen)) || []
+      if (result && result["data-provider:output"] && result["data-provider:output"].data) {
+        rows = result["data-provider:output"].data.map(obj => convertPropertyNames(obj, replaceHyphen)) || []
       }
 
       const data = {
-        page: result.output.pagination && result.output.pagination.page != null && result.output.pagination.page - 1  || 0 , total: result.output.pagination && result.output.pagination.total || 0, rows: rows
+        page: +(result["data-provider:output"].pagination && result["data-provider:output"].pagination.page != null && result["data-provider:output"].pagination.page - 1  || 0) , total: +(result["data-provider:output"].pagination && result["data-provider:output"].pagination.total || 0), rows: rows
       };
       return data;
     }
index ca3953a..c4a5488 100644 (file)
@@ -44,7 +44,7 @@ class AboutComponent extends React.Component<any, AboutState> {
     requestRestExt<string>('/about').then((response) => {
       const content = response.status == 200 ? response.data : `${response.status} ${response.message}` || "Server error";
       const loadedSucessfully = response.status == 200 ? true : false;
-      this.setState({ content: content, isContentLoadedSucessfully: loadedSucessfully });
+      this.setState({ content: content || null, isContentLoadedSucessfully: loadedSucessfully });
     }).catch((error) => {
       this.setState({ content: error })
     })
diff --git a/sdnr/wt/odlux/framework/src2/main/resources/version.json b/sdnr/wt/odlux/framework/src2/main/resources/version.json
new file mode 100644 (file)
index 0000000..f74d2c9
--- /dev/null
@@ -0,0 +1,4 @@
+{
+    "version":"##buildno##",
+    "build":"##build-timestamp##"
+}
\ No newline at end of file
index 4887a75..c7ef72e 100644 (file)
@@ -176,7 +176,7 @@ module.exports = (env) => {
     ],\r
 \r
     devServer: {\r
-      public: "http://localhost:3100",\r
+      public: "http://10.20.6.29:3100",\r
       contentBase: distPath,\r
 \r
       compress: true,\r
@@ -195,23 +195,23 @@ module.exports = (env) => {
       },\r
       proxy: {\r
         "/oauth2/": {\r
-          target: "http://localhost:48181",\r
+          target: "http://10.20.6.29:48181",\r
           secure: false\r
         },\r
         "/database/": {\r
-          target: "http://localhost:48181",\r
+          target: "http://10.20.6.29:48181",\r
           secure: false\r
         },\r
         "/restconf/": {\r
-          target: "http://localhost:48181",\r
+          target: "http://10.20.6.29:48181",\r
           secure: false\r
         },\r
         "/help/": {\r
-          target: "http://localhost:48181",\r
+          target: "http://10.20.6.29:48181",\r
           secure: false\r
         },\r
         "/websocket": {\r
-          target: "http://localhost:48181",\r
+          target: "http://10.20.6.29:48181",\r
           ws: true,\r
           changeOrigin: true,\r
           secure: false\r
index 71488be..3db21a2 100644 (file)
     universal-user-agent "^5.0.0"
 
 "@octokit/rest@^16.16.0":
-  version "16.43.1"
-  resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-16.43.1.tgz#3b11e7d1b1ac2bbeeb23b08a17df0b20947eda6b"
-  integrity sha512-gfFKwRT/wFxq5qlNjnW2dh+qh74XgTQ2B179UX5K1HYCluioWj8Ndbgqw2PVqa1NnVJkGHp2ovMpVn/DImlmkw==
+  version "16.43.2"
+  resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-16.43.2.tgz#c53426f1e1d1044dee967023e3279c50993dd91b"
+  integrity sha512-ngDBevLbBTFfrHZeiS7SAMAZ6ssuVmXuya+F/7RaVvlysgGa1JKJkKWY+jV6TCJYcW0OALfJ7nTIGXcBXzycfQ==
   dependencies:
     "@octokit/auth-token" "^2.4.0"
     "@octokit/plugin-paginate-rest" "^1.1.1"
@@ -7857,9 +7857,9 @@ npm-registry-fetch@^3.9.0:
     npm-package-arg "^6.1.0"
 
 npm-registry-fetch@^4.0.0:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-4.0.4.tgz#2da1ecf3f43d419d96abf313664291a4623d3ea5"
-  integrity sha512-6jb34hX/iYNQebqWUHtU8YF6Cjb1H6ouTFPClYsyiW6lpFkljTpdeftm53rRojtja1rKAvKNIIiTS5Sjpw4wsA==
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-4.0.5.tgz#cb87cf7f25bfb048d6c3ee19d115bebf93ea5bfa"
+  integrity sha512-yQ0/U4fYpCCqmueB2g8sc+89ckQ3eXpmU4+Yi2j5o/r0WkKvE2+Y0tK3DEILAtn2UaQTkjTHxIXe2/CSdit+/Q==
   dependencies:
     JSONStream "^1.3.4"
     bluebird "^3.5.1"