mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-22 12:51:09 +02:00
Code Issues Projects Releases Wiki Activity

Chaning IntentStore.isMaster to take a key

Browse Source 
Change-Id: I2d04a6aa7418e06137b0688bcb4e3af060a02b63
This commit is contained in:
Brian O'Connor 2015-02-19 21:44:37 -08:00
parent 7e6cfe305e
commit be28a87c0e
6 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/api/src/main/java/org/onosproject/net/intent/IntentService.java
View File

@ -82,6 +82,10 @@ public interface IntentService {
*/ */
List<Intent> getInstallableIntents(Key intentKey); List<Intent> getInstallableIntents(Key intentKey);
default boolean isLocal(Key intentKey) {
return true;
}
/** /**
* Adds the specified listener for intent events. * Adds the specified listener for intent events.
* *

4
core/api/src/main/java/org/onosproject/net/intent/IntentStore.java
View File

@ -106,11 +106,11 @@ public interface IntentStore extends Store<IntentEvent, IntentStoreDelegate> {
* Checks to see whether the calling instance is the master for processing * Checks to see whether the calling instance is the master for processing
* this intent, or more specifically, the key contained in this intent. * this intent, or more specifically, the key contained in this intent.
* *
* @param intent intent to check * @param intentKey intentKey to check
* @return true if master; false, otherwise * @return true if master; false, otherwise
*/ */
//TODO better name //TODO better name
default boolean isMaster(Intent intent) { //FIXME remove default when impl. default boolean isMaster(Key intentKey) { //FIXME remove default when impl.
return true; return true;
} }
} }

5
core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java
View File

@ -200,6 +200,11 @@ public class IntentManager
return store.getInstallableIntents(intentKey); return store.getInstallableIntents(intentKey);
} }
@Override
public boolean isLocal(Key intentKey) {
return store.isMaster(intentKey);
}
@Override @Override
public void addListener(IntentListener listener) { public void addListener(IntentListener listener) {
listenerRegistry.addListener(listener); listenerRegistry.addListener(listener);

6
core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java vendored
View File

@ -276,8 +276,8 @@ public class GossipIntentStore
} }
@Override @Override
public boolean isMaster(Intent intent) { public boolean isMaster(Key intentKey) {
return partitionService.isMine(intent.key()); return partitionService.isMine(intentKey);
} }
private void notifyDelegateIfNotNull(IntentEvent event) { private void notifyDelegateIfNotNull(IntentEvent event) {
@ -308,7 +308,7 @@ public class GossipIntentStore
// The pending intents map has been updated. If we are master for // The pending intents map has been updated. If we are master for
// this intent's partition, notify the Manager that it should do // this intent's partition, notify the Manager that it should do
// some work. // some work.
if (isMaster(event.value().intent())) { if (isMaster(event.value().intent().key())) {
if (delegate != null) { if (delegate != null) {
delegate.process(copyData(event.value())); delegate.process(copyData(event.value()));
} }

2
core/store/dist/src/main/java/org/onosproject/store/intent/impl/SimpleIntentStore.java vendored
View File

@ -252,7 +252,7 @@ public class SimpleIntentStore
} }
@Override @Override
public boolean isMaster(Intent intent) { public boolean isMaster(Key intentKey) {
return true; return true;
} }
} }

5
core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleIntentStore.java
View File

@ -124,9 +124,4 @@ public class SimpleIntentStore
notifyDelegate(IntentEvent.getEvent(data)); notifyDelegate(IntentEvent.getEvent(data));
} }
@Override
public boolean isMaster(Intent intent) {
return true;
}
} }