mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2026-05-05 20:26:16 +02:00
Code Issues Projects Releases Wiki Activity

make netconf-get-config usable on any NETCONF device.

Browse Source 
- removed dependency to ConfigGetter

Change-Id: I00072625efc9ece327628f5034a845b0b96526f2
This commit is contained in:
Yuta HIGUCHI 2017-05-03 17:23:34 -07:00 committed by Yuta HIGUCHI
parent 55648edc74
commit d31bc6e6f6
3 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
protocols/netconf/api/src/main/java/org/onosproject/netconf/TargetConfig.java
View File

@ -16,6 +16,9 @@
package org.onosproject.netconf;
// TODO Revisit if we this class should be Enum.
// According to NETCONF RFC,
// various additional configuration datastores may be defined by capabilities.
public enum TargetConfig {
RUNNING("running"),
CANDIDATE("candidate"),

44
protocols/netconf/ctl/src/main/java/org/onosproject/netconf/cli/impl/NetconfConfigGetCommand.java
View File

@ -15,24 +15,23 @@
*/
package org.onosproject.netconf.cli.impl;
import static com.google.common.base.Preconditions.checkNotNull;
import java.io.IOException;
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;
import org.onosproject.netconf.NetconfController;
import org.onosproject.netconf.NetconfDevice;
import org.onosproject.netconf.NetconfSession;
import org.onosproject.netconf.TargetConfig;
/**
* 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.
*/
//FIXME Remove dependency to ConfigGetter.
@Command(scope = "onos", name = "netconf-get-config",
description = "Gets the configuration of the specified type from the" +
"specified device.")
@ -52,11 +51,30 @@ public class NetconfConfigGetCommand extends AbstractShellCommand {
@Override
protected void execute() {
DriverService service = get(DriverService.class);
deviceId = DeviceId.deviceId(uri);
DriverHandler h = service.createHandler(deviceId);
ConfigGetter config = h.behaviour(ConfigGetter.class);
print(config.getConfiguration(cfgType));
NetconfController controller = get(NetconfController.class);
checkNotNull(controller, "Netconf controller is null");
NetconfDevice device = controller.getDevicesMap().get(deviceId);
if (device == null) {
print("Netconf device object not found for %s", deviceId);
return;
}
NetconfSession session = device.getSession();
if (session == null) {
print("Netconf session not found for %s", deviceId);
return;
}
try {
String res = session.getConfig(TargetConfig.toTargetConfig(cfgType));
print("%s", res);
} catch (IOException e) {
log.error("Configuration could not be retrieved", e);
print("Error occured retrieving configuration");
}
}
}

2
protocols/netconf/ctl/src/main/java/org/onosproject/netconf/cli/impl/NetconfSubscriptionTestCommand.java
View File

@ -52,7 +52,7 @@ public class NetconfSubscriptionTestCommand extends AbstractShellCommand {
NetconfDevice netconfDevice = controller.getNetconfDevice(did);
if (netconfDevice == null) {
print("%s not found or not connectoed to this node", did);
print("%s not found or not connected to this node", did);
return;
}