From f9879c5f6a45df709843c3ccd35b0bcb60a5dd2d Mon Sep 17 00:00:00 2001 From: Thomas Vachuska Date: Fri, 15 Jan 2016 11:12:19 -0800 Subject: [PATCH] Marking ConfigProvider as deprecated. Change-Id: I875f6cfe8bca1e080d39a5bcc18154c9c03b3d41 --- tools/test/bin/onos-topo-cfg | 2 ++ tools/test/bin/onos-topo-cfg-all | 2 ++ .../java/org/onosproject/rest/resources/ConfigProvider.java | 3 +++ 3 files changed, 7 insertions(+) diff --git a/tools/test/bin/onos-topo-cfg b/tools/test/bin/onos-topo-cfg index 489083f782..64a66c9d75 100755 --- a/tools/test/bin/onos-topo-cfg +++ b/tools/test/bin/onos-topo-cfg @@ -6,6 +6,8 @@ [ ! -d "$ONOS_ROOT" ] && echo "ONOS_ROOT is not defined" >&2 && exit 1 . $ONOS_ROOT/tools/build/envDefaults +echo "This facility has been deprecated and will be removed in 1.6.0 (Goldeneye) release!!!" + node="${1:-$OCI}" file="${2:-$ONOS_ROOT/tools/test/topos/oe-linear-3.json}" url="${3:-config/topology}" diff --git a/tools/test/bin/onos-topo-cfg-all b/tools/test/bin/onos-topo-cfg-all index adf84c14df..033dfbdaa1 100755 --- a/tools/test/bin/onos-topo-cfg-all +++ b/tools/test/bin/onos-topo-cfg-all @@ -6,6 +6,8 @@ [ ! -d "$ONOS_ROOT" ] && echo "ONOS_ROOT is not defined" >&2 && exit 1 . $ONOS_ROOT/tools/build/envDefaults +echo "This facility has been deprecated and will be removed in 1.6.0 (Goldeneye) release!!!" + nodes=$(env | sort | egrep "OC[0-9]+" | cut -d= -f2) for node in $nodes; do diff --git a/web/api/src/main/java/org/onosproject/rest/resources/ConfigProvider.java b/web/api/src/main/java/org/onosproject/rest/resources/ConfigProvider.java index 67929cf1d5..2775c2e986 100644 --- a/web/api/src/main/java/org/onosproject/rest/resources/ConfigProvider.java +++ b/web/api/src/main/java/org/onosproject/rest/resources/ConfigProvider.java @@ -91,7 +91,10 @@ import static org.onosproject.net.device.DeviceEvent.Type.DEVICE_AVAILABILITY_CH /** * Provider of devices and links parsed from a JSON configuration structure. + * + * @deprecated in 1.5.0 (Falcon) */ +@Deprecated class ConfigProvider implements DeviceProvider, LinkProvider, HostProvider { private final Logger log = LoggerFactory.getLogger(getClass());