From db9f267b3930a28054e967c75db228e27663aedc Mon Sep 17 00:00:00 2001 From: highstreetherbert Date: Thu, 29 Apr 2021 19:06:54 +0200 Subject: migrate features to silicon migrate features to silicon Issue-ID: CCSDK-3278 Signed-off-by: highstreetherbert Change-Id: Icabe6bd5b760438eedd8c6b78a70197c287c5199 Signed-off-by: highstreetherbert --- .../oran/impl/ORanNetworkElement.java | 6 +- .../wt/devicemanager/oran/test/TestAlarmNotif.java | 11 ++ .../TestORanRegistrationToVESpnfRegistration.java | 170 +-------------------- 3 files changed, 19 insertions(+), 168 deletions(-) (limited to 'sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh') diff --git a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/ORanNetworkElement.java b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/ORanNetworkElement.java index 7c69f832b..0bb7f872b 100644 --- a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/ORanNetworkElement.java +++ b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/ORanNetworkElement.java @@ -40,9 +40,9 @@ import org.opendaylight.yang.gen.v1.urn.onap.system.rev201026.System1; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.Guicutthrough; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.Inventory; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.NetworkElementDeviceType; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconf.callhome.server.rev161109.NetconfCallhomeServer; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconf.callhome.server.rev161109.netconf.callhome.server.AllowedDevices; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconf.callhome.server.rev161109.netconf.callhome.server.allowed.devices.Device; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconf.callhome.server.rev201015.NetconfCallhomeServer; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconf.callhome.server.rev201015.netconf.callhome.server.AllowedDevices; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconf.callhome.server.rev201015.netconf.callhome.server.allowed.devices.Device; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId; import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; diff --git a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/test/TestAlarmNotif.java b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/test/TestAlarmNotif.java index 365b3a226..76487fa17 100644 --- a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/test/TestAlarmNotif.java +++ b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/test/TestAlarmNotif.java @@ -22,6 +22,7 @@ package org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.test; import java.util.Map; +import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime; import org.opendaylight.yang.gen.v1.urn.o.ran.fm._1._0.rev190204.AlarmNotif; @@ -74,4 +75,14 @@ public class TestAlarmNotif implements AlarmNotif { return new DateAndTime("2021-03-23T18:19:42.326144Z"); } + @Override + public @NonNull Map>, Augmentation> augmentations() { + return null; + } + + @Override + public Boolean getIsCleared() { + return null; + } + } diff --git a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/test/TestORanRegistrationToVESpnfRegistration.java b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/test/TestORanRegistrationToVESpnfRegistration.java index 781d333fe..d2cf94807 100644 --- a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/test/TestORanRegistrationToVESpnfRegistration.java +++ b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/test/TestORanRegistrationToVESpnfRegistration.java @@ -21,6 +21,7 @@ */ package org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.test; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import java.math.BigDecimal; import org.eclipse.jdt.annotation.Nullable; @@ -70,8 +71,11 @@ public class TestORanRegistrationToVESpnfRegistration { String dateTimeString = "2020-02-05T12:30:45.283Z"; String name = "Slot-0"; + NetconfNode testNetconfNode = mock(NetconfNode.class); + when(testNetconfNode.getHost()).thenReturn(new Host(new IpAddress(new Ipv4Address("10.10.10.10")))); + when(netconfAccessor.getNodeId()).thenReturn(new NodeId("nSky")); - when(netconfAccessor.getNetconfNode()).thenReturn(new TestNetconfNode()); + when(netconfAccessor.getNetconfNode()).thenReturn(testNetconfNode); when(vesCollectorService.getConfig()).thenReturn(vesCfgService); when(vesCfgService.getReportingEntityName()).thenReturn("SDN-R"); Component testComponent = ComponentHelper.get(name, dateTimeString); @@ -81,168 +85,4 @@ public class TestORanRegistrationToVESpnfRegistration { mapper.mapPNFRegistrationFields(); } - public class TestNetconfNode implements NetconfNode { - - @Override - public @Nullable Credentials getCredentials() { - return null; - } - - @Override - public @Nullable Host getHost() { - return new Host(new IpAddress(new Ipv4Address("10.10.10.10"))); - } - - @Override - public @Nullable PortNumber getPort() { - // TODO Auto-generated method stub - return null; - } - - @Override - public @Nullable Boolean isTcpOnly() { - // TODO Auto-generated method stub - return null; - } - - @Override - public @Nullable Protocol getProtocol() { - // TODO Auto-generated method stub - return null; - } - - @Override - public @Nullable Boolean isSchemaless() { - // TODO Auto-generated method stub - return null; - } - - @Override - public @Nullable YangModuleCapabilities getYangModuleCapabilities() { - // TODO Auto-generated method stub - return null; - } - - @Override - public @Nullable NonModuleCapabilities getNonModuleCapabilities() { - // TODO Auto-generated method stub - return null; - } - - @Override - public @Nullable Boolean isReconnectOnChangedSchema() { - // TODO Auto-generated method stub - return null; - } - - @Override - public @Nullable Uint32 getConnectionTimeoutMillis() { - // TODO Auto-generated method stub - return null; - } - - @Override - public @Nullable Uint32 getDefaultRequestTimeoutMillis() { - // TODO Auto-generated method stub - return null; - } - - @Override - public @Nullable Uint32 getMaxConnectionAttempts() { - // TODO Auto-generated method stub - return null; - } - - @Override - public @Nullable Uint16 getBetweenAttemptsTimeoutMillis() { - // TODO Auto-generated method stub - return null; - } - - @Override - public @Nullable BigDecimal getSleepFactor() { - // TODO Auto-generated method stub - return null; - } - - @Override - public @Nullable Uint32 getKeepaliveDelay() { - // TODO Auto-generated method stub - return null; - } - - @Override - public @Nullable Uint16 getConcurrentRpcLimit() { - // TODO Auto-generated method stub - return null; - } - - @Override - public @Nullable Uint16 getActorResponseWaitTime() { - // TODO Auto-generated method stub - return null; - } - - @Override - public @Nullable OdlHelloMessageCapabilities getOdlHelloMessageCapabilities() { - // TODO Auto-generated method stub - return null; - } - - @Override - public @Nullable ConnectionStatus getConnectionStatus() { - // TODO Auto-generated method stub - return null; - } - - @Override - public @Nullable ClusteredConnectionStatus getClusteredConnectionStatus() { - // TODO Auto-generated method stub - return null; - } - - @Override - public @Nullable String getConnectedMessage() { - // TODO Auto-generated method stub - return null; - } - - @Override - public @Nullable AvailableCapabilities getAvailableCapabilities() { - // TODO Auto-generated method stub - return null; - } - - @Override - public @Nullable UnavailableCapabilities getUnavailableCapabilities() { - // TODO Auto-generated method stub - return null; - } - - @Override - public @Nullable PassThrough getPassThrough() { - // TODO Auto-generated method stub - return null; - } - - @Override - public @Nullable String getSchemaCacheDirectory() { - // TODO Auto-generated method stub - return null; - } - - @Override - public @Nullable YangLibrary getYangLibrary() { - // TODO Auto-generated method stub - return null; - } - - @Override - public @Nullable IgnoreMissingSchemaSources getIgnoreMissingSchemaSources() { - // TODO Auto-generated method stub - return null; - } - - } - } -- cgit 1.2.3-korg