Deprecating all SNMP releated classes. not compliant with ONOS architecture
Change-Id: Ia2a4953ea68d88e510689a3131398fc003194c1e
diff --git a/providers/snmp/alarm/src/main/java/org/onosproject/provider/snmp/alarm/impl/Bti7000SnmpAlarmProvider.java b/providers/snmp/alarm/src/main/java/org/onosproject/provider/snmp/alarm/impl/Bti7000SnmpAlarmProvider.java
index 9b74334..8618dc6 100644
--- a/providers/snmp/alarm/src/main/java/org/onosproject/provider/snmp/alarm/impl/Bti7000SnmpAlarmProvider.java
+++ b/providers/snmp/alarm/src/main/java/org/onosproject/provider/snmp/alarm/impl/Bti7000SnmpAlarmProvider.java
@@ -43,7 +43,9 @@
/**
* BTI 7000 specific implementation to provide a list of current alarms.
+ * @deprecated 1.5.0 Falcon, not compliant with ONOS SB and driver architecture.
*/
+@Deprecated
public class Bti7000SnmpAlarmProvider implements SnmpDeviceAlarmProvider {
private final Logger log = getLogger(getClass());
protected static final IClassRegistry CLASS_REGISTRY = new ClassRegistry(_OidRegistry.oidRegistry, I_Device.class);
diff --git a/providers/snmp/alarm/src/main/java/org/onosproject/provider/snmp/alarm/impl/NetSnmpAlarmProvider.java b/providers/snmp/alarm/src/main/java/org/onosproject/provider/snmp/alarm/impl/NetSnmpAlarmProvider.java
index 9940d6e..a3ce386 100644
--- a/providers/snmp/alarm/src/main/java/org/onosproject/provider/snmp/alarm/impl/NetSnmpAlarmProvider.java
+++ b/providers/snmp/alarm/src/main/java/org/onosproject/provider/snmp/alarm/impl/NetSnmpAlarmProvider.java
@@ -36,7 +36,9 @@
/**
* Net SNMP specific implementation to provide a list of current alarms.
+ * @deprecated 1.5.0 Falcon, not compliant with ONOS SB and driver architecture.
*/
+@Deprecated
public class NetSnmpAlarmProvider implements SnmpDeviceAlarmProvider {
private final Logger log = getLogger(getClass());
protected static final IClassRegistry CLASS_REGISTRY =
diff --git a/providers/snmp/alarm/src/main/java/org/onosproject/provider/snmp/alarm/impl/SnmpAlarmProviderService.java b/providers/snmp/alarm/src/main/java/org/onosproject/provider/snmp/alarm/impl/SnmpAlarmProviderService.java
index 8fb9ea0..01781f2 100644
--- a/providers/snmp/alarm/src/main/java/org/onosproject/provider/snmp/alarm/impl/SnmpAlarmProviderService.java
+++ b/providers/snmp/alarm/src/main/java/org/onosproject/provider/snmp/alarm/impl/SnmpAlarmProviderService.java
@@ -60,7 +60,9 @@
/**
* SNMP alarms provider.
+ * @deprecated 1.5.0 Falcon, not compliant with ONOS SB and driver architecture.
*/
+@Deprecated
@Component(immediate = true)
@Service
public class SnmpAlarmProviderService extends AbstractProvider implements AlarmProvider {
@@ -87,6 +89,7 @@
// TODO Could be replaced with a service lookup, and bundles per device variant.
Map<String, SnmpDeviceAlarmProvider> providers = new HashMap<>();
+ @Deprecated
public SnmpAlarmProviderService() {
super(new ProviderId("snmp", "org.onosproject.provider.alarm"));
log.info("SnmpAlarmProviderService ...");
diff --git a/providers/snmp/alarm/src/main/java/org/onosproject/provider/snmp/alarm/impl/SnmpDeviceAlarmProvider.java b/providers/snmp/alarm/src/main/java/org/onosproject/provider/snmp/alarm/impl/SnmpDeviceAlarmProvider.java
index ef6678a..0bb1b0f 100644
--- a/providers/snmp/alarm/src/main/java/org/onosproject/provider/snmp/alarm/impl/SnmpDeviceAlarmProvider.java
+++ b/providers/snmp/alarm/src/main/java/org/onosproject/provider/snmp/alarm/impl/SnmpDeviceAlarmProvider.java
@@ -18,13 +18,19 @@
import org.onosproject.incubator.net.faultmanagement.alarm.Alarm;
import org.onosproject.net.DeviceId;
+/**
+ * @deprecated 1.5.0 Falcon, not compliant with ONOS SB and driver architecture.
+ */
+@Deprecated
public interface SnmpDeviceAlarmProvider {
/**
* Implemented by device specific implementations which query the current
* alarms from a device.
+ * @deprecated 1.5.0 Falcon
* @param snmpSession SNMP Session
* @param deviceId device identifier
* @return device alarms
*/
+ @Deprecated
Collection<Alarm> getAlarms(ISnmpSession snmpSession, DeviceId deviceId);
}
diff --git a/providers/snmp/device/src/main/java/org/onosproject/provider/snmp/device/impl/Bti7000DeviceDescriptionProvider.java b/providers/snmp/device/src/main/java/org/onosproject/provider/snmp/device/impl/Bti7000DeviceDescriptionProvider.java
index d779e0a..b47b534 100644
--- a/providers/snmp/device/src/main/java/org/onosproject/provider/snmp/device/impl/Bti7000DeviceDescriptionProvider.java
+++ b/providers/snmp/device/src/main/java/org/onosproject/provider/snmp/device/impl/Bti7000DeviceDescriptionProvider.java
@@ -29,7 +29,9 @@
/**
* A vendor-specific implementation supporting BTI Systems BTI-7000 equipment.
+ * @deprecated 1.5.0 Falcon, not compliant with ONOS SB and driver architecture.
*/
+@Deprecated
public class Bti7000DeviceDescriptionProvider implements SnmpDeviceDescriptionProvider {
private final Logger log = getLogger(getClass());
protected static final IClassRegistry CLASS_REGISTRY =
diff --git a/providers/snmp/device/src/main/java/org/onosproject/provider/snmp/device/impl/NetSnmpDeviceDescriptionProvider.java b/providers/snmp/device/src/main/java/org/onosproject/provider/snmp/device/impl/NetSnmpDeviceDescriptionProvider.java
index 5e6689a..1d9c7ff 100644
--- a/providers/snmp/device/src/main/java/org/onosproject/provider/snmp/device/impl/NetSnmpDeviceDescriptionProvider.java
+++ b/providers/snmp/device/src/main/java/org/onosproject/provider/snmp/device/impl/NetSnmpDeviceDescriptionProvider.java
@@ -30,7 +30,9 @@
/**
* A agent-specific implementation supporting NET-SNMP agents.
+ * @deprecated 1.5.0 Falcon, not compliant with ONOS SB and driver architecture.
*/
+@Deprecated
public class NetSnmpDeviceDescriptionProvider implements SnmpDeviceDescriptionProvider {
private final Logger log = getLogger(getClass());
protected static final IClassRegistry CLASS_REGISTRY =
diff --git a/providers/snmp/device/src/main/java/org/onosproject/provider/snmp/device/impl/SnmpDeviceDescriptionProvider.java b/providers/snmp/device/src/main/java/org/onosproject/provider/snmp/device/impl/SnmpDeviceDescriptionProvider.java
index 4be3a35..5167a44 100644
--- a/providers/snmp/device/src/main/java/org/onosproject/provider/snmp/device/impl/SnmpDeviceDescriptionProvider.java
+++ b/providers/snmp/device/src/main/java/org/onosproject/provider/snmp/device/impl/SnmpDeviceDescriptionProvider.java
@@ -18,16 +18,19 @@
/**
* Abstraction of an entity which updates a device description with information retrieved via SNMP.
+ * @deprecated 1.5.0 Falcon, not compliant with ONOS SB and driver architecture.
*/
+@Deprecated
public interface SnmpDeviceDescriptionProvider {
/**
* Generated an updated device description.
- *
+ * @deprecated 1.5.0 Falcon
* @param session SNMP session
* @param description old device description
* @return new updated description
*/
+ @Deprecated
DeviceDescription populateDescription(ISnmpSession session, DeviceDescription description);
}
diff --git a/providers/snmp/device/src/main/java/org/onosproject/provider/snmp/device/impl/SnmpDeviceProvider.java b/providers/snmp/device/src/main/java/org/onosproject/provider/snmp/device/impl/SnmpDeviceProvider.java
index c2e7f14..51e5fd1 100644
--- a/providers/snmp/device/src/main/java/org/onosproject/provider/snmp/device/impl/SnmpDeviceProvider.java
+++ b/providers/snmp/device/src/main/java/org/onosproject/provider/snmp/device/impl/SnmpDeviceProvider.java
@@ -117,6 +117,7 @@
super(new ProviderId("snmp", "org.onosproject.provider.device"));
sessionFactory = new SnmpSessionFactory(
new DefaultSnmpConfigurationFactory(new V2cSnmpConfiguration()));
+ //TODO refactor, no hardcoding in provider, device information should be in drivers
providers.put("1.3.6.1.4.1.18070.2.2", new Bti7000DeviceDescriptionProvider());
providers.put("1.3.6.1.4.1.20408", new NetSnmpDeviceDescriptionProvider());
}
@@ -362,7 +363,10 @@
+ (device != null ? device.deviceInfo() : null), e);
}
}
-
+ /**
+ * @deprecated 1.5.0 Falcon, not compliant with ONOS SB and driver architecture.
+ */
+ @Deprecated
private DeviceDescription populateDescriptionFromDevice(DeviceId did, DeviceDescription desc) {
String[] deviceComponents = did.toString().split(":");
if (deviceComponents.length > 1) {