| commit | d84f89ba3d18fb8e9c44fa0bab004d24c56b0a81 | [log] [tgz] |
|---|---|---|
| author | Ray Milkey <ray@opennetworking.org> | Fri Aug 17 14:54:17 2018 -0700 |
| committer | Ray Milkey <ray@opennetworking.org> | Fri Sep 28 11:20:57 2018 -0700 |
| tree | 687aacc51f41941321d07f3a4ded68b68d7d813d | |
| parent | 10216e4129e46816826c7288287230d3236de03a [diff] |
[WIP] Upgrade ONOS to karaf version 4.2.1 Change-Id: I7cd40c995bdf1c80f94b1895fb3344e32404c7fa
diff --git a/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/cli/impl/NetconfGetCommand.java b/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/cli/impl/NetconfGetCommand.java index 2d29fcd..b20bedd 100644 --- a/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/cli/impl/NetconfGetCommand.java +++ b/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/cli/impl/NetconfGetCommand.java
@@ -49,7 +49,7 @@ long timeoutSec = 30; @Override - protected void execute() { + protected void doExecute() { DeviceId deviceId = DeviceId.deviceId(uri); NetconfController controller = get(NetconfController.class);
diff --git a/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/cli/impl/NetconfGetConfigCommand.java b/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/cli/impl/NetconfGetConfigCommand.java index 2aedaa9..6ef87ee 100644 --- a/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/cli/impl/NetconfGetConfigCommand.java +++ b/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/cli/impl/NetconfGetConfigCommand.java
@@ -58,7 +58,7 @@ private DeviceId deviceId; @Override - protected void execute() { + protected void doExecute() { deviceId = DeviceId.deviceId(uri); NetconfController controller = get(NetconfController.class);
diff --git a/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/cli/impl/NetconfRpcTestCommand.java b/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/cli/impl/NetconfRpcTestCommand.java index b994789..9a03a2a 100644 --- a/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/cli/impl/NetconfRpcTestCommand.java +++ b/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/cli/impl/NetconfRpcTestCommand.java
@@ -51,7 +51,7 @@ private DeviceId deviceId; @Override - protected void execute() { + protected void doExecute() { DriverService service = get(DriverService.class); deviceId = DeviceId.deviceId(uri); DriverHandler h = service.createHandler(deviceId);
diff --git a/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/cli/impl/NetconfSubscriptionTestCommand.java b/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/cli/impl/NetconfSubscriptionTestCommand.java index 226f789..56b9587 100644 --- a/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/cli/impl/NetconfSubscriptionTestCommand.java +++ b/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/cli/impl/NetconfSubscriptionTestCommand.java
@@ -46,7 +46,7 @@ @Override - protected void execute() { + protected void doExecute() { NetconfController controller = get(NetconfController.class); DeviceId did = DeviceId.deviceId(uri);