diff options
| author |   Ashlee Young <ashlee@onosfw.com> | 2015-10-19 10:14:31 -0700 |
|---|---|---|
| committer | Ashlee Young <ashlee@onosfw.com> | 2015-10-19 10:14:31 -0700 |
| commit | e9bb60be43af477f17b30ee1f2ba205565b7fa15 (patch) | |
| tree | 981fd759a44b751fc45cde774f46fda37c11c257 /framework/src/onos/providers | |
| parent | 74f3941756a1386cbc1fa99ee73fdc8376a0b6a0 (diff) | |
Updated onos src tree to commit id 1e60f97ae50c05b94fcb6a10520738bfb5efdfd1
Diffstat (limited to 'framework/src/onos/providers')
3 files changed, 2 insertions, 2 deletions
diff --git a/framework/src/onos/providers/netconf/app/pom.xml b/framework/src/onos/providers/netconf/app/pom.xml index dbd0a520..4a19ae8e 100644 --- a/framework/src/onos/providers/netconf/app/pom.xml +++ b/framework/src/onos/providers/netconf/app/pom.xml @@ -26,7 +26,7 @@ <relativePath>../pom.xml</relativePath> </parent> - <artifactId>onos-netconf</artifactId> + <artifactId>onos-netconf-app</artifactId> <packaging>pom</packaging> <description>NetConf protocol southbound providers</description> diff --git a/framework/src/onos/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java b/framework/src/onos/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java index 4fa961f8..329df20b 100644 --- a/framework/src/onos/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java +++ b/framework/src/onos/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java @@ -377,7 +377,6 @@ public class OpenFlowDeviceProvider extends AbstractProvider implements DevicePr public void receivedRoleReply(Dpid dpid, RoleState requested, RoleState response) { MastershipRole request = roleOf(requested); MastershipRole reply = roleOf(response); - providerService.receivedRoleReply(deviceId(uri(dpid)), request, reply); } diff --git a/framework/src/onos/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/NewAdaptiveFlowStatsCollector.java b/framework/src/onos/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/NewAdaptiveFlowStatsCollector.java index a81367cd..487cae96 100644 --- a/framework/src/onos/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/NewAdaptiveFlowStatsCollector.java +++ b/framework/src/onos/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/NewAdaptiveFlowStatsCollector.java @@ -492,6 +492,7 @@ public class NewAdaptiveFlowStatsCollector { /**
* returns flowMissingXid that indicates the execution of flowMissing process or not(NO_FLOW_MISSING_XID(-1)).
*
+ * @return xid of missing flow
*/
public long getFlowMissingXid() {
return flowMissingXid;
|