Remove deprecated DeviceConfig CLI commands
Change-Id: Id644d6d2bb63f49e7028a9d6f1653dc510669d4b
diff --git a/cli/src/main/java/org/onosproject/cli/net/DeviceConfigGetterCommand.java b/cli/src/main/java/org/onosproject/cli/net/DeviceConfigGetterCommand.java
deleted file mode 100644
index 754d475..0000000
--- a/cli/src/main/java/org/onosproject/cli/net/DeviceConfigGetterCommand.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2016-present Open Networking Foundation
- *
- * 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.
- */
-package org.onosproject.cli.net;
-
-import org.apache.karaf.shell.commands.Argument;
-import org.apache.karaf.shell.commands.Command;
-import org.onosproject.cli.AbstractShellCommand;
-import org.onosproject.net.DeviceId;
-import org.onosproject.net.behaviour.ConfigGetter;
-import org.onosproject.net.driver.DriverHandler;
-import org.onosproject.net.driver.DriverService;
-
-/**
- * Command that gets the configuration of the specified type from the specified
- * device. If configuration cannot be retrieved it prints an error string.
- *
- * This is a temporary development tool for use until yang integration is complete.
- * This uses a not properly specified behavior. DO NOT USE AS AN EXAMPLE.
- *
- * @deprecated in 1.10.0
- */
-
-//FIXME this should eventually be removed.
-@Deprecated
-@Command(scope = "onos", name = "device-configuration",
- description = "[Deprecated]Gets the configuration of the specified type from the" +
- "specified device.")
-public class DeviceConfigGetterCommand extends AbstractShellCommand {
-
- @Argument(index = 0, name = "uri", description = "Device ID",
- required = true, multiValued = false)
- String uri = null;
- @Argument(index = 1, name = "cfgType", description = "Configuration type",
- required = true, multiValued = false)
- String cfgType = null;
- private DeviceId deviceId;
-
- @Override
- protected void execute() {
- print("[WARN] This command was marked deprecated in 1.10.0");
- DriverService service = get(DriverService.class);
- deviceId = DeviceId.deviceId(uri);
- DriverHandler h = service.createHandler(deviceId);
- ConfigGetter config = h.behaviour(ConfigGetter.class);
- print(config.getConfiguration(cfgType));
- }
-
-}
diff --git a/cli/src/main/java/org/onosproject/cli/net/DeviceConfigSetterCommand.java b/cli/src/main/java/org/onosproject/cli/net/DeviceConfigSetterCommand.java
deleted file mode 100644
index 4213e07..0000000
--- a/cli/src/main/java/org/onosproject/cli/net/DeviceConfigSetterCommand.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2016-present Open Networking Foundation
- *
- * 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.
- */
-package org.onosproject.cli.net;
-
-import org.apache.karaf.shell.commands.Argument;
-import org.apache.karaf.shell.commands.Command;
-import org.onosproject.cli.AbstractShellCommand;
-import org.onosproject.net.DeviceId;
-import org.onosproject.net.behaviour.ConfigSetter;
-import org.onosproject.net.driver.DriverHandler;
-import org.onosproject.net.driver.DriverService;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-/**
- * Command that sets the configuration included in the specified file to the
- * specified device. It prints the response of the device.
- *
- * This is a temporary development tool for use until yang integration is complete.
- * This uses a not properly specified behavior. DO NOT USE AS AN EXAMPLE.
- *
- * @deprecated in 1.10.0
- */
-//Temporary Developer tool, NOT TO BE USED in production or as example for
-// future commands.
-//FIXME this should eventually be removed.
-@Deprecated
-@Command(scope = "onos", name = "device-setconfiguration",
- description = "[Deprecated]Sets the configuration of the specified file to the " +
- "specified device.")
-public class DeviceConfigSetterCommand extends AbstractShellCommand {
-
- @Argument(index = 0, name = "uri", description = "Device ID",
- required = true, multiValued = false)
- private String uri = null;
- @Argument(index = 1, name = "cfgFile", description = "Configuration file",
- required = true, multiValued = false)
- private String cfgFile = null;
- private DeviceId deviceId;
-
- @Override
- protected void execute() {
- print("[WARN] This command was marked deprecated in 1.10.0");
- DriverService service = get(DriverService.class);
- deviceId = DeviceId.deviceId(uri);
- DriverHandler h = service.createHandler(deviceId);
- ConfigSetter config = h.behaviour(ConfigSetter.class);
- checkNotNull(cfgFile, "Configuration file cannot be null");
- print(config.setConfiguration(cfgFile));
- }
-
-}
diff --git a/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml b/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
index 3829be2..00ecdee 100644
--- a/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
+++ b/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
@@ -166,20 +166,6 @@
</completers>
</command>
<command>
- <action class="org.onosproject.cli.net.DeviceConfigGetterCommand"/>
- <completers>
- <ref component-id="deviceIdCompleter"/>
- <null/>
- </completers>
- </command>
- <command>
- <action class="org.onosproject.cli.net.DeviceConfigSetterCommand"/>
- <completers>
- <ref component-id="deviceIdCompleter"/>
- <null/>
- </completers>
- </command>
- <command>
<action class="org.onosproject.cli.net.DeviceRemoveCommand"/>
<completers>
<ref component-id="deviceIdCompleter"/>