commit | 0db1f3b7dee3b748e07ada98ef77f931a7ecc948 | [log] [tgz] |
---|---|---|
author | Yi Tseng <a86487817@gmail.com> | Thu May 25 10:08:06 2017 -0700 |
committer | Ray Milkey <ray@onlab.us> | Thu May 25 20:29:03 2017 +0000 |
tree | 9ff81cf0e8990d72cf16284b88f2963e9eba98ba | |
parent | 872c9824468bcfb9bb1230c8fd57aed6a631a515 [diff] [blame] |
[ONOS-6481] Fix Intent resource release issue Lables for encapsulation won't release because Intent manager release the resources by Intent key only. Allocate encapsulation labels by using Intent key instead of Intent Id to resolve this problem. Change-Id: I8fd52245063ded725e4b2c3911f52c029591ab90
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/LinkCollectionIntentObjectiveCompiler.java b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/LinkCollectionIntentObjectiveCompiler.java index 5bd90c3..2e46669 100644 --- a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/LinkCollectionIntentObjectiveCompiler.java +++ b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/LinkCollectionIntentObjectiveCompiler.java
@@ -117,7 +117,7 @@ if (encapConstraint.isPresent()) { labels = labelAllocator.assignLabelToPorts(intent.links(), - intent.id(), + intent.key(), encapConstraint.get().encapType()); }