Committed by
Gerrit Code Review
Rename OFDPA pipeline according to the naming convention
Change-Id: Ia7709aded0c20cf556031a723a986b9baca3ffa8
Showing
5 changed files
with
28 additions
and
28 deletions
... | @@ -70,7 +70,7 @@ import org.slf4j.Logger; | ... | @@ -70,7 +70,7 @@ import org.slf4j.Logger; |
70 | * the cpqd switch when MPLS is required. As a result this driver works only | 70 | * the cpqd switch when MPLS is required. As a result this driver works only |
71 | * on incoming untagged packets. | 71 | * on incoming untagged packets. |
72 | */ | 72 | */ |
73 | -public class CpqdOFDPA2Pipeline extends OFDPA2Pipeline { | 73 | +public class CpqdOfdpa2Pipeline extends Ofdpa2Pipeline { |
74 | 74 | ||
75 | private final Logger log = getLogger(getClass()); | 75 | private final Logger log = getLogger(getClass()); |
76 | 76 | ... | ... |
... | @@ -59,7 +59,7 @@ import org.slf4j.Logger; | ... | @@ -59,7 +59,7 @@ import org.slf4j.Logger; |
59 | * packets. | 59 | * packets. |
60 | * | 60 | * |
61 | */ | 61 | */ |
62 | -public class CpqdOFDPA2VlanPipeline extends CpqdOFDPA2Pipeline { | 62 | +public class CpqdOfdpa2VlanPipeline extends CpqdOfdpa2Pipeline { |
63 | 63 | ||
64 | private final Logger log = getLogger(getClass()); | 64 | private final Logger log = getLogger(getClass()); |
65 | 65 | ... | ... |
... | @@ -63,7 +63,7 @@ import static org.slf4j.LoggerFactory.getLogger; | ... | @@ -63,7 +63,7 @@ import static org.slf4j.LoggerFactory.getLogger; |
63 | /** | 63 | /** |
64 | * Group handler for OFDPA2 pipeline. | 64 | * Group handler for OFDPA2 pipeline. |
65 | */ | 65 | */ |
66 | -public class OFDPA2GroupHandler { | 66 | +public class Ofdpa2GroupHandler { |
67 | /* | 67 | /* |
68 | * OFDPA requires group-id's to have a certain form. | 68 | * OFDPA requires group-id's to have a certain form. |
69 | * L2 Interface Groups have <4bits-0><12bits-vlanid><16bits-portid> | 69 | * L2 Interface Groups have <4bits-0><12bits-vlanid><16bits-portid> |
... | @@ -126,7 +126,7 @@ public class OFDPA2GroupHandler { | ... | @@ -126,7 +126,7 @@ public class OFDPA2GroupHandler { |
126 | RemovalNotification<GroupKey, List<OfdpaNextGroup>> notification) -> { | 126 | RemovalNotification<GroupKey, List<OfdpaNextGroup>> notification) -> { |
127 | if (notification.getCause() == RemovalCause.EXPIRED) { | 127 | if (notification.getCause() == RemovalCause.EXPIRED) { |
128 | notification.getValue().forEach(ofdpaNextGrp -> | 128 | notification.getValue().forEach(ofdpaNextGrp -> |
129 | - OFDPA2Pipeline.fail(ofdpaNextGrp.nextObj, | 129 | + Ofdpa2Pipeline.fail(ofdpaNextGrp.nextObj, |
130 | ObjectiveError.GROUPINSTALLATIONFAILED)); | 130 | ObjectiveError.GROUPINSTALLATIONFAILED)); |
131 | 131 | ||
132 | } | 132 | } |
... | @@ -149,7 +149,7 @@ public class OFDPA2GroupHandler { | ... | @@ -149,7 +149,7 @@ public class OFDPA2GroupHandler { |
149 | log.error("Next Objectives of type Simple should only have a " | 149 | log.error("Next Objectives of type Simple should only have a " |
150 | + "single Traffic Treatment. Next Objective Id:{}", | 150 | + "single Traffic Treatment. Next Objective Id:{}", |
151 | nextObjective.id()); | 151 | nextObjective.id()); |
152 | - OFDPA2Pipeline.fail(nextObjective, ObjectiveError.BADPARAMS); | 152 | + Ofdpa2Pipeline.fail(nextObjective, ObjectiveError.BADPARAMS); |
153 | return; | 153 | return; |
154 | } | 154 | } |
155 | processSimpleNextObjective(nextObjective); | 155 | processSimpleNextObjective(nextObjective); |
... | @@ -161,11 +161,11 @@ public class OFDPA2GroupHandler { | ... | @@ -161,11 +161,11 @@ public class OFDPA2GroupHandler { |
161 | processHashedNextObjective(nextObjective); | 161 | processHashedNextObjective(nextObjective); |
162 | break; | 162 | break; |
163 | case FAILOVER: | 163 | case FAILOVER: |
164 | - OFDPA2Pipeline.fail(nextObjective, ObjectiveError.UNSUPPORTED); | 164 | + Ofdpa2Pipeline.fail(nextObjective, ObjectiveError.UNSUPPORTED); |
165 | log.warn("Unsupported next objective type {}", nextObjective.type()); | 165 | log.warn("Unsupported next objective type {}", nextObjective.type()); |
166 | break; | 166 | break; |
167 | default: | 167 | default: |
168 | - OFDPA2Pipeline.fail(nextObjective, ObjectiveError.UNKNOWN); | 168 | + Ofdpa2Pipeline.fail(nextObjective, ObjectiveError.UNKNOWN); |
169 | log.warn("Unknown next objective type {}", nextObjective.type()); | 169 | log.warn("Unknown next objective type {}", nextObjective.type()); |
170 | } | 170 | } |
171 | } | 171 | } |
... | @@ -267,7 +267,7 @@ public class OFDPA2GroupHandler { | ... | @@ -267,7 +267,7 @@ public class OFDPA2GroupHandler { |
267 | // but different for the same portnumber on different devices. Also different | 267 | // but different for the same portnumber on different devices. Also different |
268 | // for the various group-types created out of the same next objective. | 268 | // for the various group-types created out of the same next objective. |
269 | int l2gk = l2InterfaceGroupKey(deviceId, vlanId, portNum.toLong()); | 269 | int l2gk = l2InterfaceGroupKey(deviceId, vlanId, portNum.toLong()); |
270 | - final GroupKey l2groupkey = new DefaultGroupKey(OFDPA2Pipeline.appKryo.serialize(l2gk)); | 270 | + final GroupKey l2groupkey = new DefaultGroupKey(Ofdpa2Pipeline.appKryo.serialize(l2gk)); |
271 | 271 | ||
272 | // create group description for the l2interfacegroup | 272 | // create group description for the l2interfacegroup |
273 | GroupBucket l2interfaceGroupBucket = | 273 | GroupBucket l2interfaceGroupBucket = |
... | @@ -399,7 +399,7 @@ public class OFDPA2GroupHandler { | ... | @@ -399,7 +399,7 @@ public class OFDPA2GroupHandler { |
399 | // but different for the same portnumber on different devices. Also different | 399 | // but different for the same portnumber on different devices. Also different |
400 | // for the various group-types created out of the same next objective. | 400 | // for the various group-types created out of the same next objective. |
401 | int l2gk = l2InterfaceGroupKey(deviceId, vlanid, portNum); | 401 | int l2gk = l2InterfaceGroupKey(deviceId, vlanid, portNum); |
402 | - final GroupKey l2groupkey = new DefaultGroupKey(OFDPA2Pipeline.appKryo.serialize(l2gk)); | 402 | + final GroupKey l2groupkey = new DefaultGroupKey(Ofdpa2Pipeline.appKryo.serialize(l2gk)); |
403 | 403 | ||
404 | // assemble information for outer group | 404 | // assemble information for outer group |
405 | GroupDescription outerGrpDesc = null; | 405 | GroupDescription outerGrpDesc = null; |
... | @@ -408,7 +408,7 @@ public class OFDPA2GroupHandler { | ... | @@ -408,7 +408,7 @@ public class OFDPA2GroupHandler { |
408 | int mplsInterfaceIndex = getNextAvailableIndex(); | 408 | int mplsInterfaceIndex = getNextAvailableIndex(); |
409 | int mplsgroupId = MPLS_INTERFACE_TYPE | (SUBTYPE_MASK & mplsInterfaceIndex); | 409 | int mplsgroupId = MPLS_INTERFACE_TYPE | (SUBTYPE_MASK & mplsInterfaceIndex); |
410 | final GroupKey mplsgroupkey = new DefaultGroupKey( | 410 | final GroupKey mplsgroupkey = new DefaultGroupKey( |
411 | - OFDPA2Pipeline.appKryo.serialize(mplsInterfaceIndex)); | 411 | + Ofdpa2Pipeline.appKryo.serialize(mplsInterfaceIndex)); |
412 | outerTtb.group(new DefaultGroupId(l2groupId)); | 412 | outerTtb.group(new DefaultGroupId(l2groupId)); |
413 | // create the mpls-interface group description to wait for the | 413 | // create the mpls-interface group description to wait for the |
414 | // l2 interface group to be processed | 414 | // l2 interface group to be processed |
... | @@ -430,7 +430,7 @@ public class OFDPA2GroupHandler { | ... | @@ -430,7 +430,7 @@ public class OFDPA2GroupHandler { |
430 | int l3unicastIndex = getNextAvailableIndex(); | 430 | int l3unicastIndex = getNextAvailableIndex(); |
431 | int l3groupId = L3_UNICAST_TYPE | (TYPE_MASK & l3unicastIndex); | 431 | int l3groupId = L3_UNICAST_TYPE | (TYPE_MASK & l3unicastIndex); |
432 | final GroupKey l3groupkey = new DefaultGroupKey( | 432 | final GroupKey l3groupkey = new DefaultGroupKey( |
433 | - OFDPA2Pipeline.appKryo.serialize(l3unicastIndex)); | 433 | + Ofdpa2Pipeline.appKryo.serialize(l3unicastIndex)); |
434 | outerTtb.group(new DefaultGroupId(l2groupId)); | 434 | outerTtb.group(new DefaultGroupId(l2groupId)); |
435 | // create the l3unicast group description to wait for the | 435 | // create the l3unicast group description to wait for the |
436 | // l2 interface group to be processed | 436 | // l2 interface group to be processed |
... | @@ -520,7 +520,7 @@ public class OFDPA2GroupHandler { | ... | @@ -520,7 +520,7 @@ public class OFDPA2GroupHandler { |
520 | 520 | ||
521 | // assemble info for l2 interface group | 521 | // assemble info for l2 interface group |
522 | int l2gk = l2InterfaceGroupKey(deviceId, vlanId, portNum.toLong()); | 522 | int l2gk = l2InterfaceGroupKey(deviceId, vlanId, portNum.toLong()); |
523 | - final GroupKey l2groupkey = new DefaultGroupKey(OFDPA2Pipeline.appKryo.serialize(l2gk)); | 523 | + final GroupKey l2groupkey = new DefaultGroupKey(Ofdpa2Pipeline.appKryo.serialize(l2gk)); |
524 | int l2groupId = L2_INTERFACE_TYPE | (vlanId.toShort() << 16) | | 524 | int l2groupId = L2_INTERFACE_TYPE | (vlanId.toShort() << 16) | |
525 | (int) portNum.toLong(); | 525 | (int) portNum.toLong(); |
526 | GroupBucket l2interfaceGroupBucket = | 526 | GroupBucket l2interfaceGroupBucket = |
... | @@ -550,7 +550,7 @@ public class OFDPA2GroupHandler { | ... | @@ -550,7 +550,7 @@ public class OFDPA2GroupHandler { |
550 | // since there can be only one flood group for a vlan, its index is always the same - 0 | 550 | // since there can be only one flood group for a vlan, its index is always the same - 0 |
551 | Integer l2floodgroupId = L2_FLOOD_TYPE | (vlanId.toShort() << 16); | 551 | Integer l2floodgroupId = L2_FLOOD_TYPE | (vlanId.toShort() << 16); |
552 | int l2floodgk = getNextAvailableIndex(); | 552 | int l2floodgk = getNextAvailableIndex(); |
553 | - final GroupKey l2floodgroupkey = new DefaultGroupKey(OFDPA2Pipeline.appKryo.serialize(l2floodgk)); | 553 | + final GroupKey l2floodgroupkey = new DefaultGroupKey(Ofdpa2Pipeline.appKryo.serialize(l2floodgk)); |
554 | // collection of group buckets pointing to all the l2 interface groups | 554 | // collection of group buckets pointing to all the l2 interface groups |
555 | List<GroupBucket> l2floodBuckets = new ArrayList<>(); | 555 | List<GroupBucket> l2floodBuckets = new ArrayList<>(); |
556 | for (GroupDescription l2intGrpDesc : l2interfaceGroupDescs) { | 556 | for (GroupDescription l2intGrpDesc : l2interfaceGroupDescs) { |
... | @@ -627,7 +627,7 @@ public class OFDPA2GroupHandler { | ... | @@ -627,7 +627,7 @@ public class OFDPA2GroupHandler { |
627 | int l3ecmpIndex = getNextAvailableIndex(); | 627 | int l3ecmpIndex = getNextAvailableIndex(); |
628 | int l3ecmpGroupId = L3_ECMP_TYPE | (TYPE_MASK & l3ecmpIndex); | 628 | int l3ecmpGroupId = L3_ECMP_TYPE | (TYPE_MASK & l3ecmpIndex); |
629 | GroupKey l3ecmpGroupKey = new DefaultGroupKey( | 629 | GroupKey l3ecmpGroupKey = new DefaultGroupKey( |
630 | - OFDPA2Pipeline.appKryo.serialize(l3ecmpIndex)); | 630 | + Ofdpa2Pipeline.appKryo.serialize(l3ecmpIndex)); |
631 | GroupDescription l3ecmpGroupDesc = | 631 | GroupDescription l3ecmpGroupDesc = |
632 | new DefaultGroupDescription( | 632 | new DefaultGroupDescription( |
633 | deviceId, | 633 | deviceId, |
... | @@ -738,7 +738,7 @@ public class OFDPA2GroupHandler { | ... | @@ -738,7 +738,7 @@ public class OFDPA2GroupHandler { |
738 | int l3vpnIndex = getNextAvailableIndex(); | 738 | int l3vpnIndex = getNextAvailableIndex(); |
739 | int l3vpngroupId = MPLS_L3VPN_SUBTYPE | (SUBTYPE_MASK & l3vpnIndex); | 739 | int l3vpngroupId = MPLS_L3VPN_SUBTYPE | (SUBTYPE_MASK & l3vpnIndex); |
740 | GroupKey l3vpngroupkey = new DefaultGroupKey( | 740 | GroupKey l3vpngroupkey = new DefaultGroupKey( |
741 | - OFDPA2Pipeline.appKryo.serialize(l3vpnIndex)); | 741 | + Ofdpa2Pipeline.appKryo.serialize(l3vpnIndex)); |
742 | GroupDescription l3vpnGroupDesc = | 742 | GroupDescription l3vpnGroupDesc = |
743 | new DefaultGroupDescription( | 743 | new DefaultGroupDescription( |
744 | deviceId, | 744 | deviceId, |
... | @@ -810,7 +810,7 @@ public class OFDPA2GroupHandler { | ... | @@ -810,7 +810,7 @@ public class OFDPA2GroupHandler { |
810 | 810 | ||
811 | // recreate the original L3 ECMP group id and description | 811 | // recreate the original L3 ECMP group id and description |
812 | int l3ecmpGroupId = L3_ECMP_TYPE | nextObjective.id() << 12; | 812 | int l3ecmpGroupId = L3_ECMP_TYPE | nextObjective.id() << 12; |
813 | - GroupKey l3ecmpGroupKey = new DefaultGroupKey(OFDPA2Pipeline.appKryo.serialize(l3ecmpGroupId)); | 813 | + GroupKey l3ecmpGroupKey = new DefaultGroupKey(Ofdpa2Pipeline.appKryo.serialize(l3ecmpGroupId)); |
814 | 814 | ||
815 | // Although GroupDescriptions are not necessary for adding buckets to | 815 | // Although GroupDescriptions are not necessary for adding buckets to |
816 | // existing groups, we use one in the GroupChainElem. When the latter is | 816 | // existing groups, we use one in the GroupChainElem. When the latter is |
... | @@ -829,7 +829,7 @@ public class OFDPA2GroupHandler { | ... | @@ -829,7 +829,7 @@ public class OFDPA2GroupHandler { |
829 | // don't need to update pendingNextObjectives -- group already exists | 829 | // don't need to update pendingNextObjectives -- group already exists |
830 | Deque<GroupKey> newBucketChain = allGroupKeys.get(0); | 830 | Deque<GroupKey> newBucketChain = allGroupKeys.get(0); |
831 | newBucketChain.addFirst(l3ecmpGroupKey); | 831 | newBucketChain.addFirst(l3ecmpGroupKey); |
832 | - List<Deque<GroupKey>> allOriginalKeys = OFDPA2Pipeline.appKryo.deserialize(next.data()); | 832 | + List<Deque<GroupKey>> allOriginalKeys = Ofdpa2Pipeline.appKryo.deserialize(next.data()); |
833 | allOriginalKeys.add(newBucketChain); | 833 | allOriginalKeys.add(newBucketChain); |
834 | flowObjectiveStore.putNextGroup(nextObjective.id(), | 834 | flowObjectiveStore.putNextGroup(nextObjective.id(), |
835 | new OfdpaNextGroup(allOriginalKeys, nextObjective)); | 835 | new OfdpaNextGroup(allOriginalKeys, nextObjective)); |
... | @@ -875,7 +875,7 @@ public class OFDPA2GroupHandler { | ... | @@ -875,7 +875,7 @@ public class OFDPA2GroupHandler { |
875 | return; | 875 | return; |
876 | } | 876 | } |
877 | 877 | ||
878 | - List<Deque<GroupKey>> allgkeys = OFDPA2Pipeline.appKryo.deserialize(next.data()); | 878 | + List<Deque<GroupKey>> allgkeys = Ofdpa2Pipeline.appKryo.deserialize(next.data()); |
879 | Deque<GroupKey> foundChain = null; | 879 | Deque<GroupKey> foundChain = null; |
880 | int index = 0; | 880 | int index = 0; |
881 | for (Deque<GroupKey> gkeys : allgkeys) { | 881 | for (Deque<GroupKey> gkeys : allgkeys) { |
... | @@ -946,7 +946,7 @@ public class OFDPA2GroupHandler { | ... | @@ -946,7 +946,7 @@ public class OFDPA2GroupHandler { |
946 | * this next objective | 946 | * this next objective |
947 | */ | 947 | */ |
948 | protected void removeGroup(NextObjective nextObjective, NextGroup next) { | 948 | protected void removeGroup(NextObjective nextObjective, NextGroup next) { |
949 | - List<Deque<GroupKey>> allgkeys = OFDPA2Pipeline.appKryo.deserialize(next.data()); | 949 | + List<Deque<GroupKey>> allgkeys = Ofdpa2Pipeline.appKryo.deserialize(next.data()); |
950 | allgkeys.forEach(groupChain -> groupChain.forEach(groupKey -> | 950 | allgkeys.forEach(groupChain -> groupChain.forEach(groupKey -> |
951 | groupService.removeGroup(deviceId, groupKey, nextObjective.appId()))); | 951 | groupService.removeGroup(deviceId, groupKey, nextObjective.appId()))); |
952 | flowObjectiveStore.removeNextGroup(nextObjective.id()); | 952 | flowObjectiveStore.removeNextGroup(nextObjective.id()); |
... | @@ -1059,7 +1059,7 @@ public class OFDPA2GroupHandler { | ... | @@ -1059,7 +1059,7 @@ public class OFDPA2GroupHandler { |
1059 | key, deviceId, nextGrp.nextObjective().id(), | 1059 | key, deviceId, nextGrp.nextObjective().id(), |
1060 | Integer.toHexString(groupService.getGroup(deviceId, key) | 1060 | Integer.toHexString(groupService.getGroup(deviceId, key) |
1061 | .givenGroupId())); | 1061 | .givenGroupId())); |
1062 | - OFDPA2Pipeline.pass(nextGrp.nextObjective()); | 1062 | + Ofdpa2Pipeline.pass(nextGrp.nextObjective()); |
1063 | flowObjectiveStore.putNextGroup(nextGrp.nextObjective().id(), nextGrp); | 1063 | flowObjectiveStore.putNextGroup(nextGrp.nextObjective().id(), nextGrp); |
1064 | // check if addBuckets waiting for this completion | 1064 | // check if addBuckets waiting for this completion |
1065 | NextObjective pendBkt = pendingBuckets | 1065 | NextObjective pendBkt = pendingBuckets |
... | @@ -1153,7 +1153,7 @@ public class OFDPA2GroupHandler { | ... | @@ -1153,7 +1153,7 @@ public class OFDPA2GroupHandler { |
1153 | 1153 | ||
1154 | @Override | 1154 | @Override |
1155 | public byte[] data() { | 1155 | public byte[] data() { |
1156 | - return OFDPA2Pipeline.appKryo.serialize(gkeys); | 1156 | + return Ofdpa2Pipeline.appKryo.serialize(gkeys); |
1157 | } | 1157 | } |
1158 | } | 1158 | } |
1159 | 1159 | ... | ... |
... | @@ -89,7 +89,7 @@ import org.slf4j.Logger; | ... | @@ -89,7 +89,7 @@ import org.slf4j.Logger; |
89 | * Driver for Broadcom's OF-DPA v2.0 TTP. | 89 | * Driver for Broadcom's OF-DPA v2.0 TTP. |
90 | * | 90 | * |
91 | */ | 91 | */ |
92 | -public class OFDPA2Pipeline extends AbstractHandlerBehaviour implements Pipeliner { | 92 | +public class Ofdpa2Pipeline extends AbstractHandlerBehaviour implements Pipeliner { |
93 | protected static final int PORT_TABLE = 0; | 93 | protected static final int PORT_TABLE = 0; |
94 | protected static final int VLAN_TABLE = 10; | 94 | protected static final int VLAN_TABLE = 10; |
95 | protected static final int TMAC_TABLE = 20; | 95 | protected static final int TMAC_TABLE = 20; |
... | @@ -119,12 +119,12 @@ public class OFDPA2Pipeline extends AbstractHandlerBehaviour implements Pipeline | ... | @@ -119,12 +119,12 @@ public class OFDPA2Pipeline extends AbstractHandlerBehaviour implements Pipeline |
119 | .register(KryoNamespaces.API) | 119 | .register(KryoNamespaces.API) |
120 | .register(GroupKey.class) | 120 | .register(GroupKey.class) |
121 | .register(DefaultGroupKey.class) | 121 | .register(DefaultGroupKey.class) |
122 | - .register(OFDPA2GroupHandler.OfdpaNextGroup.class) | 122 | + .register(Ofdpa2GroupHandler.OfdpaNextGroup.class) |
123 | .register(byte[].class) | 123 | .register(byte[].class) |
124 | .register(ArrayDeque.class) | 124 | .register(ArrayDeque.class) |
125 | .build(); | 125 | .build(); |
126 | 126 | ||
127 | - protected OFDPA2GroupHandler ofdpa2GroupHandler; | 127 | + protected Ofdpa2GroupHandler ofdpa2GroupHandler; |
128 | 128 | ||
129 | protected Set<IPCriterion> sentIpFilters = Collections.newSetFromMap( | 129 | protected Set<IPCriterion> sentIpFilters = Collections.newSetFromMap( |
130 | new ConcurrentHashMap<>()); | 130 | new ConcurrentHashMap<>()); |
... | @@ -135,7 +135,7 @@ public class OFDPA2Pipeline extends AbstractHandlerBehaviour implements Pipeline | ... | @@ -135,7 +135,7 @@ public class OFDPA2Pipeline extends AbstractHandlerBehaviour implements Pipeline |
135 | this.deviceId = deviceId; | 135 | this.deviceId = deviceId; |
136 | 136 | ||
137 | // Initialize OFDPA group handler | 137 | // Initialize OFDPA group handler |
138 | - ofdpa2GroupHandler = new OFDPA2GroupHandler(); | 138 | + ofdpa2GroupHandler = new Ofdpa2GroupHandler(); |
139 | ofdpa2GroupHandler.init(deviceId, context); | 139 | ofdpa2GroupHandler.init(deviceId, context); |
140 | 140 | ||
141 | coreService = serviceDirectory.get(CoreService.class); | 141 | coreService = serviceDirectory.get(CoreService.class); | ... | ... |
... | @@ -91,7 +91,7 @@ | ... | @@ -91,7 +91,7 @@ |
91 | <driver name="ofdpa" extends="default" | 91 | <driver name="ofdpa" extends="default" |
92 | manufacturer="Broadcom Corp." hwVersion="OF-DPA.*" swVersion="OF-DPA.*"> | 92 | manufacturer="Broadcom Corp." hwVersion="OF-DPA.*" swVersion="OF-DPA.*"> |
93 | <behaviour api="org.onosproject.net.behaviour.Pipeliner" | 93 | <behaviour api="org.onosproject.net.behaviour.Pipeliner" |
94 | - impl="org.onosproject.driver.pipeline.OFDPA2Pipeline"/> | 94 | + impl="org.onosproject.driver.pipeline.Ofdpa2Pipeline"/> |
95 | <behaviour api="org.onosproject.openflow.controller.ExtensionTreatmentInterpreter" | 95 | <behaviour api="org.onosproject.openflow.controller.ExtensionTreatmentInterpreter" |
96 | impl="org.onosproject.driver.extensions.OfdpaExtensionTreatmentInterpreter" /> | 96 | impl="org.onosproject.driver.extensions.OfdpaExtensionTreatmentInterpreter" /> |
97 | <behaviour api="org.onosproject.net.behaviour.ExtensionTreatmentResolver" | 97 | <behaviour api="org.onosproject.net.behaviour.ExtensionTreatmentResolver" |
... | @@ -153,7 +153,7 @@ | ... | @@ -153,7 +153,7 @@ |
153 | manufacturer="ONF" | 153 | manufacturer="ONF" |
154 | hwVersion="OF1.3 Software Switch from CPqD" swVersion="for Group Chaining"> | 154 | hwVersion="OF1.3 Software Switch from CPqD" swVersion="for Group Chaining"> |
155 | <behaviour api="org.onosproject.net.behaviour.Pipeliner" | 155 | <behaviour api="org.onosproject.net.behaviour.Pipeliner" |
156 | - impl="org.onosproject.driver.pipeline.CpqdOFDPA2Pipeline"/> | 156 | + impl="org.onosproject.driver.pipeline.CpqdOfdpa2Pipeline"/> |
157 | </driver> | 157 | </driver> |
158 | <!-- Emulation of the ofdpa pipeline using a CPqD OF 1.3 software switch. | 158 | <!-- Emulation of the ofdpa pipeline using a CPqD OF 1.3 software switch. |
159 | ~ Use this driver when VLAN functionality is required. | 159 | ~ Use this driver when VLAN functionality is required. |
... | @@ -163,7 +163,7 @@ | ... | @@ -163,7 +163,7 @@ |
163 | manufacturer="ONF" | 163 | manufacturer="ONF" |
164 | hwVersion="OF1.3 Software Switch from CPqD" swVersion="for Group Chaining"> | 164 | hwVersion="OF1.3 Software Switch from CPqD" swVersion="for Group Chaining"> |
165 | <behaviour api="org.onosproject.net.behaviour.Pipeliner" | 165 | <behaviour api="org.onosproject.net.behaviour.Pipeliner" |
166 | - impl="org.onosproject.driver.pipeline.CpqdOFDPA2VlanPipeline"/> | 166 | + impl="org.onosproject.driver.pipeline.CpqdOfdpa2VlanPipeline"/> |
167 | </driver> | 167 | </driver> |
168 | <driver name="calient" extends="default" | 168 | <driver name="calient" extends="default" |
169 | manufacturer="calient technologies inc" hwVersion="calient hardware.*" | 169 | manufacturer="calient technologies inc" hwVersion="calient hardware.*" | ... | ... |
-
Please register or login to post a comment