[ONOS-261] FlowRule entries are not removed accordingly after P2P Intents are removed - Jira

XML

Word

Printable

Details

Type: Bug
Status: Closed (View Workflow)
Priority: Major
Resolution: Done
Affects Version/s: 1.0.0
Fix Version/s: 1.1.0
Component/s: None
Labels:
None
Environment:

Hide

Topology: three nodes tree topology. H1-SW2-SW1-SW3-H3
P2P intent: SW2/1 to SW3/1
H2H Intent: H1 to H3
ONOS are configured as a two nodes clustering. SW1 SW2 and SW3 are connected to two ONOS nodes and the mastership are randomly selected.

compare with the master. following changes are made in order to test raft.

diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/intent/impl/DistributedIntentStore.java b/core/store/dist/src/main/java/org/onlab/onos/store/intent/impl/DistributedIntentStore.j
index 62bb77c..97381ac 100644
— a/core/store/dist/src/main/java/org/onlab/onos/store/intent/impl/DistributedIntentStore.java
+++ b/core/store/dist/src/main/java/org/onlab/onos/store/intent/impl/DistributedIntentStore.java
@@ -49,7 +49,7 @@ import static com.google.common.base.Verify.verify;
import static org.onlab.onos.net.intent.IntentState.*;
import static org.slf4j.LoggerFactory.getLogger;

-@Component(immediate = false, enabled = false)
+@Component(immediate = true, enabled = true)
@Service
public class DistributedIntentStore
extends AbstractStore<IntentEvent, IntentStoreDelegate>
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/intent/impl/HazelcastIntentStore.java b/core/store/dist/src/main/java/org/onlab/onos/store/intent/impl/HazelcastIntentStore.java
index 2f5d2e4..8c80a16 100644
— a/core/store/dist/src/main/java/org/onlab/onos/store/intent/impl/HazelcastIntentStore.java
+++ b/core/store/dist/src/main/java/org/onlab/onos/store/intent/impl/HazelcastIntentStore.java
@@ -49,7 +49,7 @@ import static com.google.common.base.Verify.verify;
import static org.onlab.onos.net.intent.IntentState.*;
import static org.slf4j.LoggerFactory.getLogger;

-@Component(immediate = true, enabled = true)
+@Component(immediate = true, enabled = false)
@Service
public class HazelcastIntentStore
extends AbstractHazelcastStore<IntentEvent, IntentStoreDelegate>
~

Show
Topology: three nodes tree topology. H1-SW2-SW1-SW3-H3 P2P intent: SW2/1 to SW3/1 H2H Intent: H1 to H3 ONOS are configured as a two nodes clustering. SW1 SW2 and SW3 are connected to two ONOS nodes and the mastership are randomly selected. compare with the master. following changes are made in order to test raft. diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/intent/impl/DistributedIntentStore.java b/core/store/dist/src/main/java/org/onlab/onos/store/intent/impl/DistributedIntentStore.j index 62bb77c..97381ac 100644 — a/core/store/dist/src/main/java/org/onlab/onos/store/intent/impl/DistributedIntentStore.java +++ b/core/store/dist/src/main/java/org/onlab/onos/store/intent/impl/DistributedIntentStore.java @@ -49,7 +49,7 @@ import static com.google.common.base.Verify.verify; import static org.onlab.onos.net.intent.IntentState.*; import static org.slf4j.LoggerFactory.getLogger; -@Component(immediate = false, enabled = false) +@Component(immediate = true, enabled = true) @Service public class DistributedIntentStore extends AbstractStore<IntentEvent, IntentStoreDelegate> diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/intent/impl/HazelcastIntentStore.java b/core/store/dist/src/main/java/org/onlab/onos/store/intent/impl/HazelcastIntentStore.java index 2f5d2e4..8c80a16 100644 — a/core/store/dist/src/main/java/org/onlab/onos/store/intent/impl/HazelcastIntentStore.java +++ b/core/store/dist/src/main/java/org/onlab/onos/store/intent/impl/HazelcastIntentStore.java @@ -49,7 +49,7 @@ import static com.google.common.base.Verify.verify; import static org.onlab.onos.net.intent.IntentState.*; import static org.slf4j.LoggerFactory.getLogger; -@Component(immediate = true, enabled = true) +@Component(immediate = true, enabled = false) @Service public class HazelcastIntentStore extends AbstractHazelcastStore<IntentEvent, IntentStoreDelegate> ~

Epic Link:
Northbound

Description

Intents are added OC1

intents are removed from OC2

following output are from OC2 console

onos> remove-
remove-intent remove-node
onos> remove-intent 0x
0x6e470ab8 0x6e470ad7 0x6e470e79 0x6e470e98 0x6e471278 0xfffffffffd232986
onos> remove-intent 0x6e470ad7
onos> intents
id=0x6e470ad7, state=WITHDRAWN, type=PointToPointIntent, appId=org.onlab.onos.cli
selector=[ETH_TYPE

{ethType=800}]
constraints=[LinkTypeConstraint{inclusive=false, types=[OPTICAL]}]
ingress=ConnectPoint{elementId=of:0000000000000002, portNumber=1}, egress=ConnectPoint{elementId=of:0000000000000003, portNumber=2}
id=0x6e471278, state=INSTALLED, type=PointToPointIntent, appId=org.onlab.onos.cli
selector=[ETH_TYPE{ethType=800}

]
constraints=[LinkTypeConstraint

{inclusive=false, types=[OPTICAL]}]
ingress=ConnectPoint{elementId=of:0000000000000002, portNumber=3}, egress=ConnectPoint{elementId=of:0000000000000003, portNumber=3}
id=0xfffffffffd232986, state=INSTALLED, type=HostToHostIntent, appId=org.onlab.onos.cli
constraints=[LinkTypeConstraint{inclusive=false, types=[OPTICAL]}

]
id=0x6e470e98, state=INSTALLED, type=PointToPointIntent, appId=org.onlab.onos.cli
selector=[ETH_TYPE

{ethType=800}]
constraints=[LinkTypeConstraint{inclusive=false, types=[OPTICAL]}]
ingress=ConnectPoint{elementId=of:0000000000000002, portNumber=2}, egress=ConnectPoint{elementId=of:0000000000000003, portNumber=2}
id=0x6e470ab8, state=INSTALLED, type=PointToPointIntent, appId=org.onlab.onos.cli
selector=[ETH_TYPE{ethType=800}

]
constraints=[LinkTypeConstraint

{inclusive=false, types=[OPTICAL]}]
ingress=ConnectPoint{elementId=of:0000000000000002, portNumber=1}, egress=ConnectPoint{elementId=of:0000000000000003, portNumber=1}
id=0x6e470e79, state=INSTALLED, type=PointToPointIntent, appId=org.onlab.onos.cli
selector=[ETH_TYPE{ethType=800}]
constraints=[LinkTypeConstraint{inclusive=false, types=[OPTICAL]}

]
ingress=ConnectPoint

{elementId=of:0000000000000002, portNumber=2}

, egress=ConnectPoint

{elementId=of:0000000000000003, portNumber=1}

onos> remove-
remove-intent remove-node
onos> remove-intent 0x6e471278
onos> remove-
remove-intent remove-node
onos> remove-intent 0x6e470e98
onos> intentys
Command not found: intentys
onos> intents
id=0x6e470ad7, state=WITHDRAWN, type=PointToPointIntent, appId=org.onlab.onos.cli
selector=[ETH_TYPE

{ethType=800}]
constraints=[LinkTypeConstraint{inclusive=false, types=[OPTICAL]}]
ingress=ConnectPoint{elementId=of:0000000000000002, portNumber=1}, egress=ConnectPoint{elementId=of:0000000000000003, portNumber=2}
id=0x6e471278, state=WITHDRAWN, type=PointToPointIntent, appId=org.onlab.onos.cli
selector=[ETH_TYPE{ethType=800}

]
constraints=[LinkTypeConstraint

]
id=0x6e470e98, state=WITHDRAWN, type=PointToPointIntent, appId=org.onlab.onos.cli
selector=[ETH_TYPE

]
constraints=[LinkTypeConstraint

]
ingress=ConnectPoint

{elementId=of:0000000000000002, portNumber=2}

, egress=ConnectPoint

{elementId=of:0000000000000003, portNumber=1}

onos> remove-
remove-intent remove-node
onos> remove-intent 0x6e470ab8
onos> remove-
remove-intent remove-node
onos> remove-intent 0x6e470e79
onos> intents
id=0x6e470ad7, state=WITHDRAWN, type=PointToPointIntent, appId=org.onlab.onos.cli
selector=[ETH_TYPE

{ethType=800}]
constraints=[LinkTypeConstraint{inclusive=false, types=[OPTICAL]}]
ingress=ConnectPoint{elementId=of:0000000000000002, portNumber=1}, egress=ConnectPoint{elementId=of:0000000000000003, portNumber=2}
id=0x6e471278, state=WITHDRAWN, type=PointToPointIntent, appId=org.onlab.onos.cli
selector=[ETH_TYPE{ethType=800}

]
constraints=[LinkTypeConstraint

]
id=0x6e470e98, state=WITHDRAWN, type=PointToPointIntent, appId=org.onlab.onos.cli
selector=[ETH_TYPE

{ethType=800}]
constraints=[LinkTypeConstraint{inclusive=false, types=[OPTICAL]}]
ingress=ConnectPoint{elementId=of:0000000000000002, portNumber=2}, egress=ConnectPoint{elementId=of:0000000000000003, portNumber=2}
id=0x6e470ab8, state=WITHDRAWN, type=PointToPointIntent, appId=org.onlab.onos.cli
selector=[ETH_TYPE{ethType=800}

]
constraints=[LinkTypeConstraint

{inclusive=false, types=[OPTICAL]}]
ingress=ConnectPoint{elementId=of:0000000000000002, portNumber=1}, egress=ConnectPoint{elementId=of:0000000000000003, portNumber=1}
id=0x6e470e79, state=WITHDRAWN, type=PointToPointIntent, appId=org.onlab.onos.cli
selector=[ETH_TYPE{ethType=800}]
constraints=[LinkTypeConstraint{inclusive=false, types=[OPTICAL]}

]
ingress=ConnectPoint

{elementId=of:0000000000000002, portNumber=2}

, egress=ConnectPoint

{elementId=of:0000000000000003, portNumber=1}

onos> flows
deviceId=of:0000000000000001, flowRuleCount=3
id=1000068c2e717, state=ADDED, bytes=17892, packets=182, duration=4169, priority=123, appId=org.onlab.onos.net.intent
selector=[IN_PORT

{port=1}, ETH_TYPE{ethType=800}]
treatment=[OUTPUT{port=2}]
id=10000f3d3d2b5, state=ADDED, bytes=630, packets=15, duration=2663, priority=123, appId=org.onlab.onos.net.intent
selector=[ETH_SRC{mac=0E:6E:9E:A7:A2:A4}, ETH_DST{mac=C2:C3:0F:E3:64:C8}, IN_PORT{port=1}

]
treatment=[OUTPUT

{port=2}]
id=10000f3d3d2d3, state=ADDED, bytes=8568, packets=96, duration=2663, priority=123, appId=org.onlab.onos.net.intent
selector=[ETH_SRC{mac=C2:C3:0F:E3:64:C8}, ETH_DST{mac=0E:6E:9E:A7:A2:A4}, IN_PORT{port=2}

]
treatment=[OUTPUT

{port=1}]
deviceId=of:0000000000000002, flowRuleCount=5
id=1000068c2ead9, state=ADDED, bytes=16912, packets=172, duration=3687, priority=123, appId=org.onlab.onos.net.intent
selector=[IN_PORT{port=1}

, ETH_TYPE

{ethType=800}]
treatment=[OUTPUT{port=3}]
id=1000068c2eaf8, state=ADDED, bytes=588, packets=6, duration=3668, priority=123, appId=org.onlab.onos.net.intent
selector=[IN_PORT{port=2}, ETH_TYPE{ethType=800}

]
treatment=[OUTPUT

{port=3}]
id=1000068c2eb17, state=ADDED, bytes=9506, packets=97, duration=4169, priority=123, appId=org.onlab.onos.net.intent
selector=[IN_PORT{port=3}

, ETH_TYPE

{ethType=800}]
treatment=[OUTPUT{port=3}]
id=10000f3d3d677, state=ADDED, bytes=630, packets=15, duration=2663, priority=123, appId=org.onlab.onos.net.intent
selector=[ETH_SRC{mac=0E:6E:9E:A7:A2:A4}, ETH_DST{mac=C2:C3:0F:E3:64:C8}, IN_PORT{port=1}]
treatment=[OUTPUT{port=3}]
id=10000f3d3d6b3, state=ADDED, bytes=630, packets=15, duration=2663, priority=123, appId=org.onlab.onos.net.intent
selector=[ETH_SRC{mac=C2:C3:0F:E3:64:C8}, ETH_DST{mac=0E:6E:9E:A7:A2:A4}, IN_PORT{port=3}]
treatment=[OUTPUT{port=1}]
deviceId=of:0000000000000003, flowRuleCount=5
id=1000068c2eed6, state=ADDED, bytes=0, packets=0, duration=2, priority=123, appId=org.onlab.onos.net.intent
selector=[IN_PORT{port=3}, ETH_TYPE{ethType=800}

]
treatment=[OUTPUT

{port=1}]
id=1000068c2eed7, state=ADDED, bytes=0, packets=0, duration=2, priority=123, appId=org.onlab.onos.net.intent
selector=[IN_PORT{port=3}, ETH_TYPE{ethType=800}]
treatment=[OUTPUT{port=2}]
id=1000068c2eed8, state=ADDED, bytes=0, packets=0, duration=2, priority=123, appId=org.onlab.onos.net.intent
selector=[IN_PORT{port=3}, ETH_TYPE{ethType=800}]
treatment=[OUTPUT{port=3}]
id=10000f3d3da38, state=ADDED, bytes=8568, packets=96, duration=2663, priority=123, appId=org.onlab.onos.net.intent
selector=[ETH_SRC{mac=C2:C3:0F:E3:64:C8}, ETH_DST{mac=0E:6E:9E:A7:A2:A4}, IN_PORT{port=1}

]
treatment=[OUTPUT

{port=3}]
id=10000f3d3da74, state=ADDED, bytes=630, packets=15, duration=2663, priority=123, appId=org.onlab.onos.net.intent
selector=[ETH_SRC{mac=0E:6E:9E:A7:A2:A4}, ETH_DST{mac=C2:C3:0F:E3:64:C8}, IN_PORT{port=3}

]
treatment=[OUTPUT

{port=1}]
onos> intents
id=0x6e470ad7, state=WITHDRAWN, type=PointToPointIntent, appId=org.onlab.onos.cli
selector=[ETH_TYPE{ethType=800}]
constraints=[LinkTypeConstraint{inclusive=false, types=[OPTICAL]}]
ingress=ConnectPoint{elementId=of:0000000000000002, portNumber=1}, egress=ConnectPoint{elementId=of:0000000000000003, portNumber=2}
id=0x6e471278, state=WITHDRAWN, type=PointToPointIntent, appId=org.onlab.onos.cli
selector=[ETH_TYPE{ethType=800}]
constraints=[LinkTypeConstraint{inclusive=false, types=[OPTICAL]}]
ingress=ConnectPoint{elementId=of:0000000000000002, portNumber=3}, egress=ConnectPoint{elementId=of:0000000000000003, portNumber=3}
id=0xfffffffffd232986, state=INSTALLED, type=HostToHostIntent, appId=org.onlab.onos.cli
constraints=[LinkTypeConstraint{inclusive=false, types=[OPTICAL]}]
id=0x6e470e98, state=WITHDRAWN, type=PointToPointIntent, appId=org.onlab.onos.cli
selector=[ETH_TYPE{ethType=800}]
constraints=[LinkTypeConstraint{inclusive=false, types=[OPTICAL]}]
ingress=ConnectPoint{elementId=of:0000000000000002, portNumber=2}, egress=ConnectPoint{elementId=of:0000000000000003, portNumber=2}
id=0x6e470ab8, state=WITHDRAWN, type=PointToPointIntent, appId=org.onlab.onos.cli
selector=[ETH_TYPE{ethType=800}]
constraints=[LinkTypeConstraint{inclusive=false, types=[OPTICAL]}]
ingress=ConnectPoint{elementId=of:0000000000000002, portNumber=1}, egress=ConnectPoint{elementId=of:0000000000000003, portNumber=1}
id=0x6e470e79, state=WITHDRAWN, type=PointToPointIntent, appId=org.onlab.onos.cli
selector=[ETH_TYPE{ethType=800}]
constraints=[LinkTypeConstraint{inclusive=false, types=[OPTICAL]}]
ingress=ConnectPoint{elementId=of:0000000000000002, portNumber=2}, egress=ConnectPoint{elementId=of:0000000000000003, portNumber=1}
onos> flows
deviceId=of:0000000000000001, flowRuleCount=3
id=1000068c2e717, state=ADDED, bytes=17892, packets=182, duration=4237, priority=123, appId=org.onlab.onos.net.intent
selector=[IN_PORT{port=1}

, ETH_TYPE

{ethType=800}]
treatment=[OUTPUT{port=2}]
id=10000f3d3d2b5, state=ADDED, bytes=630, packets=15, duration=2731, priority=123, appId=org.onlab.onos.net.intent
selector=[ETH_SRC{mac=0E:6E:9E:A7:A2:A4}, ETH_DST{mac=C2:C3:0F:E3:64:C8}, IN_PORT{port=1}]
treatment=[OUTPUT{port=2}]
id=10000f3d3d2d3, state=ADDED, bytes=8568, packets=96, duration=2731, priority=123, appId=org.onlab.onos.net.intent
selector=[ETH_SRC{mac=C2:C3:0F:E3:64:C8}, ETH_DST{mac=0E:6E:9E:A7:A2:A4}, IN_PORT{port=2}]
treatment=[OUTPUT{port=1}]
deviceId=of:0000000000000002, flowRuleCount=5
id=1000068c2ead9, state=ADDED, bytes=16912, packets=172, duration=3756, priority=123, appId=org.onlab.onos.net.intent
selector=[IN_PORT{port=1}, ETH_TYPE{ethType=800}

]
treatment=[OUTPUT

{port=3}]
id=1000068c2eaf8, state=ADDED, bytes=588, packets=6, duration=3737, priority=123, appId=org.onlab.onos.net.intent
selector=[IN_PORT{port=2}, ETH_TYPE{ethType=800}]
treatment=[OUTPUT{port=3}

]
id=1000068c2eb17, state=ADDED, bytes=9506, packets=97, duration=4237, priority=123, appId=org.onlab.onos.net.intent
selector=[IN_PORT

{port=3}, ETH_TYPE{ethType=800}]
treatment=[OUTPUT{port=3}

]
id=10000f3d3d677, state=ADDED, bytes=630, packets=15, duration=2731, priority=123, appId=org.onlab.onos.net.intent
selector=[ETH_SRC

{mac=0E:6E:9E:A7:A2:A4}

, ETH_DST

{mac=C2:C3:0F:E3:64:C8}

, IN_PORT

{port=1}]
treatment=[OUTPUT{port=3}]
id=10000f3d3d6b3, state=ADDED, bytes=630, packets=15, duration=2731, priority=123, appId=org.onlab.onos.net.intent
selector=[ETH_SRC{mac=C2:C3:0F:E3:64:C8}, ETH_DST{mac=0E:6E:9E:A7:A2:A4}, IN_PORT{port=3}]
treatment=[OUTPUT{port=1}

]
deviceId=of:0000000000000003, flowRuleCount=5
id=1000068c2eed6, state=ADDED, bytes=0, packets=0, duration=2, priority=123, appId=org.onlab.onos.net.intent
selector=[IN_PORT

{port=3}, ETH_TYPE{ethType=800}]
treatment=[OUTPUT{port=1}]
id=1000068c2eed7, state=ADDED, bytes=0, packets=0, duration=2, priority=123, appId=org.onlab.onos.net.intent
selector=[IN_PORT{port=3}

, ETH_TYPE

{ethType=800}]
treatment=[OUTPUT{port=2}]
id=1000068c2eed8, state=ADDED, bytes=0, packets=0, duration=2, priority=123, appId=org.onlab.onos.net.intent
selector=[IN_PORT{port=3}, ETH_TYPE{ethType=800}

]
treatment=[OUTPUT

{port=3}]
id=10000f3d3da38, state=ADDED, bytes=8568, packets=96, duration=2731, priority=123, appId=org.onlab.onos.net.intent
selector=[ETH_SRC{mac=C2:C3:0F:E3:64:C8}, ETH_DST{mac=0E:6E:9E:A7:A2:A4}, IN_PORT{port=1}]
treatment=[OUTPUT{port=3}

]
id=10000f3d3da74, state=ADDED, bytes=630, packets=15, duration=2731, priority=123, appId=org.onlab.onos.net.intent
selector=[ETH_SRC

{mac=0E:6E:9E:A7:A2:A4}

, ETH_DST

{mac=C2:C3:0F:E3:64:C8}

, IN_PORT

{port=3}

]
treatment=[OUTPUT

{port=1}

]

Attachments

Options
- Issue Only
- Show All Reviews
- Show Open Reviews
- Show All Issues
- Show Open Issues

Gerrit Reviews

No reviews matched the request. Check your Options in the drop-down menu of this sections header.

Activity

People

Assignee:: ash

Reporter:: Patrick Liu

Votes:: 0 Vote for this issue

Watchers:: 2 Start watching this issue

Dates

Created:: 21/Nov/14 5:12 PM

Updated:: 18/Mar/15 8:41 PM

Resolved:: 18/Mar/15 8:41 PM