mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1 | /* |
| 2 | * Copyright 2020-present Open Networking Foundation |
| 3 | * |
| 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | * you may not use this file except in compliance with the License. |
| 6 | * You may obtain a copy of the License at |
| 7 | * |
| 8 | * http://www.apache.org/licenses/LICENSE-2.0 |
| 9 | * |
| 10 | * Unless required by applicable law or agreed to in writing, software |
| 11 | * distributed under the License is distributed on an "AS IS" BASIS, |
| 12 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. |
| 15 | */ |
| 16 | |
| 17 | //Package adaptercoreonu provides the utility for onu devices, flows and statistics |
| 18 | package adaptercoreonu |
| 19 | |
| 20 | import ( |
| 21 | "context" |
| 22 | "encoding/binary" |
Andrea Campanella | 6515c58 | 2020-10-05 11:25:00 +0200 | [diff] [blame] | 23 | "fmt" |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 24 | "net" |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 25 | "strconv" |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 26 | "sync" |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 27 | "time" |
| 28 | |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 29 | gp "github.com/google/gopacket" |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 30 | "github.com/looplab/fsm" |
| 31 | "github.com/opencord/omci-lib-go" |
| 32 | me "github.com/opencord/omci-lib-go/generated" |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 33 | "github.com/opencord/voltha-lib-go/v4/pkg/log" |
| 34 | of "github.com/opencord/voltha-protos/v4/go/openflow_13" |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 35 | ) |
| 36 | |
| 37 | const ( |
| 38 | // internal predefined values |
mpagenko | f1fc386 | 2021-02-16 10:09:52 +0000 | [diff] [blame] | 39 | cWaitForCookieDeletion = 3 //seconds |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 40 | cDefaultDownstreamMode = 0 |
| 41 | cDefaultTpid = 0x8100 |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 42 | cVtfdTableSize = 12 //as per G.988 |
| 43 | cMaxAllowedFlows = cVtfdTableSize //which might be under discussion, for the moment connected to limit of VLAN's within VTFD |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 44 | ) |
| 45 | |
| 46 | const ( |
mpagenko | f1fc386 | 2021-02-16 10:09:52 +0000 | [diff] [blame] | 47 | // internal offsets for requestEvent according to definition in onu_device_entry::OnuDeviceEvent |
| 48 | cDeviceEventOffsetAddWithKvStore = 0 //OmciVlanFilterAddDone - OmciVlanFilterAddDone cannot use because of lint |
| 49 | cDeviceEventOffsetAddNoKvStore = OmciVlanFilterAddDoneNoKvStore - OmciVlanFilterAddDone |
| 50 | cDeviceEventOffsetRemoveWithKvStore = OmciVlanFilterRemDone - OmciVlanFilterAddDone |
| 51 | cDeviceEventOffsetRemoveNoKvStore = OmciVlanFilterRemDoneNoKvStore - OmciVlanFilterAddDone |
| 52 | ) |
| 53 | |
| 54 | const ( |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 55 | // bit mask offsets for EVTOCD VlanTaggingOperationTable related to 32 bits (4 bytes) |
| 56 | cFilterPrioOffset = 28 |
| 57 | cFilterVidOffset = 15 |
| 58 | cFilterTpidOffset = 12 |
| 59 | cFilterEtherTypeOffset = 0 |
| 60 | cTreatTTROffset = 30 |
| 61 | cTreatPrioOffset = 16 |
| 62 | cTreatVidOffset = 3 |
| 63 | cTreatTpidOffset = 0 |
| 64 | ) |
| 65 | const ( |
| 66 | // byte offsets for EVTOCD VlanTaggingOperationTable related to overall 16 byte size with slice byte 0 as first Byte (MSB) |
| 67 | cFilterOuterOffset = 0 |
| 68 | cFilterInnerOffset = 4 |
| 69 | cTreatOuterOffset = 8 |
| 70 | cTreatInnerOffset = 12 |
| 71 | ) |
| 72 | const ( |
| 73 | // basic values used within EVTOCD VlanTaggingOperationTable in respect to their bitfields |
| 74 | cPrioIgnoreTag uint32 = 15 |
| 75 | cPrioDefaultFilter uint32 = 14 |
| 76 | cPrioDoNotFilter uint32 = 8 |
| 77 | cDoNotFilterVid uint32 = 4096 |
| 78 | cDoNotFilterTPID uint32 = 0 |
| 79 | cDoNotFilterEtherType uint32 = 0 |
| 80 | cDoNotAddPrio uint32 = 15 |
| 81 | cCopyPrioFromInner uint32 = 8 |
Himani Chawla | 4d90833 | 2020-08-31 12:30:20 +0530 | [diff] [blame] | 82 | //cDontCarePrio uint32 = 0 |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 83 | cDontCareVid uint32 = 0 |
| 84 | cDontCareTpid uint32 = 0 |
| 85 | cSetOutputTpidCopyDei uint32 = 4 |
| 86 | ) |
| 87 | |
| 88 | const ( |
Holger Hildebrandt | 10d9819 | 2021-01-27 15:29:31 +0000 | [diff] [blame] | 89 | // events of config UNI port VLAN FSM |
mpagenko | 535d6ef | 2021-02-26 13:15:34 +0000 | [diff] [blame] | 90 | vlanEvStart = "vlanEvStart" |
| 91 | vlanEvWaitTechProf = "vlanEvWaitTechProf" |
| 92 | vlanEvCancelOutstandingConfig = "vlanEvCancelOutstandingConfig" |
| 93 | vlanEvContinueConfig = "vlanEvContinueConfig" |
| 94 | vlanEvStartConfig = "vlanEvStartConfig" |
| 95 | vlanEvRxConfigVtfd = "vlanEvRxConfigVtfd" |
| 96 | vlanEvRxConfigEvtocd = "vlanEvRxConfigEvtocd" |
| 97 | vlanEvWaitTPIncr = "vlanEvWaitTPIncr" |
| 98 | vlanEvIncrFlowConfig = "vlanEvIncrFlowConfig" |
| 99 | vlanEvRenew = "vlanEvRenew" |
| 100 | vlanEvRemFlowConfig = "vlanEvRemFlowConfig" |
| 101 | vlanEvRemFlowDone = "vlanEvRemFlowDone" |
| 102 | vlanEvFlowDataRemoved = "vlanEvFlowDataRemoved" |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 103 | //vlanEvTimeoutSimple = "vlanEvTimeoutSimple" |
| 104 | //vlanEvTimeoutMids = "vlanEvTimeoutMids" |
Holger Hildebrandt | be52384 | 2021-03-10 10:47:18 +0000 | [diff] [blame] | 105 | vlanEvReset = "vlanEvReset" |
| 106 | vlanEvRestart = "vlanEvRestart" |
| 107 | vlanEvSkipOmciConfig = "vlanEvSkipOmciConfig" |
| 108 | vlanEvSkipIncFlowConfig = "vlanEvSkipIncFlowConfig" |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 109 | ) |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 110 | |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 111 | const ( |
Holger Hildebrandt | 10d9819 | 2021-01-27 15:29:31 +0000 | [diff] [blame] | 112 | // states of config UNI port VLAN FSM |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 113 | vlanStDisabled = "vlanStDisabled" |
| 114 | vlanStStarting = "vlanStStarting" |
| 115 | vlanStWaitingTechProf = "vlanStWaitingTechProf" |
| 116 | vlanStConfigVtfd = "vlanStConfigVtfd" |
| 117 | vlanStConfigEvtocd = "vlanStConfigEvtocd" |
| 118 | vlanStConfigDone = "vlanStConfigDone" |
mpagenko | 551a4d4 | 2020-12-08 18:09:20 +0000 | [diff] [blame] | 119 | vlanStIncrFlowWaitTP = "vlanStIncrFlowWaitTP" |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 120 | vlanStConfigIncrFlow = "vlanStConfigIncrFlow" |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 121 | vlanStRemoveFlow = "vlanStRemoveFlow" |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 122 | vlanStCleanupDone = "vlanStCleanupDone" |
| 123 | vlanStResetting = "vlanStResetting" |
| 124 | ) |
mpagenko | f1fc386 | 2021-02-16 10:09:52 +0000 | [diff] [blame] | 125 | const cVlanFsmIdleState = vlanStConfigDone // state where no OMCI activity is done (for a longer time) |
| 126 | const cVlanFsmConfiguredState = vlanStConfigDone // state that indicates that at least some valid user related VLAN configuration should exist |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 127 | |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 128 | type uniVlanRuleParams struct { |
mpagenko | 551a4d4 | 2020-12-08 18:09:20 +0000 | [diff] [blame] | 129 | TpID uint8 `json:"tp_id"` |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 130 | MatchVid uint32 `json:"match_vid"` //use uint32 types for allowing immediate bitshifting |
| 131 | MatchPcp uint32 `json:"match_pcp"` |
| 132 | TagsToRemove uint32 `json:"tags_to_remove"` |
| 133 | SetVid uint32 `json:"set_vid"` |
| 134 | SetPcp uint32 `json:"set_pcp"` |
| 135 | } |
| 136 | |
| 137 | type uniVlanFlowParams struct { |
| 138 | CookieSlice []uint64 `json:"cookie_slice"` |
| 139 | VlanRuleParams uniVlanRuleParams `json:"vlan_rule_params"` |
| 140 | } |
| 141 | |
| 142 | type uniRemoveVlanFlowParams struct { |
| 143 | cookie uint64 //just the last cookie valid for removal |
| 144 | vlanRuleParams uniVlanRuleParams |
| 145 | } |
| 146 | |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 147 | //UniVlanConfigFsm defines the structure for the state machine to config the PON ANI ports of ONU UNI ports via OMCI |
| 148 | type UniVlanConfigFsm struct { |
Himani Chawla | 6d2ae15 | 2020-09-02 13:11:20 +0530 | [diff] [blame] | 149 | pDeviceHandler *deviceHandler |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 150 | deviceID string |
Himani Chawla | 6d2ae15 | 2020-09-02 13:11:20 +0530 | [diff] [blame] | 151 | pOmciCC *omciCC |
| 152 | pOnuUniPort *onuUniPort |
| 153 | pUniTechProf *onuUniTechProf |
| 154 | pOnuDB *onuDeviceDB |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 155 | requestEvent OnuDeviceEvent |
| 156 | omciMIdsResponseReceived chan bool //seperate channel needed for checking multiInstance OMCI message responses |
| 157 | pAdaptFsm *AdapterFsm |
| 158 | acceptIncrementalEvtoOption bool |
mpagenko | 2418ab0 | 2020-11-12 12:58:06 +0000 | [diff] [blame] | 159 | clearPersistency bool |
mpagenko | 7d6bb02 | 2021-03-11 15:07:55 +0000 | [diff] [blame] | 160 | isAwaitingResponse bool |
| 161 | mutexIsAwaitingResponse sync.RWMutex |
mpagenko | 551a4d4 | 2020-12-08 18:09:20 +0000 | [diff] [blame] | 162 | mutexFlowParams sync.RWMutex |
mpagenko | f1fc386 | 2021-02-16 10:09:52 +0000 | [diff] [blame] | 163 | chCookieDeleted chan bool //channel to indicate that a specificly indicated cookie was deleted |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 164 | actualUniVlanConfigRule uniVlanRuleParams |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 165 | uniVlanFlowParamsSlice []uniVlanFlowParams |
| 166 | uniRemoveFlowsSlice []uniRemoveVlanFlowParams |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 167 | numUniFlows uint8 // expected number of flows should be less than 12 |
| 168 | configuredUniFlow uint8 |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 169 | numRemoveFlows uint8 |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 170 | numVlanFilterEntries uint8 |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 171 | vlanFilterList [cVtfdTableSize]uint16 |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 172 | evtocdID uint16 |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 173 | pLastTxMeInstance *me.ManagedEntity |
mpagenko | fc4f56e | 2020-11-04 17:17:49 +0000 | [diff] [blame] | 174 | requestEventOffset uint8 |
mpagenko | 551a4d4 | 2020-12-08 18:09:20 +0000 | [diff] [blame] | 175 | TpIDWaitingFor uint8 |
mpagenko | f1fc386 | 2021-02-16 10:09:52 +0000 | [diff] [blame] | 176 | //cookie value that indicates that a rule to add is delayed by waiting for deletion of some other existing rule with the same cookie |
| 177 | delayNewRuleCookie uint64 |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 178 | } |
| 179 | |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 180 | //NewUniVlanConfigFsm is the 'constructor' for the state machine to config the PON ANI ports |
| 181 | // of ONU UNI ports via OMCI |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 182 | func NewUniVlanConfigFsm(ctx context.Context, apDeviceHandler *deviceHandler, apDevOmciCC *omciCC, apUniPort *onuUniPort, |
mpagenko | 551a4d4 | 2020-12-08 18:09:20 +0000 | [diff] [blame] | 183 | apUniTechProf *onuUniTechProf, apOnuDB *onuDeviceDB, aTechProfileID uint8, |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 184 | aRequestEvent OnuDeviceEvent, aName string, aCommChannel chan Message, aAcceptIncrementalEvto bool, |
| 185 | aCookieSlice []uint64, aMatchVlan uint16, aSetVlan uint16, aSetPcp uint8) *UniVlanConfigFsm { |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 186 | instFsm := &UniVlanConfigFsm{ |
| 187 | pDeviceHandler: apDeviceHandler, |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 188 | deviceID: apDeviceHandler.deviceID, |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 189 | pOmciCC: apDevOmciCC, |
| 190 | pOnuUniPort: apUniPort, |
| 191 | pUniTechProf: apUniTechProf, |
| 192 | pOnuDB: apOnuDB, |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 193 | requestEvent: aRequestEvent, |
| 194 | acceptIncrementalEvtoOption: aAcceptIncrementalEvto, |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 195 | numUniFlows: 0, |
| 196 | configuredUniFlow: 0, |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 197 | numRemoveFlows: 0, |
mpagenko | 2418ab0 | 2020-11-12 12:58:06 +0000 | [diff] [blame] | 198 | clearPersistency: true, |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 199 | } |
| 200 | |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 201 | instFsm.pAdaptFsm = NewAdapterFsm(aName, instFsm.deviceID, aCommChannel) |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 202 | if instFsm.pAdaptFsm == nil { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 203 | logger.Errorw(ctx, "UniVlanConfigFsm's AdapterFsm could not be instantiated!!", log.Fields{ |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 204 | "device-id": instFsm.deviceID}) |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 205 | return nil |
| 206 | } |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 207 | instFsm.pAdaptFsm.pFsm = fsm.NewFSM( |
| 208 | vlanStDisabled, |
| 209 | fsm.Events{ |
| 210 | {Name: vlanEvStart, Src: []string{vlanStDisabled}, Dst: vlanStStarting}, |
| 211 | {Name: vlanEvWaitTechProf, Src: []string{vlanStStarting}, Dst: vlanStWaitingTechProf}, |
mpagenko | 535d6ef | 2021-02-26 13:15:34 +0000 | [diff] [blame] | 212 | {Name: vlanEvCancelOutstandingConfig, Src: []string{vlanStWaitingTechProf}, Dst: vlanStConfigDone}, |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 213 | {Name: vlanEvContinueConfig, Src: []string{vlanStWaitingTechProf}, Dst: vlanStConfigVtfd}, |
| 214 | {Name: vlanEvStartConfig, Src: []string{vlanStStarting}, Dst: vlanStConfigVtfd}, |
| 215 | {Name: vlanEvRxConfigVtfd, Src: []string{vlanStConfigVtfd}, Dst: vlanStConfigEvtocd}, |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 216 | {Name: vlanEvRxConfigEvtocd, Src: []string{vlanStConfigEvtocd, vlanStConfigIncrFlow}, |
| 217 | Dst: vlanStConfigDone}, |
mpagenko | 551a4d4 | 2020-12-08 18:09:20 +0000 | [diff] [blame] | 218 | {Name: vlanEvRenew, Src: []string{vlanStConfigDone}, Dst: vlanStStarting}, |
| 219 | {Name: vlanEvWaitTPIncr, Src: []string{vlanStConfigDone}, Dst: vlanStIncrFlowWaitTP}, |
| 220 | {Name: vlanEvIncrFlowConfig, Src: []string{vlanStConfigDone, vlanStIncrFlowWaitTP}, |
| 221 | Dst: vlanStConfigIncrFlow}, |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 222 | {Name: vlanEvRemFlowConfig, Src: []string{vlanStConfigDone}, Dst: vlanStRemoveFlow}, |
| 223 | {Name: vlanEvRemFlowDone, Src: []string{vlanStRemoveFlow}, Dst: vlanStCleanupDone}, |
| 224 | {Name: vlanEvFlowDataRemoved, Src: []string{vlanStCleanupDone}, Dst: vlanStConfigDone}, |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 225 | /* |
| 226 | {Name: vlanEvTimeoutSimple, Src: []string{ |
| 227 | vlanStCreatingDot1PMapper, vlanStCreatingMBPCD, vlanStSettingTconts, vlanStSettingDot1PMapper}, Dst: vlanStStarting}, |
| 228 | {Name: vlanEvTimeoutMids, Src: []string{ |
| 229 | vlanStCreatingGemNCTPs, vlanStCreatingGemIWs, vlanStSettingPQs}, Dst: vlanStStarting}, |
| 230 | */ |
| 231 | // exceptional treatment for all states except vlanStResetting |
| 232 | {Name: vlanEvReset, Src: []string{vlanStStarting, vlanStWaitingTechProf, |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 233 | vlanStConfigVtfd, vlanStConfigEvtocd, vlanStConfigDone, vlanStConfigIncrFlow, |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 234 | vlanStRemoveFlow, vlanStCleanupDone}, |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 235 | Dst: vlanStResetting}, |
| 236 | // the only way to get to resource-cleared disabled state again is via "resseting" |
| 237 | {Name: vlanEvRestart, Src: []string{vlanStResetting}, Dst: vlanStDisabled}, |
Holger Hildebrandt | be52384 | 2021-03-10 10:47:18 +0000 | [diff] [blame] | 238 | // transitions for reconcile handling according to VOL-3834 |
| 239 | {Name: vlanEvSkipOmciConfig, Src: []string{vlanStStarting}, Dst: vlanStConfigDone}, |
| 240 | {Name: vlanEvSkipOmciConfig, Src: []string{vlanStConfigDone}, Dst: vlanStConfigIncrFlow}, |
| 241 | {Name: vlanEvSkipIncFlowConfig, Src: []string{vlanStConfigIncrFlow}, Dst: vlanStConfigDone}, |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 242 | }, |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 243 | fsm.Callbacks{ |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 244 | "enter_state": func(e *fsm.Event) { instFsm.pAdaptFsm.logFsmStateChange(ctx, e) }, |
| 245 | "enter_" + vlanStStarting: func(e *fsm.Event) { instFsm.enterConfigStarting(ctx, e) }, |
| 246 | "enter_" + vlanStConfigVtfd: func(e *fsm.Event) { instFsm.enterConfigVtfd(ctx, e) }, |
| 247 | "enter_" + vlanStConfigEvtocd: func(e *fsm.Event) { instFsm.enterConfigEvtocd(ctx, e) }, |
| 248 | "enter_" + vlanStConfigDone: func(e *fsm.Event) { instFsm.enterVlanConfigDone(ctx, e) }, |
| 249 | "enter_" + vlanStConfigIncrFlow: func(e *fsm.Event) { instFsm.enterConfigIncrFlow(ctx, e) }, |
| 250 | "enter_" + vlanStRemoveFlow: func(e *fsm.Event) { instFsm.enterRemoveFlow(ctx, e) }, |
| 251 | "enter_" + vlanStCleanupDone: func(e *fsm.Event) { instFsm.enterVlanCleanupDone(ctx, e) }, |
| 252 | "enter_" + vlanStResetting: func(e *fsm.Event) { instFsm.enterResetting(ctx, e) }, |
| 253 | "enter_" + vlanStDisabled: func(e *fsm.Event) { instFsm.enterDisabled(ctx, e) }, |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 254 | }, |
| 255 | ) |
| 256 | if instFsm.pAdaptFsm.pFsm == nil { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 257 | logger.Errorw(ctx, "UniVlanConfigFsm's Base FSM could not be instantiated!!", log.Fields{ |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 258 | "device-id": instFsm.deviceID}) |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 259 | return nil |
| 260 | } |
| 261 | |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 262 | _ = instFsm.initUniFlowParams(ctx, aTechProfileID, aCookieSlice, aMatchVlan, aSetVlan, aSetPcp) |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 263 | |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 264 | logger.Debugw(ctx, "UniVlanConfigFsm created", log.Fields{"device-id": instFsm.deviceID, |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 265 | "accIncrEvto": instFsm.acceptIncrementalEvtoOption}) |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 266 | return instFsm |
| 267 | } |
| 268 | |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 269 | //initUniFlowParams is a simplified form of SetUniFlowParams() used for first flow parameters configuration |
mpagenko | 551a4d4 | 2020-12-08 18:09:20 +0000 | [diff] [blame] | 270 | func (oFsm *UniVlanConfigFsm) initUniFlowParams(ctx context.Context, aTpID uint8, aCookieSlice []uint64, |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 271 | aMatchVlan uint16, aSetVlan uint16, aSetPcp uint8) error { |
| 272 | loRuleParams := uniVlanRuleParams{ |
Holger Hildebrandt | 47555e7 | 2020-09-21 11:07:24 +0000 | [diff] [blame] | 273 | TpID: aTpID, |
| 274 | MatchVid: uint32(aMatchVlan), |
| 275 | SetVid: uint32(aSetVlan), |
| 276 | SetPcp: uint32(aSetPcp), |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 277 | } |
| 278 | // some automatic adjustments on the filter/treat parameters as not specifically configured/ensured by flow configuration parameters |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 279 | loRuleParams.TagsToRemove = 1 //one tag to remove as default setting |
| 280 | loRuleParams.MatchPcp = cPrioDoNotFilter // do not Filter on prio as default |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 281 | |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 282 | if loRuleParams.SetVid == uint32(of.OfpVlanId_OFPVID_PRESENT) { |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 283 | //then matchVlan is don't care and should be overwritten to 'transparent' here to avoid unneeded multiple flow entries |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 284 | loRuleParams.MatchVid = uint32(of.OfpVlanId_OFPVID_PRESENT) |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 285 | //TODO!!: maybe be needed to be re-checked at flow deletion (but assume all flows are always deleted togehther) |
| 286 | } else { |
| 287 | if !oFsm.acceptIncrementalEvtoOption { |
| 288 | //then matchVlan is don't care and should be overwritten to 'transparent' here to avoid unneeded multiple flow entries |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 289 | loRuleParams.MatchVid = uint32(of.OfpVlanId_OFPVID_PRESENT) |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 290 | } |
| 291 | } |
| 292 | |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 293 | if loRuleParams.MatchVid == uint32(of.OfpVlanId_OFPVID_PRESENT) { |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 294 | // no prio/vid filtering requested |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 295 | loRuleParams.TagsToRemove = 0 //no tag pop action |
| 296 | loRuleParams.MatchPcp = cPrioIgnoreTag // no vlan tag filtering |
| 297 | if loRuleParams.SetPcp == cCopyPrioFromInner { |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 298 | //in case of no filtering and configured PrioCopy ensure default prio setting to 0 |
| 299 | // which is required for stacking of untagged, but obviously also ensures prio setting for prio/singletagged |
| 300 | // might collide with NoMatchVid/CopyPrio(/setVid) setting |
| 301 | // this was some precondition setting taken over from py adapter .. |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 302 | loRuleParams.SetPcp = 0 |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 303 | } |
| 304 | } |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 305 | |
| 306 | loFlowParams := uniVlanFlowParams{VlanRuleParams: loRuleParams} |
| 307 | loFlowParams.CookieSlice = make([]uint64, 0) |
| 308 | loFlowParams.CookieSlice = append(loFlowParams.CookieSlice, aCookieSlice...) |
| 309 | |
| 310 | //no mutex protection is required for initial access and adding the first flow is always possible |
| 311 | oFsm.uniVlanFlowParamsSlice = make([]uniVlanFlowParams, 0) |
| 312 | oFsm.uniVlanFlowParamsSlice = append(oFsm.uniVlanFlowParamsSlice, loFlowParams) |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 313 | logger.Debugw(ctx, "first UniVlanConfigFsm flow added", log.Fields{ |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 314 | "Cookies": oFsm.uniVlanFlowParamsSlice[0].CookieSlice, |
| 315 | "MatchVid": strconv.FormatInt(int64(loRuleParams.MatchVid), 16), |
| 316 | "SetVid": strconv.FormatInt(int64(loRuleParams.SetVid), 16), |
| 317 | "SetPcp": loRuleParams.SetPcp, |
| 318 | "device-id": oFsm.deviceID}) |
| 319 | oFsm.numUniFlows = 1 |
| 320 | oFsm.uniRemoveFlowsSlice = make([]uniRemoveVlanFlowParams, 0) //initially nothing to remove |
| 321 | |
| 322 | //permanently store flow config for reconcile case |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 323 | if err := oFsm.pDeviceHandler.storePersUniFlowConfig(ctx, oFsm.pOnuUniPort.uniID, |
mpagenko | f1fc386 | 2021-02-16 10:09:52 +0000 | [diff] [blame] | 324 | &oFsm.uniVlanFlowParamsSlice, true); err != nil { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 325 | logger.Errorw(ctx, err.Error(), log.Fields{"device-id": oFsm.deviceID}) |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 326 | return err |
| 327 | } |
| 328 | |
| 329 | return nil |
| 330 | } |
| 331 | |
mpagenko | 7d6bb02 | 2021-03-11 15:07:55 +0000 | [diff] [blame] | 332 | //CancelProcessing ensures that suspended processing at waiting on some response is aborted and reset of FSM |
| 333 | func (oFsm *UniVlanConfigFsm) CancelProcessing() { |
| 334 | //mutex protection is required for possible concurrent access to FSM members |
| 335 | oFsm.mutexIsAwaitingResponse.RLock() |
| 336 | defer oFsm.mutexIsAwaitingResponse.RUnlock() |
| 337 | if oFsm.isAwaitingResponse { |
| 338 | //use channel to indicate that the response waiting shall be aborted |
| 339 | oFsm.omciMIdsResponseReceived <- false |
| 340 | } |
| 341 | // in any case (even if it might be automatically requested by above cancellation of waiting) ensure resetting the FSM |
| 342 | pAdaptFsm := oFsm.pAdaptFsm |
| 343 | if pAdaptFsm != nil { |
| 344 | // obviously calling some FSM event here directly does not work - so trying to decouple it ... |
| 345 | go func(aPAFsm *AdapterFsm) { |
| 346 | if aPAFsm.pFsm != nil { |
| 347 | _ = oFsm.pAdaptFsm.pFsm.Event(vlanEvReset) |
| 348 | } |
| 349 | }(pAdaptFsm) |
| 350 | } |
| 351 | } |
| 352 | |
mpagenko | 551a4d4 | 2020-12-08 18:09:20 +0000 | [diff] [blame] | 353 | //GetWaitingTpID returns the TpId that the FSM might be waiting for continuation (0 if none) |
| 354 | func (oFsm *UniVlanConfigFsm) GetWaitingTpID() uint8 { |
| 355 | //mutex protection is required for possible concurrent access to FSM members |
| 356 | oFsm.mutexFlowParams.RLock() |
| 357 | defer oFsm.mutexFlowParams.RUnlock() |
| 358 | return oFsm.TpIDWaitingFor |
| 359 | } |
| 360 | |
mpagenko | 2418ab0 | 2020-11-12 12:58:06 +0000 | [diff] [blame] | 361 | //RequestClearPersistency sets the internal flag to not clear persistency data (false=NoClear) |
| 362 | func (oFsm *UniVlanConfigFsm) RequestClearPersistency(aClear bool) { |
| 363 | //mutex protection is required for possible concurrent access to FSM members |
mpagenko | 15ff4a5 | 2021-03-02 10:09:20 +0000 | [diff] [blame] | 364 | oFsm.mutexFlowParams.Lock() |
| 365 | defer oFsm.mutexFlowParams.Unlock() |
mpagenko | 2418ab0 | 2020-11-12 12:58:06 +0000 | [diff] [blame] | 366 | oFsm.clearPersistency = aClear |
| 367 | } |
| 368 | |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 369 | //SetUniFlowParams verifies on existence of flow parameters to be configured, |
| 370 | // optionally udates the cookie list or appends a new flow if there is space |
| 371 | // if possible the FSM is trigggerd to start with the processing |
mpagenko | 551a4d4 | 2020-12-08 18:09:20 +0000 | [diff] [blame] | 372 | // ignore complexity by now |
| 373 | // nolint: gocyclo |
| 374 | func (oFsm *UniVlanConfigFsm) SetUniFlowParams(ctx context.Context, aTpID uint8, aCookieSlice []uint64, |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 375 | aMatchVlan uint16, aSetVlan uint16, aSetPcp uint8) error { |
| 376 | loRuleParams := uniVlanRuleParams{ |
| 377 | TpID: aTpID, |
| 378 | MatchVid: uint32(aMatchVlan), |
| 379 | SetVid: uint32(aSetVlan), |
| 380 | SetPcp: uint32(aSetPcp), |
| 381 | } |
| 382 | // some automatic adjustments on the filter/treat parameters as not specifically configured/ensured by flow configuration parameters |
| 383 | loRuleParams.TagsToRemove = 1 //one tag to remove as default setting |
| 384 | loRuleParams.MatchPcp = cPrioDoNotFilter // do not Filter on prio as default |
| 385 | |
| 386 | if loRuleParams.SetVid == uint32(of.OfpVlanId_OFPVID_PRESENT) { |
| 387 | //then matchVlan is don't care and should be overwritten to 'transparent' here to avoid unneeded multiple flow entries |
| 388 | loRuleParams.MatchVid = uint32(of.OfpVlanId_OFPVID_PRESENT) |
| 389 | //TODO!!: maybe be needed to be re-checked at flow deletion (but assume all flows are always deleted togehther) |
| 390 | } else { |
| 391 | if !oFsm.acceptIncrementalEvtoOption { |
| 392 | //then matchVlan is don't care and should be overwritten to 'transparent' here to avoid unneeded multiple flow entries |
| 393 | loRuleParams.MatchVid = uint32(of.OfpVlanId_OFPVID_PRESENT) |
| 394 | } |
| 395 | } |
| 396 | |
| 397 | if loRuleParams.MatchVid == uint32(of.OfpVlanId_OFPVID_PRESENT) { |
| 398 | // no prio/vid filtering requested |
| 399 | loRuleParams.TagsToRemove = 0 //no tag pop action |
| 400 | loRuleParams.MatchPcp = cPrioIgnoreTag // no vlan tag filtering |
| 401 | if loRuleParams.SetPcp == cCopyPrioFromInner { |
| 402 | //in case of no filtering and configured PrioCopy ensure default prio setting to 0 |
| 403 | // which is required for stacking of untagged, but obviously also ensures prio setting for prio/singletagged |
| 404 | // might collide with NoMatchVid/CopyPrio(/setVid) setting |
| 405 | // this was some precondition setting taken over from py adapter .. |
| 406 | loRuleParams.SetPcp = 0 |
| 407 | } |
| 408 | } |
| 409 | |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 410 | flowEntryMatch := false |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 411 | flowCookieModify := false |
mpagenko | f1fc386 | 2021-02-16 10:09:52 +0000 | [diff] [blame] | 412 | requestAppendRule := false |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 413 | //mutex protection is required for possible concurrent access to FSM members |
| 414 | oFsm.mutexFlowParams.Lock() |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 415 | for flow, storedUniFlowParams := range oFsm.uniVlanFlowParamsSlice { |
| 416 | //TODO: Verify if using e.g. hashes for the structures here for comparison may generate |
| 417 | // countable run time optimization (perhaps with including the hash in kvStore storage?) |
| 418 | if storedUniFlowParams.VlanRuleParams == loRuleParams { |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 419 | flowEntryMatch = true |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 420 | logger.Debugw(ctx, "UniVlanConfigFsm flow setting - rule already exists", log.Fields{ |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 421 | "device-id": oFsm.deviceID}) |
| 422 | var cookieMatch bool |
| 423 | for _, newCookie := range aCookieSlice { // for all cookies available in the arguments |
| 424 | cookieMatch = false |
| 425 | for _, cookie := range storedUniFlowParams.CookieSlice { |
| 426 | if cookie == newCookie { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 427 | logger.Debugw(ctx, "UniVlanConfigFsm flow setting - and cookie already exists", log.Fields{ |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 428 | "device-id": oFsm.deviceID, "cookie": cookie}) |
| 429 | cookieMatch = true |
| 430 | break //found new cookie - no further search for this requested cookie |
| 431 | } |
| 432 | } |
| 433 | if !cookieMatch { |
mpagenko | f1fc386 | 2021-02-16 10:09:52 +0000 | [diff] [blame] | 434 | delayedCookie := oFsm.delayNewRuleForCookie(ctx, aCookieSlice) |
| 435 | if delayedCookie != 0 { |
| 436 | //a delay for adding the cookie to this rule is requested |
| 437 | // take care of the mutex which is already locked here, need to unlock/lock accordingly to prevent deadlock in suspension |
| 438 | oFsm.mutexFlowParams.Unlock() |
| 439 | oFsm.suspendNewRule(ctx) |
| 440 | flowCookieModify, requestAppendRule = oFsm.reviseFlowConstellation(ctx, delayedCookie, loRuleParams) |
| 441 | oFsm.mutexFlowParams.Lock() |
| 442 | } else { |
| 443 | logger.Debugw(ctx, "UniVlanConfigFsm flow setting -adding new cookie", log.Fields{ |
| 444 | "device-id": oFsm.deviceID, "cookie": newCookie}) |
| 445 | //as range works with copies of the slice we have to write to the original slice!! |
| 446 | oFsm.uniVlanFlowParamsSlice[flow].CookieSlice = append(oFsm.uniVlanFlowParamsSlice[flow].CookieSlice, |
| 447 | newCookie) |
| 448 | flowCookieModify = true |
| 449 | } |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 450 | } |
| 451 | } //for all new cookies |
| 452 | break // found rule - no further rule search |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 453 | } |
| 454 | } |
mpagenko | f1fc386 | 2021-02-16 10:09:52 +0000 | [diff] [blame] | 455 | oFsm.mutexFlowParams.Unlock() |
| 456 | |
| 457 | if !flowEntryMatch { //it is (was) a new rule |
| 458 | delayedCookie := oFsm.suspendIfRequiredNewRule(ctx, aCookieSlice) |
| 459 | requestAppendRule = true //default assumption here is that rule is to be appended |
| 460 | flowCookieModify = true //and that the the flow data base is to be updated |
| 461 | if delayedCookie != 0 { //it was suspended |
| 462 | flowCookieModify, requestAppendRule = oFsm.reviseFlowConstellation(ctx, delayedCookie, loRuleParams) |
| 463 | } |
| 464 | } |
| 465 | kvStoreWrite := false //default setting is to not write to kvStore immediately - will be done on FSM execution finally |
| 466 | if requestAppendRule { |
| 467 | oFsm.mutexFlowParams.Lock() |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 468 | if oFsm.numUniFlows < cMaxAllowedFlows { |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 469 | loFlowParams := uniVlanFlowParams{VlanRuleParams: loRuleParams} |
| 470 | loFlowParams.CookieSlice = make([]uint64, 0) |
| 471 | loFlowParams.CookieSlice = append(loFlowParams.CookieSlice, aCookieSlice...) |
| 472 | oFsm.uniVlanFlowParamsSlice = append(oFsm.uniVlanFlowParamsSlice, loFlowParams) |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 473 | logger.Debugw(ctx, "UniVlanConfigFsm flow add", log.Fields{ |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 474 | "Cookies": oFsm.uniVlanFlowParamsSlice[oFsm.numUniFlows].CookieSlice, |
| 475 | "MatchVid": strconv.FormatInt(int64(loRuleParams.MatchVid), 16), |
| 476 | "SetVid": strconv.FormatInt(int64(loRuleParams.SetVid), 16), |
Girish Gowdra | 041dcb3 | 2020-11-16 16:54:30 -0800 | [diff] [blame] | 477 | "SetPcp": loRuleParams.SetPcp, "numberofFlows": oFsm.numUniFlows + 1, |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 478 | "device-id": oFsm.deviceID}) |
| 479 | |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 480 | oFsm.numUniFlows++ |
Holger Hildebrandt | be52384 | 2021-03-10 10:47:18 +0000 | [diff] [blame] | 481 | pConfigVlanStateBaseFsm := oFsm.pAdaptFsm.pFsm |
| 482 | |
| 483 | if oFsm.pDeviceHandler.isSkipOnuConfigReconciling() { |
| 484 | logger.Debugw(ctx, "reconciling - skip omci-config of additional vlan rule", |
| 485 | log.Fields{"fsmState": oFsm.pAdaptFsm.pFsm.Current(), "device-id": oFsm.deviceID}) |
| 486 | oFsm.mutexFlowParams.Unlock() |
| 487 | if pConfigVlanStateBaseFsm.Is(vlanStConfigDone) { |
| 488 | go func(a_pBaseFsm *fsm.FSM) { |
| 489 | _ = a_pBaseFsm.Event(vlanEvSkipOmciConfig) |
| 490 | }(pConfigVlanStateBaseFsm) |
| 491 | } |
| 492 | return nil |
| 493 | } |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 494 | // note: theoretical it would be possible to clear the same rule from the remove slice |
| 495 | // (for entries that have not yet been started with removal) |
| 496 | // but that is getting quite complicated - maybe a future optimization in case it should prove reasonable |
| 497 | // anyway the precondition here is that the FSM checks for rules to delete first and adds new rules afterwards |
Holger Hildebrandt | 47555e7 | 2020-09-21 11:07:24 +0000 | [diff] [blame] | 498 | |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 499 | if pConfigVlanStateBaseFsm.Is(vlanStConfigDone) { |
| 500 | //have to re-trigger the FSM to proceed with outstanding incremental flow configuration |
mpagenko | 551a4d4 | 2020-12-08 18:09:20 +0000 | [diff] [blame] | 501 | if oFsm.configuredUniFlow == 0 { |
| 502 | // this is a restart with a complete new flow, we can re-use the initial flow config control |
| 503 | // including the check, if the related techProfile is (still) available (probably also removed in between) |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 504 | // Can't call FSM Event directly, decoupling it |
mpagenko | 551a4d4 | 2020-12-08 18:09:20 +0000 | [diff] [blame] | 505 | go func(a_pBaseFsm *fsm.FSM) { |
| 506 | _ = a_pBaseFsm.Event(vlanEvRenew) |
| 507 | }(pConfigVlanStateBaseFsm) |
| 508 | } else { |
| 509 | //some further flows are to be configured |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 510 | //store the actual rule that shall be worked upon in the following transient states |
| 511 | oFsm.actualUniVlanConfigRule = oFsm.uniVlanFlowParamsSlice[oFsm.configuredUniFlow].VlanRuleParams |
mpagenko | 551a4d4 | 2020-12-08 18:09:20 +0000 | [diff] [blame] | 512 | //tpId of the next rule to be configured |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 513 | tpID := oFsm.actualUniVlanConfigRule.TpID |
mpagenko | 551a4d4 | 2020-12-08 18:09:20 +0000 | [diff] [blame] | 514 | loTechProfDone := oFsm.pUniTechProf.getTechProfileDone(ctx, oFsm.pOnuUniPort.uniID, tpID) |
| 515 | oFsm.TpIDWaitingFor = tpID |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 516 | logger.Debugw(ctx, "UniVlanConfigFsm - incremental config request (on setConfig)", log.Fields{ |
| 517 | "device-id": oFsm.deviceID, "uni-id": oFsm.pOnuUniPort.uniID, |
| 518 | "set-Vlan": oFsm.actualUniVlanConfigRule.SetVid, "tp-id": tpID, "ProfDone": loTechProfDone}) |
| 519 | |
mpagenko | 551a4d4 | 2020-12-08 18:09:20 +0000 | [diff] [blame] | 520 | go func(aPBaseFsm *fsm.FSM, aTechProfDone bool) { |
| 521 | if aTechProfDone { |
| 522 | // let the vlan processing continue with next rule |
| 523 | _ = aPBaseFsm.Event(vlanEvIncrFlowConfig) |
| 524 | } else { |
| 525 | // set to waiting for Techprofile |
| 526 | _ = aPBaseFsm.Event(vlanEvWaitTPIncr) |
| 527 | } |
| 528 | }(pConfigVlanStateBaseFsm, loTechProfDone) |
| 529 | } |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 530 | } // if not in the appropriate state a new entry will be automatically considered later |
| 531 | // when the configDone state is reached |
mpagenko | 15ff4a5 | 2021-03-02 10:09:20 +0000 | [diff] [blame] | 532 | oFsm.mutexFlowParams.Unlock() |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 533 | } else { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 534 | logger.Errorw(ctx, "UniVlanConfigFsm flow limit exceeded", log.Fields{ |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 535 | "device-id": oFsm.deviceID, "flow-number": oFsm.numUniFlows}) |
mpagenko | 15ff4a5 | 2021-03-02 10:09:20 +0000 | [diff] [blame] | 536 | oFsm.mutexFlowParams.Unlock() |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 537 | return fmt.Errorf(" UniVlanConfigFsm flow limit exceeded %s", oFsm.deviceID) |
| 538 | } |
mpagenko | fc4f56e | 2020-11-04 17:17:49 +0000 | [diff] [blame] | 539 | } else { |
| 540 | // no activity within the FSM for OMCI processing, the deviceReason may be updated immediately |
mpagenko | f1fc386 | 2021-02-16 10:09:52 +0000 | [diff] [blame] | 541 | kvStoreWrite = true // ensure actual data write to kvStore immediately (no FSM activity) |
mpagenko | 15ff4a5 | 2021-03-02 10:09:20 +0000 | [diff] [blame] | 542 | oFsm.mutexFlowParams.RLock() |
mpagenko | fc4f56e | 2020-11-04 17:17:49 +0000 | [diff] [blame] | 543 | if oFsm.numUniFlows == oFsm.configuredUniFlow { |
| 544 | //all requested rules really have been configured |
| 545 | // state transition notification is checked in deviceHandler |
mpagenko | 15ff4a5 | 2021-03-02 10:09:20 +0000 | [diff] [blame] | 546 | oFsm.mutexFlowParams.RUnlock() |
mpagenko | fc4f56e | 2020-11-04 17:17:49 +0000 | [diff] [blame] | 547 | if oFsm.pDeviceHandler != nil { |
| 548 | //also the related TechProfile was already configured |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 549 | logger.Debugw(ctx, "UniVlanConfigFsm rule already set - send immediate add-success event for reason update", log.Fields{ |
mpagenko | fc4f56e | 2020-11-04 17:17:49 +0000 | [diff] [blame] | 550 | "device-id": oFsm.deviceID}) |
mpagenko | f1fc386 | 2021-02-16 10:09:52 +0000 | [diff] [blame] | 551 | // success indication without the need to write to kvStore (done already below with updated data from storePersUniFlowConfig()) |
| 552 | go oFsm.pDeviceHandler.deviceProcStatusUpdate(ctx, OnuDeviceEvent(oFsm.requestEvent+cDeviceEventOffsetAddNoKvStore)) |
mpagenko | fc4f56e | 2020-11-04 17:17:49 +0000 | [diff] [blame] | 553 | } |
| 554 | } else { |
| 555 | // avoid device reason update as the rule config connected to this flow may still be in progress |
| 556 | // and the device reason should only be updated on success of rule config |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 557 | logger.Debugw(ctx, "UniVlanConfigFsm rule already set but configuration ongoing, suppress early add-success event for reason update", |
mpagenko | fc4f56e | 2020-11-04 17:17:49 +0000 | [diff] [blame] | 558 | log.Fields{"device-id": oFsm.deviceID, |
| 559 | "NumberofRules": oFsm.numUniFlows, "Configured rules": oFsm.configuredUniFlow}) |
mpagenko | 15ff4a5 | 2021-03-02 10:09:20 +0000 | [diff] [blame] | 560 | oFsm.mutexFlowParams.RUnlock() |
mpagenko | fc4f56e | 2020-11-04 17:17:49 +0000 | [diff] [blame] | 561 | } |
| 562 | } |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 563 | |
mpagenko | f1fc386 | 2021-02-16 10:09:52 +0000 | [diff] [blame] | 564 | if flowCookieModify { // some change was done to the flow entries |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 565 | //permanently store flow config for reconcile case |
mpagenko | 15ff4a5 | 2021-03-02 10:09:20 +0000 | [diff] [blame] | 566 | oFsm.mutexFlowParams.RLock() |
mpagenko | f1fc386 | 2021-02-16 10:09:52 +0000 | [diff] [blame] | 567 | if err := oFsm.pDeviceHandler.storePersUniFlowConfig(ctx, oFsm.pOnuUniPort.uniID, |
| 568 | &oFsm.uniVlanFlowParamsSlice, kvStoreWrite); err != nil { |
mpagenko | 15ff4a5 | 2021-03-02 10:09:20 +0000 | [diff] [blame] | 569 | oFsm.mutexFlowParams.RUnlock() |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 570 | logger.Errorw(ctx, err.Error(), log.Fields{"device-id": oFsm.deviceID}) |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 571 | return err |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 572 | } |
mpagenko | 15ff4a5 | 2021-03-02 10:09:20 +0000 | [diff] [blame] | 573 | oFsm.mutexFlowParams.RUnlock() |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 574 | } |
| 575 | return nil |
| 576 | } |
| 577 | |
mpagenko | f1fc386 | 2021-02-16 10:09:52 +0000 | [diff] [blame] | 578 | // VOL-3828 flow config sequence workaround ########### start ########## |
| 579 | func (oFsm *UniVlanConfigFsm) delayNewRuleForCookie(ctx context.Context, aCookieSlice []uint64) uint64 { |
| 580 | //assumes mutexFlowParams.Lock() protection from caller! |
| 581 | if oFsm.delayNewRuleCookie == 0 && len(aCookieSlice) == 1 { |
| 582 | // if not already waiting, limitation for this workaround is to just have one overlapping cookie/rule |
| 583 | // suspend check is done only of there is only one cookie in the request |
| 584 | // background: more elements only expected in reconcile use case, where no conflicting sequence is to be expected |
| 585 | newCookie := aCookieSlice[0] |
| 586 | for _, storedUniFlowParams := range oFsm.uniVlanFlowParamsSlice { |
| 587 | for _, cookie := range storedUniFlowParams.CookieSlice { |
| 588 | if cookie == newCookie { |
| 589 | logger.Debugw(ctx, "UniVlanConfigFsm flow setting - new cookie still exists for some rule", log.Fields{ |
| 590 | "device-id": oFsm.deviceID, "cookie": cookie, "exists with SetVlan": storedUniFlowParams.VlanRuleParams.SetVid}) |
| 591 | oFsm.delayNewRuleCookie = newCookie |
| 592 | return newCookie //found new cookie in some existing rule |
| 593 | } |
| 594 | } // for all stored cookies of the actual inspected rule |
| 595 | } //for all rules |
| 596 | } |
| 597 | return 0 //no delay requested |
| 598 | } |
| 599 | func (oFsm *UniVlanConfigFsm) suspendNewRule(ctx context.Context) { |
| 600 | oFsm.mutexFlowParams.RLock() |
| 601 | logger.Infow(ctx, "Need to suspend adding this rule as long as the cookie is still connected to some other rule", log.Fields{ |
| 602 | "device-id": oFsm.deviceID, "cookie": oFsm.delayNewRuleCookie}) |
| 603 | oFsm.mutexFlowParams.RUnlock() |
| 604 | select { |
| 605 | case <-oFsm.chCookieDeleted: |
| 606 | logger.Infow(ctx, "resume adding this rule after having deleted cookie in some other rule", log.Fields{ |
| 607 | "device-id": oFsm.deviceID, "cookie": oFsm.delayNewRuleCookie}) |
| 608 | case <-time.After(time.Duration(cWaitForCookieDeletion) * time.Second): |
| 609 | logger.Errorw(ctx, "timeout waiting for deletion of cookie in some other rule, just try to continue", log.Fields{ |
| 610 | "device-id": oFsm.deviceID, "cookie": oFsm.delayNewRuleCookie}) |
| 611 | } |
| 612 | oFsm.mutexFlowParams.Lock() |
| 613 | oFsm.delayNewRuleCookie = 0 |
| 614 | oFsm.mutexFlowParams.Unlock() |
| 615 | } |
| 616 | func (oFsm *UniVlanConfigFsm) suspendIfRequiredNewRule(ctx context.Context, aCookieSlice []uint64) uint64 { |
| 617 | oFsm.mutexFlowParams.Lock() |
| 618 | delayedCookie := oFsm.delayNewRuleForCookie(ctx, aCookieSlice) |
| 619 | oFsm.mutexFlowParams.Unlock() |
| 620 | |
| 621 | if delayedCookie != 0 { |
| 622 | oFsm.suspendNewRule(ctx) |
| 623 | } |
| 624 | return delayedCookie |
| 625 | } |
| 626 | |
| 627 | //returns flowModified, RuleAppendRequest |
| 628 | func (oFsm *UniVlanConfigFsm) reviseFlowConstellation(ctx context.Context, aCookie uint64, aUniVlanRuleParams uniVlanRuleParams) (bool, bool) { |
| 629 | flowEntryMatch := false |
| 630 | oFsm.mutexFlowParams.Lock() |
| 631 | defer oFsm.mutexFlowParams.Unlock() |
| 632 | for flow, storedUniFlowParams := range oFsm.uniVlanFlowParamsSlice { |
| 633 | if storedUniFlowParams.VlanRuleParams == aUniVlanRuleParams { |
| 634 | flowEntryMatch = true |
| 635 | logger.Debugw(ctx, "UniVlanConfigFsm flow revise - rule already exists", log.Fields{ |
| 636 | "device-id": oFsm.deviceID}) |
| 637 | cookieMatch := false |
| 638 | for _, cookie := range storedUniFlowParams.CookieSlice { |
| 639 | if cookie == aCookie { |
| 640 | logger.Debugw(ctx, "UniVlanConfigFsm flow revise - and cookie already exists", log.Fields{ |
| 641 | "device-id": oFsm.deviceID, "cookie": cookie}) |
| 642 | cookieMatch = true |
| 643 | break //found new cookie - no further search for this requested cookie |
| 644 | } |
| 645 | } |
| 646 | if !cookieMatch { |
| 647 | logger.Debugw(ctx, "UniVlanConfigFsm flow revise -adding new cookie", log.Fields{ |
| 648 | "device-id": oFsm.deviceID, "cookie": aCookie}) |
| 649 | //as range works with copies of the slice we have to write to the original slice!! |
| 650 | oFsm.uniVlanFlowParamsSlice[flow].CookieSlice = append(oFsm.uniVlanFlowParamsSlice[flow].CookieSlice, |
| 651 | aCookie) |
| 652 | return true, false //flowModified, NoRuleAppend |
| 653 | } |
| 654 | break // found rule - no further rule search |
| 655 | } |
| 656 | } |
| 657 | if !flowEntryMatch { //it is a new rule |
| 658 | return true, true //flowModified, RuleAppend |
| 659 | } |
| 660 | return false, false //flowNotModified, NoRuleAppend |
| 661 | } |
| 662 | |
| 663 | // VOL-3828 flow config sequence workaround ########### end ########## |
| 664 | |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 665 | //RemoveUniFlowParams verifies on existence of flow cookie, |
| 666 | // if found removes cookie from flow cookie list and if this is empty |
| 667 | // initiates removal of the flow related configuration from the ONU (via OMCI) |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 668 | func (oFsm *UniVlanConfigFsm) RemoveUniFlowParams(ctx context.Context, aCookie uint64) error { |
mpagenko | f1fc386 | 2021-02-16 10:09:52 +0000 | [diff] [blame] | 669 | var deletedCookie uint64 |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 670 | flowCookieMatch := false |
| 671 | //mutex protection is required for possible concurrent access to FSM members |
| 672 | oFsm.mutexFlowParams.Lock() |
| 673 | defer oFsm.mutexFlowParams.Unlock() |
mpagenko | f1fc386 | 2021-02-16 10:09:52 +0000 | [diff] [blame] | 674 | remove_loop: |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 675 | for flow, storedUniFlowParams := range oFsm.uniVlanFlowParamsSlice { |
| 676 | for i, cookie := range storedUniFlowParams.CookieSlice { |
| 677 | if cookie == aCookie { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 678 | logger.Debugw(ctx, "UniVlanConfigFsm flow removal - cookie found", log.Fields{ |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 679 | "device-id": oFsm.deviceID, "cookie": cookie}) |
| 680 | flowCookieMatch = true |
mpagenko | f1fc386 | 2021-02-16 10:09:52 +0000 | [diff] [blame] | 681 | deletedCookie = aCookie |
| 682 | kvStoreWrite := false //default setting is to not write to kvStore immediately - will be done on FSM execution finally |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 683 | //remove the cookie from the cookie slice and verify it is getting empty |
| 684 | if len(storedUniFlowParams.CookieSlice) == 1 { |
mpagenko | 535d6ef | 2021-02-26 13:15:34 +0000 | [diff] [blame] | 685 | pConfigVlanStateBaseFsm := oFsm.pAdaptFsm.pFsm |
| 686 | var cancelPendingConfig bool = false |
| 687 | var loRemoveParams uniRemoveVlanFlowParams = uniRemoveVlanFlowParams{} |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 688 | logger.Debugw(ctx, "UniVlanConfigFsm flow removal - full flow removal", log.Fields{ |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 689 | "device-id": oFsm.deviceID}) |
mpagenko | 15ff4a5 | 2021-03-02 10:09:20 +0000 | [diff] [blame] | 690 | //rwCore flow recovery may be the reason for this delete, in which case the flowToBeDeleted may be the same |
mpagenko | 535d6ef | 2021-02-26 13:15:34 +0000 | [diff] [blame] | 691 | // as the one still waiting in the FSM as toAdd but waiting for TechProfileConfig |
mpagenko | 15ff4a5 | 2021-03-02 10:09:20 +0000 | [diff] [blame] | 692 | // so we have to check if we have to abort the outstanding AddRequest and regard the current DelRequest as done |
mpagenko | 535d6ef | 2021-02-26 13:15:34 +0000 | [diff] [blame] | 693 | // if the Fsm is in some other transient (config) state, we will reach the DelRequest later and correctly process it then |
| 694 | if pConfigVlanStateBaseFsm.Is(vlanStWaitingTechProf) { |
| 695 | logger.Debugw(ctx, "UniVlanConfigFsm was waiting for TechProf config with this rule, aborting the outstanding config", |
| 696 | log.Fields{"device-id": oFsm.deviceID}) |
| 697 | cancelPendingConfig = true |
| 698 | } else { |
| 699 | //create a new element for the removeVlanFlow slice |
| 700 | loRemoveParams = uniRemoveVlanFlowParams{ |
| 701 | vlanRuleParams: storedUniFlowParams.VlanRuleParams, |
| 702 | cookie: aCookie, |
| 703 | } |
| 704 | oFsm.uniRemoveFlowsSlice = append(oFsm.uniRemoveFlowsSlice, loRemoveParams) |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 705 | } |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 706 | |
| 707 | //and remove the actual element from the addVlanFlow slice |
| 708 | // oFsm.uniVlanFlowParamsSlice[flow].CookieSlice = nil //automatically done by garbage collector |
| 709 | if len(oFsm.uniVlanFlowParamsSlice) <= 1 { |
| 710 | oFsm.numUniFlows = 0 //no more flows |
| 711 | oFsm.configuredUniFlow = 0 //no more flows configured |
| 712 | oFsm.uniVlanFlowParamsSlice = nil //reset the slice |
mpagenko | 2418ab0 | 2020-11-12 12:58:06 +0000 | [diff] [blame] | 713 | //at this point it is evident that no flow anymore refers to a still possibly active Techprofile |
mpagenko | 535d6ef | 2021-02-26 13:15:34 +0000 | [diff] [blame] | 714 | //request that this profile gets deleted before a new flow add is allowed (except for some aborted add) |
| 715 | if !cancelPendingConfig { |
| 716 | oFsm.pUniTechProf.setProfileToDelete(oFsm.pOnuUniPort.uniID, loRemoveParams.vlanRuleParams.TpID, true) |
| 717 | } |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 718 | logger.Debugw(ctx, "UniVlanConfigFsm flow removal - no more flows", log.Fields{ |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 719 | "device-id": oFsm.deviceID}) |
| 720 | } else { |
| 721 | oFsm.numUniFlows-- |
| 722 | if oFsm.configuredUniFlow > 0 { |
| 723 | oFsm.configuredUniFlow-- |
| 724 | //TODO!! might be needed to consider still outstanding configure requests .. |
| 725 | // so a flow at removal might still not be configured !?! |
| 726 | } |
mpagenko | 2418ab0 | 2020-11-12 12:58:06 +0000 | [diff] [blame] | 727 | usedTpID := storedUniFlowParams.VlanRuleParams.TpID |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 728 | //cut off the requested flow by slicing out this element |
| 729 | oFsm.uniVlanFlowParamsSlice = append( |
| 730 | oFsm.uniVlanFlowParamsSlice[:flow], oFsm.uniVlanFlowParamsSlice[flow+1:]...) |
mpagenko | 2418ab0 | 2020-11-12 12:58:06 +0000 | [diff] [blame] | 731 | //here we have to check, if there are still other flows referencing to the actual ProfileId |
| 732 | // before we can request that this profile gets deleted before a new flow add is allowed |
mpagenko | f1fc386 | 2021-02-16 10:09:52 +0000 | [diff] [blame] | 733 | // (needed to extract to function due to lint complexity) |
mpagenko | 535d6ef | 2021-02-26 13:15:34 +0000 | [diff] [blame] | 734 | if !cancelPendingConfig { |
| 735 | oFsm.updateTechProfileToDelete(ctx, usedTpID) |
| 736 | } |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 737 | logger.Debugw(ctx, "UniVlanConfigFsm flow removal - specific flow removed from data", log.Fields{ |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 738 | "device-id": oFsm.deviceID}) |
| 739 | } |
| 740 | //trigger the FSM to remove the relevant rule |
mpagenko | 535d6ef | 2021-02-26 13:15:34 +0000 | [diff] [blame] | 741 | if cancelPendingConfig { |
| 742 | oFsm.requestEventOffset = uint8(cDeviceEventOffsetRemoveWithKvStore) //offset for last flow-remove activity (with kvStore request) |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 743 | go func(a_pBaseFsm *fsm.FSM) { |
mpagenko | 535d6ef | 2021-02-26 13:15:34 +0000 | [diff] [blame] | 744 | _ = a_pBaseFsm.Event(vlanEvCancelOutstandingConfig) |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 745 | }(pConfigVlanStateBaseFsm) |
mpagenko | 535d6ef | 2021-02-26 13:15:34 +0000 | [diff] [blame] | 746 | } else { |
| 747 | if pConfigVlanStateBaseFsm.Is(vlanStConfigDone) { |
| 748 | logger.Debugw(ctx, "UniVlanConfigFsm rule removal request", log.Fields{ |
| 749 | "device-id": oFsm.deviceID, "uni-id": oFsm.pOnuUniPort.uniID, |
| 750 | "tp-id": loRemoveParams.vlanRuleParams.TpID, |
| 751 | "set-Vlan": loRemoveParams.vlanRuleParams.SetVid}) |
| 752 | //have to re-trigger the FSM to proceed with outstanding incremental flow configuration |
| 753 | // Can't call FSM Event directly, decoupling it |
| 754 | go func(a_pBaseFsm *fsm.FSM) { |
| 755 | _ = a_pBaseFsm.Event(vlanEvRemFlowConfig) |
| 756 | }(pConfigVlanStateBaseFsm) |
| 757 | } // if not in the appropriate state a new entry will be automatically considered later |
| 758 | // when the configDone state is reached |
| 759 | } |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 760 | } else { |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 761 | //cut off the requested cookie by slicing out this element |
| 762 | oFsm.uniVlanFlowParamsSlice[flow].CookieSlice = append( |
| 763 | oFsm.uniVlanFlowParamsSlice[flow].CookieSlice[:i], |
| 764 | oFsm.uniVlanFlowParamsSlice[flow].CookieSlice[i+1:]...) |
mpagenko | fc4f56e | 2020-11-04 17:17:49 +0000 | [diff] [blame] | 765 | // no activity within the FSM for OMCI processing, the deviceReason may be updated immediately |
mpagenko | f1fc386 | 2021-02-16 10:09:52 +0000 | [diff] [blame] | 766 | kvStoreWrite = true // ensure actual data write to kvStore immediately (no FSM activity) |
mpagenko | fc4f56e | 2020-11-04 17:17:49 +0000 | [diff] [blame] | 767 | // state transition notification is checked in deviceHandler |
| 768 | if oFsm.pDeviceHandler != nil { |
mpagenko | f1fc386 | 2021-02-16 10:09:52 +0000 | [diff] [blame] | 769 | // success indication without the need to write to kvStore (done already below with updated data from storePersUniFlowConfig()) |
| 770 | go oFsm.pDeviceHandler.deviceProcStatusUpdate(ctx, OnuDeviceEvent(oFsm.requestEvent+cDeviceEventOffsetRemoveNoKvStore)) |
mpagenko | fc4f56e | 2020-11-04 17:17:49 +0000 | [diff] [blame] | 771 | } |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 772 | logger.Debugw(ctx, "UniVlanConfigFsm flow removal - rule persists with still valid cookies", log.Fields{ |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 773 | "device-id": oFsm.deviceID, "cookies": oFsm.uniVlanFlowParamsSlice[flow].CookieSlice}) |
mpagenko | f1fc386 | 2021-02-16 10:09:52 +0000 | [diff] [blame] | 774 | if deletedCookie == oFsm.delayNewRuleCookie { |
| 775 | //the delayedNewCookie is the one that is currently deleted, but the rule still exist with other cookies |
| 776 | //as long as there are further cookies for this rule indicate there is still some cookie to be deleted |
| 777 | //simply use the first one |
| 778 | oFsm.delayNewRuleCookie = oFsm.uniVlanFlowParamsSlice[flow].CookieSlice[0] |
| 779 | logger.Debugw(ctx, "UniVlanConfigFsm remaining cookie awaited for deletion before new rule add", log.Fields{ |
| 780 | "device-id": oFsm.deviceID, "cookie": oFsm.delayNewRuleCookie}) |
| 781 | } |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 782 | } |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 783 | //permanently store the modified flow config for reconcile case |
mpagenko | fc4f56e | 2020-11-04 17:17:49 +0000 | [diff] [blame] | 784 | if oFsm.pDeviceHandler != nil { |
mpagenko | f1fc386 | 2021-02-16 10:09:52 +0000 | [diff] [blame] | 785 | if err := oFsm.pDeviceHandler.storePersUniFlowConfig(ctx, oFsm.pOnuUniPort.uniID, |
| 786 | &oFsm.uniVlanFlowParamsSlice, kvStoreWrite); err != nil { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 787 | logger.Errorw(ctx, err.Error(), log.Fields{"device-id": oFsm.deviceID}) |
mpagenko | fc4f56e | 2020-11-04 17:17:49 +0000 | [diff] [blame] | 788 | return err |
| 789 | } |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 790 | } |
mpagenko | f1fc386 | 2021-02-16 10:09:52 +0000 | [diff] [blame] | 791 | break remove_loop //found the cookie - no further search for this requested cookie |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 792 | } |
| 793 | } |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 794 | } //search all flows |
| 795 | if !flowCookieMatch { //some cookie remove-request for a cookie that does not exist in the FSM data |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 796 | logger.Warnw(ctx, "UniVlanConfigFsm flow removal - remove-cookie not found", log.Fields{ |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 797 | "device-id": oFsm.deviceID, "remove-cookie": aCookie}) |
| 798 | // but accept the request with success as no such cookie (flow) does exist |
mpagenko | fc4f56e | 2020-11-04 17:17:49 +0000 | [diff] [blame] | 799 | // no activity within the FSM for OMCI processing, the deviceReason may be updated immediately |
| 800 | // state transition notification is checked in deviceHandler |
| 801 | if oFsm.pDeviceHandler != nil { |
mpagenko | f1fc386 | 2021-02-16 10:09:52 +0000 | [diff] [blame] | 802 | // success indication without the need to write to kvStore (no change) |
| 803 | go oFsm.pDeviceHandler.deviceProcStatusUpdate(ctx, OnuDeviceEvent(oFsm.requestEvent+cDeviceEventOffsetRemoveNoKvStore)) |
mpagenko | fc4f56e | 2020-11-04 17:17:49 +0000 | [diff] [blame] | 804 | } |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 805 | return nil |
| 806 | } //unknown cookie |
| 807 | |
| 808 | return nil |
| 809 | } |
| 810 | |
mpagenko | f1fc386 | 2021-02-16 10:09:52 +0000 | [diff] [blame] | 811 | func (oFsm *UniVlanConfigFsm) updateTechProfileToDelete(ctx context.Context, usedTpID uint8) { |
| 812 | //here we have to check, if there are still other flows referencing to the actual ProfileId |
| 813 | // before we can request that this profile gets deleted before a new flow add is allowed |
| 814 | tpIDInOtherFlows := false |
| 815 | for _, tpUniFlowParams := range oFsm.uniVlanFlowParamsSlice { |
| 816 | if tpUniFlowParams.VlanRuleParams.TpID == usedTpID { |
| 817 | tpIDInOtherFlows = true |
| 818 | break // search loop can be left |
| 819 | } |
| 820 | } |
| 821 | if tpIDInOtherFlows { |
| 822 | logger.Debugw(ctx, "UniVlanConfigFsm tp-id used in deleted flow is still used in other flows", log.Fields{ |
| 823 | "device-id": oFsm.deviceID, "tp-id": usedTpID}) |
| 824 | } else { |
| 825 | logger.Debugw(ctx, "UniVlanConfigFsm tp-id used in deleted flow is not used anymore", log.Fields{ |
| 826 | "device-id": oFsm.deviceID, "tp-id": usedTpID}) |
| 827 | //request that this profile gets deleted before a new flow add is allowed |
| 828 | oFsm.pUniTechProf.setProfileToDelete(oFsm.pOnuUniPort.uniID, usedTpID, true) |
| 829 | } |
| 830 | } |
| 831 | |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 832 | func (oFsm *UniVlanConfigFsm) enterConfigStarting(ctx context.Context, e *fsm.Event) { |
| 833 | logger.Debugw(ctx, "UniVlanConfigFsm start", log.Fields{"in state": e.FSM.Current(), |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 834 | "device-id": oFsm.deviceID}) |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 835 | |
| 836 | // this FSM is not intended for re-start, needs always new creation for a new run |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 837 | // (self-destroying - compare enterDisabled()) |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 838 | oFsm.omciMIdsResponseReceived = make(chan bool) |
mpagenko | f1fc386 | 2021-02-16 10:09:52 +0000 | [diff] [blame] | 839 | oFsm.chCookieDeleted = make(chan bool) |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 840 | // start go routine for processing of LockState messages |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 841 | go oFsm.processOmciVlanMessages(ctx) |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 842 | //let the state machine run forward from here directly |
| 843 | pConfigVlanStateAFsm := oFsm.pAdaptFsm |
| 844 | if pConfigVlanStateAFsm != nil { |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 845 | |
Holger Hildebrandt | be52384 | 2021-03-10 10:47:18 +0000 | [diff] [blame] | 846 | if oFsm.pDeviceHandler.isSkipOnuConfigReconciling() { |
| 847 | logger.Debugw(ctx, "reconciling - skip omci-config of vlan rule", |
| 848 | log.Fields{"fsmState": oFsm.pAdaptFsm.pFsm.Current(), "device-id": oFsm.deviceID}) |
| 849 | go func(a_pAFsm *AdapterFsm) { |
| 850 | _ = a_pAFsm.pFsm.Event(vlanEvSkipOmciConfig) |
| 851 | }(pConfigVlanStateAFsm) |
| 852 | return |
| 853 | } |
| 854 | oFsm.mutexFlowParams.Lock() |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 855 | //possibly the entry is not valid anymore based on intermediate delete requests |
| 856 | //just a basic protection ... |
| 857 | if len(oFsm.uniVlanFlowParamsSlice) == 0 { |
| 858 | oFsm.mutexFlowParams.Unlock() |
| 859 | logger.Debugw(ctx, "UniVlanConfigFsm start: no rule entry anymore available", log.Fields{ |
| 860 | "device-id": oFsm.deviceID}) |
| 861 | // Can't call FSM Event directly, decoupling it |
| 862 | go func(a_pAFsm *AdapterFsm) { |
| 863 | _ = a_pAFsm.pFsm.Event(vlanEvReset) |
| 864 | }(pConfigVlanStateAFsm) |
| 865 | return |
| 866 | } |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 867 | //access to uniVlanFlowParamsSlice is done on first element only here per definition |
| 868 | //store the actual rule that shall be worked upon in the following transient states |
| 869 | oFsm.actualUniVlanConfigRule = oFsm.uniVlanFlowParamsSlice[0].VlanRuleParams |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 870 | tpID := oFsm.actualUniVlanConfigRule.TpID |
| 871 | oFsm.TpIDWaitingFor = tpID |
mpagenko | 551a4d4 | 2020-12-08 18:09:20 +0000 | [diff] [blame] | 872 | loTechProfDone := oFsm.pUniTechProf.getTechProfileDone(ctx, oFsm.pOnuUniPort.uniID, uint8(tpID)) |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 873 | logger.Debugw(ctx, "UniVlanConfigFsm - start with first rule", log.Fields{ |
| 874 | "device-id": oFsm.deviceID, "uni-id": oFsm.pOnuUniPort.uniID, |
| 875 | "set-Vlan": oFsm.actualUniVlanConfigRule.SetVid, "tp-id": tpID, "ProfDone": loTechProfDone}) |
mpagenko | 551a4d4 | 2020-12-08 18:09:20 +0000 | [diff] [blame] | 876 | //cmp also usage in EVTOCDE create in omci_cc |
| 877 | oFsm.evtocdID = macBridgeServiceProfileEID + uint16(oFsm.pOnuUniPort.macBpNo) |
mpagenko | 535d6ef | 2021-02-26 13:15:34 +0000 | [diff] [blame] | 878 | oFsm.mutexFlowParams.Unlock() |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 879 | // Can't call FSM Event directly, decoupling it |
mpagenko | 551a4d4 | 2020-12-08 18:09:20 +0000 | [diff] [blame] | 880 | go func(aPAFsm *AdapterFsm, aTechProfDone bool) { |
| 881 | if aPAFsm != nil && aPAFsm.pFsm != nil { |
| 882 | if aTechProfDone { |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 883 | // let the vlan processing begin |
mpagenko | 551a4d4 | 2020-12-08 18:09:20 +0000 | [diff] [blame] | 884 | _ = aPAFsm.pFsm.Event(vlanEvStartConfig) |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 885 | } else { |
| 886 | // set to waiting for Techprofile |
mpagenko | 551a4d4 | 2020-12-08 18:09:20 +0000 | [diff] [blame] | 887 | _ = aPAFsm.pFsm.Event(vlanEvWaitTechProf) |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 888 | } |
| 889 | } |
mpagenko | 551a4d4 | 2020-12-08 18:09:20 +0000 | [diff] [blame] | 890 | }(pConfigVlanStateAFsm, loTechProfDone) |
| 891 | } else { |
| 892 | logger.Errorw(ctx, "UniVlanConfigFsm abort: invalid FSM pointer", log.Fields{ |
| 893 | "in state": e.FSM.Current(), "device-id": oFsm.deviceID}) |
| 894 | //should never happen, else: recovery would be needed from outside the FSM |
| 895 | return |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 896 | } |
| 897 | } |
| 898 | |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 899 | func (oFsm *UniVlanConfigFsm) enterConfigVtfd(ctx context.Context, e *fsm.Event) { |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 900 | //mutex protection is required for possible concurrent access to FSM members |
| 901 | oFsm.mutexFlowParams.Lock() |
mpagenko | 551a4d4 | 2020-12-08 18:09:20 +0000 | [diff] [blame] | 902 | oFsm.TpIDWaitingFor = 0 //reset indication to avoid misinterpretation |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 903 | if oFsm.actualUniVlanConfigRule.SetVid == uint32(of.OfpVlanId_OFPVID_PRESENT) { |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 904 | // meaning transparent setup - no specific VTFD setting required |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 905 | oFsm.mutexFlowParams.Unlock() |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 906 | logger.Debugw(ctx, "UniVlanConfigFsm: no VTFD config required", log.Fields{ |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 907 | "in state": e.FSM.Current(), "device-id": oFsm.deviceID}) |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 908 | // let the FSM proceed ... (from within this state all internal pointers may be expected to be correct) |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 909 | pConfigVlanStateAFsm := oFsm.pAdaptFsm |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 910 | // Can't call FSM Event directly, decoupling it |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 911 | go func(a_pAFsm *AdapterFsm) { |
Himani Chawla | 4d90833 | 2020-08-31 12:30:20 +0530 | [diff] [blame] | 912 | _ = a_pAFsm.pFsm.Event(vlanEvRxConfigVtfd) |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 913 | }(pConfigVlanStateAFsm) |
| 914 | } else { |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 915 | // This attribute uniquely identifies each instance of this managed entity. Through an identical ID, |
| 916 | // this managed entity is implicitly linked to an instance of the MAC bridge port configuration data ME. |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 917 | vtfdID := macBridgePortAniEID + oFsm.pOnuUniPort.entityID + uint16(oFsm.actualUniVlanConfigRule.TpID) |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 918 | logger.Debugw(ctx, "UniVlanConfigFsm create VTFD", log.Fields{ |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 919 | "EntitytId": strconv.FormatInt(int64(vtfdID), 16), |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 920 | "in state": e.FSM.Current(), "device-id": oFsm.deviceID}) |
| 921 | // setVid is assumed to be masked already by the caller to 12 bit |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 922 | oFsm.vlanFilterList[0] = uint16(oFsm.actualUniVlanConfigRule.SetVid) |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 923 | oFsm.mutexFlowParams.Unlock() |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 924 | vtfdFilterList := make([]uint16, cVtfdTableSize) //needed for parameter serialization |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 925 | vtfdFilterList[0] = oFsm.vlanFilterList[0] |
| 926 | oFsm.numVlanFilterEntries = 1 |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 927 | meParams := me.ParamData{ |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 928 | EntityID: vtfdID, |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 929 | Attributes: me.AttributeValueMap{ |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 930 | "VlanFilterList": vtfdFilterList, //omci lib wants a slice for serialization |
| 931 | "ForwardOperation": uint8(0x10), //VID investigation |
| 932 | "NumberOfEntries": oFsm.numVlanFilterEntries, |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 933 | }, |
| 934 | } |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 935 | logger.Debugw(ctx, "UniVlanConfigFsm sendcreate VTFD", log.Fields{ |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 936 | "in state": e.FSM.Current(), "device-id": oFsm.deviceID}) |
Girish Gowdra | 0b23584 | 2021-03-09 13:06:46 -0800 | [diff] [blame] | 937 | meInstance := oFsm.pOmciCC.sendCreateVtfdVar(log.WithSpanFromContext(context.TODO(), ctx), oFsm.pDeviceHandler.pOpenOnuAc.omciTimeout, true, |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 938 | oFsm.pAdaptFsm.commChan, meParams) |
| 939 | //accept also nil as (error) return value for writing to LastTx |
| 940 | // - this avoids misinterpretation of new received OMCI messages |
| 941 | //TODO!!: refactoring improvement requested, here as an example for [VOL-3457]: |
| 942 | // send shall return (dual format) error code that can be used here for immediate error treatment |
| 943 | // (relevant to all used sendXX() methods in this (and other) FSM's) |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 944 | oFsm.pLastTxMeInstance = meInstance |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 945 | } |
| 946 | } |
| 947 | |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 948 | func (oFsm *UniVlanConfigFsm) enterConfigEvtocd(ctx context.Context, e *fsm.Event) { |
| 949 | logger.Debugw(ctx, "UniVlanConfigFsm - start config EVTOCD loop", log.Fields{ |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 950 | "in state": e.FSM.Current(), "device-id": oFsm.deviceID}) |
mpagenko | f1fc386 | 2021-02-16 10:09:52 +0000 | [diff] [blame] | 951 | oFsm.requestEventOffset = uint8(cDeviceEventOffsetAddWithKvStore) //0 offset for last flow-add activity |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 952 | go func() { |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 953 | //using the first element in the slice because it's the first flow per definition here |
| 954 | errEvto := oFsm.performConfigEvtocdEntries(ctx, 0) |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 955 | //This is correct passing scenario |
| 956 | if errEvto == nil { |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 957 | tpID := oFsm.actualUniVlanConfigRule.TpID |
| 958 | vlanID := oFsm.actualUniVlanConfigRule.SetVid |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 959 | for _, gemPort := range oFsm.pUniTechProf.getMulticastGemPorts(ctx, oFsm.pOnuUniPort.uniID, uint8(tpID)) { |
| 960 | logger.Infow(ctx, "Setting multicast MEs, with first flow", log.Fields{"deviceID": oFsm.deviceID, |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 961 | "techProfile": tpID, "gemPort": gemPort, "vlanID": vlanID, "configuredUniFlow": oFsm.configuredUniFlow}) |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 962 | errCreateAllMulticastME := oFsm.performSettingMulticastME(ctx, tpID, gemPort, |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 963 | vlanID) |
| 964 | if errCreateAllMulticastME != nil { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 965 | logger.Errorw(ctx, "Multicast ME create failed, aborting AniConfig FSM!", |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 966 | log.Fields{"device-id": oFsm.deviceID}) |
| 967 | _ = oFsm.pAdaptFsm.pFsm.Event(vlanEvReset) |
| 968 | } |
| 969 | } |
| 970 | //TODO Possibly insert new state for multicast --> possibly another jira/later time. |
| 971 | _ = oFsm.pAdaptFsm.pFsm.Event(vlanEvRxConfigEvtocd) |
| 972 | } |
| 973 | }() |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 974 | } |
| 975 | |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 976 | func (oFsm *UniVlanConfigFsm) enterVlanConfigDone(ctx context.Context, e *fsm.Event) { |
Holger Hildebrandt | be52384 | 2021-03-10 10:47:18 +0000 | [diff] [blame] | 977 | |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 978 | oFsm.mutexFlowParams.RLock() |
| 979 | defer oFsm.mutexFlowParams.RUnlock() |
| 980 | |
mpagenko | f1fc386 | 2021-02-16 10:09:52 +0000 | [diff] [blame] | 981 | logger.Infow(ctx, "UniVlanConfigFsm config done - checking on more flows", log.Fields{ |
mpagenko | 551a4d4 | 2020-12-08 18:09:20 +0000 | [diff] [blame] | 982 | "in state": e.FSM.Current(), "device-id": oFsm.deviceID, |
| 983 | "overall-uni-rules": oFsm.numUniFlows, "configured-uni-rules": oFsm.configuredUniFlow}) |
| 984 | pConfigVlanStateAFsm := oFsm.pAdaptFsm |
| 985 | if pConfigVlanStateAFsm == nil { |
mpagenko | 551a4d4 | 2020-12-08 18:09:20 +0000 | [diff] [blame] | 986 | logger.Errorw(ctx, "UniVlanConfigFsm abort: invalid FSM pointer", log.Fields{ |
| 987 | "in state": e.FSM.Current(), "device-id": oFsm.deviceID}) |
| 988 | //should never happen, else: recovery would be needed from outside the FSM |
| 989 | return |
| 990 | } |
| 991 | pConfigVlanStateBaseFsm := pConfigVlanStateAFsm.pFsm |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 992 | if len(oFsm.uniRemoveFlowsSlice) > 0 { |
| 993 | //some further flows are to be removed, removal always starts with the first element |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 994 | logger.Debugw(ctx, "UniVlanConfigFsm rule removal from ConfigDone", log.Fields{ |
| 995 | "device-id": oFsm.deviceID, "uni-id": oFsm.pOnuUniPort.uniID, |
| 996 | "tp-id": oFsm.uniRemoveFlowsSlice[0].vlanRuleParams.TpID, |
| 997 | "set-Vlan": oFsm.uniRemoveFlowsSlice[0].vlanRuleParams.SetVid}) |
| 998 | // Can't call FSM Event directly, decoupling it |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 999 | go func(a_pBaseFsm *fsm.FSM) { |
| 1000 | _ = a_pBaseFsm.Event(vlanEvRemFlowConfig) |
| 1001 | }(pConfigVlanStateBaseFsm) |
| 1002 | return |
| 1003 | } |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 1004 | if oFsm.numUniFlows > oFsm.configuredUniFlow { |
Holger Hildebrandt | be52384 | 2021-03-10 10:47:18 +0000 | [diff] [blame] | 1005 | if oFsm.pDeviceHandler.isSkipOnuConfigReconciling() { |
| 1006 | oFsm.configuredUniFlow = oFsm.numUniFlows |
| 1007 | logger.Debugw(ctx, "reconciling - skip enterVlanConfigDone processing", |
| 1008 | log.Fields{"numUniFlows": oFsm.numUniFlows, "configuredUniFlow": oFsm.configuredUniFlow, "device-id": oFsm.deviceID}) |
| 1009 | return |
| 1010 | } |
mpagenko | 551a4d4 | 2020-12-08 18:09:20 +0000 | [diff] [blame] | 1011 | if oFsm.configuredUniFlow == 0 { |
mpagenko | 551a4d4 | 2020-12-08 18:09:20 +0000 | [diff] [blame] | 1012 | // this is a restart with a complete new flow, we can re-use the initial flow config control |
| 1013 | // including the check, if the related techProfile is (still) available (probably also removed in between) |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 1014 | // Can't call FSM Event directly, decoupling it |
mpagenko | 551a4d4 | 2020-12-08 18:09:20 +0000 | [diff] [blame] | 1015 | go func(a_pBaseFsm *fsm.FSM) { |
| 1016 | _ = a_pBaseFsm.Event(vlanEvRenew) |
| 1017 | }(pConfigVlanStateBaseFsm) |
| 1018 | return |
| 1019 | } |
| 1020 | |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 1021 | //some further flows are to be configured |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 1022 | //store the actual rule that shall be worked upon in the following transient states |
| 1023 | oFsm.actualUniVlanConfigRule = oFsm.uniVlanFlowParamsSlice[oFsm.configuredUniFlow].VlanRuleParams |
mpagenko | 551a4d4 | 2020-12-08 18:09:20 +0000 | [diff] [blame] | 1024 | //tpId of the next rule to be configured |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 1025 | tpID := oFsm.actualUniVlanConfigRule.TpID |
mpagenko | 551a4d4 | 2020-12-08 18:09:20 +0000 | [diff] [blame] | 1026 | oFsm.TpIDWaitingFor = tpID |
mpagenko | 551a4d4 | 2020-12-08 18:09:20 +0000 | [diff] [blame] | 1027 | loTechProfDone := oFsm.pUniTechProf.getTechProfileDone(ctx, oFsm.pOnuUniPort.uniID, tpID) |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 1028 | logger.Debugw(ctx, "UniVlanConfigFsm - incremental config request", log.Fields{ |
| 1029 | "device-id": oFsm.deviceID, "uni-id": oFsm.pOnuUniPort.uniID, |
| 1030 | "set-Vlan": oFsm.actualUniVlanConfigRule.SetVid, "tp-id": tpID, "ProfDone": loTechProfDone}) |
| 1031 | // Can't call FSM Event directly, decoupling it |
mpagenko | 551a4d4 | 2020-12-08 18:09:20 +0000 | [diff] [blame] | 1032 | go func(aPBaseFsm *fsm.FSM, aTechProfDone bool) { |
| 1033 | if aTechProfDone { |
| 1034 | // let the vlan processing continue with next rule |
| 1035 | _ = aPBaseFsm.Event(vlanEvIncrFlowConfig) |
| 1036 | } else { |
| 1037 | // set to waiting for Techprofile |
| 1038 | _ = aPBaseFsm.Event(vlanEvWaitTPIncr) |
| 1039 | } |
| 1040 | }(pConfigVlanStateBaseFsm, loTechProfDone) |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 1041 | return |
| 1042 | } |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1043 | logger.Debugw(ctx, "UniVlanConfigFsm - VLAN config done: send dh event notification", log.Fields{ |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1044 | "device-id": oFsm.deviceID}) |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 1045 | // it might appear that some flows are requested also after 'flowPushed' event has been generated ... |
| 1046 | // state transition notification is checked in deviceHandler |
mpagenko | 551a4d4 | 2020-12-08 18:09:20 +0000 | [diff] [blame] | 1047 | // note: 'flowPushed' event is only generated if all 'pending' rules are configured |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1048 | if oFsm.pDeviceHandler != nil { |
mpagenko | fc4f56e | 2020-11-04 17:17:49 +0000 | [diff] [blame] | 1049 | //making use of the add->remove successor enum assumption/definition |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1050 | go oFsm.pDeviceHandler.deviceProcStatusUpdate(ctx, OnuDeviceEvent(uint8(oFsm.requestEvent)+oFsm.requestEventOffset)) |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1051 | } |
| 1052 | } |
| 1053 | |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1054 | func (oFsm *UniVlanConfigFsm) enterConfigIncrFlow(ctx context.Context, e *fsm.Event) { |
Holger Hildebrandt | be52384 | 2021-03-10 10:47:18 +0000 | [diff] [blame] | 1055 | |
| 1056 | if oFsm.pDeviceHandler.isSkipOnuConfigReconciling() { |
| 1057 | logger.Debugw(ctx, "reconciling - skip further processing for incremental flow", |
| 1058 | log.Fields{"fsmState": oFsm.pAdaptFsm.pFsm.Current(), "device-id": oFsm.deviceID}) |
| 1059 | go func(a_pBaseFsm *fsm.FSM) { |
| 1060 | _ = a_pBaseFsm.Event(vlanEvSkipIncFlowConfig) |
| 1061 | }(oFsm.pAdaptFsm.pFsm) |
| 1062 | return |
| 1063 | } |
mpagenko | 15ff4a5 | 2021-03-02 10:09:20 +0000 | [diff] [blame] | 1064 | oFsm.mutexFlowParams.Lock() |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1065 | logger.Debugw(ctx, "UniVlanConfigFsm - start config further incremental flow", log.Fields{ |
Girish Gowdra | 041dcb3 | 2020-11-16 16:54:30 -0800 | [diff] [blame] | 1066 | "in state": e.FSM.Current(), "recent flow-number": oFsm.configuredUniFlow, |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1067 | "device-id": oFsm.deviceID}) |
mpagenko | 551a4d4 | 2020-12-08 18:09:20 +0000 | [diff] [blame] | 1068 | oFsm.TpIDWaitingFor = 0 //reset indication to avoid misinterpretation |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 1069 | |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 1070 | if oFsm.actualUniVlanConfigRule.SetVid == uint32(of.OfpVlanId_OFPVID_PRESENT) { |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 1071 | // meaning transparent setup - no specific VTFD setting required |
| 1072 | oFsm.mutexFlowParams.Unlock() |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1073 | logger.Debugw(ctx, "UniVlanConfigFsm: no VTFD config required", log.Fields{ |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1074 | "in state": e.FSM.Current(), "device-id": oFsm.deviceID}) |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 1075 | } else { |
| 1076 | if oFsm.numVlanFilterEntries == 0 { |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 1077 | // This attribute uniquely identifies each instance of this managed entity. Through an identical ID, |
| 1078 | // this managed entity is implicitly linked to an instance of the MAC bridge port configuration data ME. |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 1079 | vtfdID := macBridgePortAniEID + oFsm.pOnuUniPort.entityID + uint16(oFsm.actualUniVlanConfigRule.TpID) |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 1080 | //no VTFD yet created |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1081 | logger.Debugw(ctx, "UniVlanConfigFsm create VTFD", log.Fields{ |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 1082 | "EntitytId": strconv.FormatInt(int64(vtfdID), 16), |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1083 | "in state": e.FSM.Current(), "device-id": oFsm.deviceID}) |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 1084 | // 'SetVid' below is assumed to be masked already by the caller to 12 bit |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 1085 | oFsm.vlanFilterList[0] = uint16(oFsm.actualUniVlanConfigRule.SetVid) |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 1086 | |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1087 | vtfdFilterList := make([]uint16, cVtfdTableSize) //needed for parameter serialization |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 1088 | vtfdFilterList[0] = oFsm.vlanFilterList[0] |
| 1089 | oFsm.numVlanFilterEntries = 1 |
| 1090 | meParams := me.ParamData{ |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 1091 | EntityID: vtfdID, |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 1092 | Attributes: me.AttributeValueMap{ |
| 1093 | "VlanFilterList": vtfdFilterList, |
| 1094 | "ForwardOperation": uint8(0x10), //VID investigation |
| 1095 | "NumberOfEntries": oFsm.numVlanFilterEntries, |
| 1096 | }, |
| 1097 | } |
Girish Gowdra | 0b23584 | 2021-03-09 13:06:46 -0800 | [diff] [blame] | 1098 | meInstance := oFsm.pOmciCC.sendCreateVtfdVar(log.WithSpanFromContext(context.TODO(), ctx), oFsm.pDeviceHandler.pOpenOnuAc.omciTimeout, true, |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 1099 | oFsm.pAdaptFsm.commChan, meParams) |
| 1100 | //accept also nil as (error) return value for writing to LastTx |
| 1101 | // - this avoids misinterpretation of new received OMCI messages |
| 1102 | //TODO!!: refactoring improvement requested, here as an example for [VOL-3457]: |
| 1103 | // send shall return (dual format) error code that can be used here for immediate error treatment |
| 1104 | // (relevant to all used sendXX() methods in this (and other) FSM's) |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1105 | oFsm.pLastTxMeInstance = meInstance |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 1106 | } else { |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 1107 | // This attribute uniquely identifies each instance of this managed entity. Through an identical ID, |
| 1108 | // this managed entity is implicitly linked to an instance of the MAC bridge port configuration data ME. |
mpagenko | 551a4d4 | 2020-12-08 18:09:20 +0000 | [diff] [blame] | 1109 | vtfdID := macBridgePortAniEID + oFsm.pOnuUniPort.entityID + |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 1110 | uint16(oFsm.actualUniVlanConfigRule.TpID) |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 1111 | |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1112 | logger.Debugw(ctx, "UniVlanConfigFsm set VTFD", log.Fields{ |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 1113 | "EntitytId": strconv.FormatInt(int64(vtfdID), 16), |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1114 | "in state": e.FSM.Current(), "device-id": oFsm.deviceID}) |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 1115 | // setVid is assumed to be masked already by the caller to 12 bit |
| 1116 | oFsm.vlanFilterList[oFsm.numVlanFilterEntries] = |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 1117 | uint16(oFsm.actualUniVlanConfigRule.SetVid) |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1118 | vtfdFilterList := make([]uint16, cVtfdTableSize) //needed for parameter serialization |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 1119 | |
| 1120 | // FIXME: VOL-3685: Issues with resetting a table entry in EVTOCD ME |
| 1121 | // VTFD has to be created afresh with a new entity ID that has the same entity ID as the MBPCD ME for every |
| 1122 | // new vlan associated with a different TP. |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 1123 | vtfdFilterList[0] = uint16(oFsm.actualUniVlanConfigRule.SetVid) |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 1124 | |
| 1125 | oFsm.numVlanFilterEntries++ |
| 1126 | meParams := me.ParamData{ |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 1127 | EntityID: vtfdID, |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 1128 | Attributes: me.AttributeValueMap{ |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 1129 | "VlanFilterList": vtfdFilterList, |
| 1130 | "ForwardOperation": uint8(0x10), //VID investigation |
| 1131 | "NumberOfEntries": oFsm.numVlanFilterEntries, |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 1132 | }, |
| 1133 | } |
Girish Gowdra | 0b23584 | 2021-03-09 13:06:46 -0800 | [diff] [blame] | 1134 | meInstance := oFsm.pOmciCC.sendCreateVtfdVar(log.WithSpanFromContext(context.TODO(), ctx), oFsm.pDeviceHandler.pOpenOnuAc.omciTimeout, true, |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 1135 | oFsm.pAdaptFsm.commChan, meParams) |
| 1136 | //accept also nil as (error) return value for writing to LastTx |
| 1137 | // - this avoids misinterpretation of new received OMCI messages |
| 1138 | //TODO!!: refactoring improvement requested, here as an example for [VOL-3457]: |
| 1139 | // send shall return (dual format) error code that can be used here for immediate error treatment |
| 1140 | // (relevant to all used sendXX() methods in this (and other) FSM's) |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1141 | oFsm.pLastTxMeInstance = meInstance |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 1142 | } |
mpagenko | 15ff4a5 | 2021-03-02 10:09:20 +0000 | [diff] [blame] | 1143 | oFsm.mutexFlowParams.Unlock() |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 1144 | //verify response |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1145 | err := oFsm.waitforOmciResponse(ctx) |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 1146 | if err != nil { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1147 | logger.Errorw(ctx, "VTFD create/set failed, aborting VlanConfig FSM!", |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1148 | log.Fields{"device-id": oFsm.deviceID}) |
mpagenko | fc4f56e | 2020-11-04 17:17:49 +0000 | [diff] [blame] | 1149 | pConfigVlanStateBaseFsm := oFsm.pAdaptFsm.pFsm |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 1150 | // Can't call FSM Event directly, decoupling it |
mpagenko | fc4f56e | 2020-11-04 17:17:49 +0000 | [diff] [blame] | 1151 | go func(a_pBaseFsm *fsm.FSM) { |
| 1152 | _ = a_pBaseFsm.Event(vlanEvReset) |
| 1153 | }(pConfigVlanStateBaseFsm) |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 1154 | return |
| 1155 | } |
| 1156 | } |
mpagenko | 15ff4a5 | 2021-03-02 10:09:20 +0000 | [diff] [blame] | 1157 | oFsm.mutexFlowParams.Lock() |
mpagenko | f1fc386 | 2021-02-16 10:09:52 +0000 | [diff] [blame] | 1158 | oFsm.requestEventOffset = uint8(cDeviceEventOffsetAddWithKvStore) //0 offset for last flow-add activity |
mpagenko | 15ff4a5 | 2021-03-02 10:09:20 +0000 | [diff] [blame] | 1159 | oFsm.mutexFlowParams.Unlock() |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 1160 | go func() { |
mpagenko | 15ff4a5 | 2021-03-02 10:09:20 +0000 | [diff] [blame] | 1161 | oFsm.mutexFlowParams.RLock() |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 1162 | tpID := oFsm.actualUniVlanConfigRule.TpID |
mpagenko | 15ff4a5 | 2021-03-02 10:09:20 +0000 | [diff] [blame] | 1163 | configuredUniFlow := oFsm.configuredUniFlow |
| 1164 | oFsm.mutexFlowParams.RUnlock() |
| 1165 | errEvto := oFsm.performConfigEvtocdEntries(ctx, configuredUniFlow) |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 1166 | //This is correct passing scenario |
| 1167 | if errEvto == nil { |
| 1168 | //TODO Possibly insert new state for multicast --> possibly another jira/later time. |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1169 | for _, gemPort := range oFsm.pUniTechProf.getMulticastGemPorts(ctx, oFsm.pOnuUniPort.uniID, uint8(tpID)) { |
mpagenko | 15ff4a5 | 2021-03-02 10:09:20 +0000 | [diff] [blame] | 1170 | oFsm.mutexFlowParams.RLock() |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 1171 | vlanID := oFsm.actualUniVlanConfigRule.SetVid |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1172 | logger.Infow(ctx, "Setting multicast MEs for additional flows", log.Fields{"deviceID": oFsm.deviceID, |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 1173 | "techProfile": tpID, "gemPort": gemPort, |
| 1174 | "vlanID": vlanID, "configuredUniFlow": oFsm.configuredUniFlow}) |
mpagenko | 15ff4a5 | 2021-03-02 10:09:20 +0000 | [diff] [blame] | 1175 | oFsm.mutexFlowParams.RUnlock() |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1176 | errCreateAllMulticastME := oFsm.performSettingMulticastME(ctx, tpID, gemPort, vlanID) |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 1177 | if errCreateAllMulticastME != nil { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1178 | logger.Errorw(ctx, "Multicast ME create failed, aborting AniConfig FSM!", |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 1179 | log.Fields{"device-id": oFsm.deviceID}) |
| 1180 | _ = oFsm.pAdaptFsm.pFsm.Event(vlanEvReset) |
| 1181 | } |
| 1182 | } |
| 1183 | _ = oFsm.pAdaptFsm.pFsm.Event(vlanEvRxConfigEvtocd) |
| 1184 | } |
| 1185 | }() |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 1186 | } |
| 1187 | |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1188 | func (oFsm *UniVlanConfigFsm) enterRemoveFlow(ctx context.Context, e *fsm.Event) { |
mpagenko | 551a4d4 | 2020-12-08 18:09:20 +0000 | [diff] [blame] | 1189 | oFsm.mutexFlowParams.RLock() |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1190 | logger.Debugw(ctx, "UniVlanConfigFsm - start removing the top remove-flow", log.Fields{ |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1191 | "in state": e.FSM.Current(), "with last cookie": oFsm.uniRemoveFlowsSlice[0].cookie, |
| 1192 | "device-id": oFsm.deviceID}) |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1193 | |
mpagenko | fc4f56e | 2020-11-04 17:17:49 +0000 | [diff] [blame] | 1194 | pConfigVlanStateBaseFsm := oFsm.pAdaptFsm.pFsm |
| 1195 | loAllowSpecificOmciConfig := oFsm.pDeviceHandler.ReadyForSpecificOmciConfig |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1196 | loVlanEntryClear := uint8(0) |
| 1197 | loVlanEntryRmPos := uint8(0x80) //with indication 'invalid' in bit 7 |
| 1198 | //shallow copy is sufficient as no reference variables are used within struct |
| 1199 | loRuleParams := oFsm.uniRemoveFlowsSlice[0].vlanRuleParams |
mpagenko | 551a4d4 | 2020-12-08 18:09:20 +0000 | [diff] [blame] | 1200 | oFsm.mutexFlowParams.RUnlock() |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1201 | logger.Debugw(ctx, "UniVlanConfigFsm - remove-flow parameters are", log.Fields{ |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1202 | "match vid": loRuleParams.MatchVid, "match Pcp": loRuleParams.MatchPcp, |
| 1203 | "set vid": strconv.FormatInt(int64(loRuleParams.SetVid), 16), |
| 1204 | "device-id": oFsm.deviceID}) |
| 1205 | |
| 1206 | if loRuleParams.SetVid == uint32(of.OfpVlanId_OFPVID_PRESENT) { |
| 1207 | // meaning transparent setup - no specific VTFD setting required |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1208 | logger.Debugw(ctx, "UniVlanConfigFsm: no VTFD removal required for transparent flow", log.Fields{ |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1209 | "in state": e.FSM.Current(), "device-id": oFsm.deviceID}) |
| 1210 | } else { |
| 1211 | vtfdFilterList := make([]uint16, cVtfdTableSize) //needed for parameter serialization and 're-copy' |
| 1212 | if oFsm.numVlanFilterEntries == 1 { |
mpagenko | 551a4d4 | 2020-12-08 18:09:20 +0000 | [diff] [blame] | 1213 | vtfdID := macBridgePortAniEID + oFsm.pOnuUniPort.entityID + uint16(loRuleParams.TpID) |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1214 | //only one active VLAN entry (hopefully the SetVID we want to remove - should be, but not verified ..) |
| 1215 | // so we can just delete the VTFD entry |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1216 | logger.Debugw(ctx, "UniVlanConfigFsm: VTFD delete (no more vlan filters)", |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1217 | log.Fields{"current vlan list": oFsm.vlanFilterList, |
| 1218 | "in state": e.FSM.Current(), "device-id": oFsm.deviceID}) |
mpagenko | fc4f56e | 2020-11-04 17:17:49 +0000 | [diff] [blame] | 1219 | loVlanEntryClear = 1 //full VlanFilter clear request |
| 1220 | if loAllowSpecificOmciConfig { //specific OMCI config is expected to work acc. to the device state |
Girish Gowdra | 0b23584 | 2021-03-09 13:06:46 -0800 | [diff] [blame] | 1221 | meInstance := oFsm.pOmciCC.sendDeleteVtfd(log.WithSpanFromContext(context.TODO(), ctx), oFsm.pDeviceHandler.pOpenOnuAc.omciTimeout, true, |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 1222 | oFsm.pAdaptFsm.commChan, vtfdID) |
mpagenko | fc4f56e | 2020-11-04 17:17:49 +0000 | [diff] [blame] | 1223 | oFsm.pLastTxMeInstance = meInstance |
| 1224 | } else { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1225 | logger.Debugw(ctx, "UniVlanConfigFsm delete VTFD OMCI handling skipped based on device state", log.Fields{ |
Holger Hildebrandt | be52384 | 2021-03-10 10:47:18 +0000 | [diff] [blame] | 1226 | "device-id": oFsm.deviceID, "device-state": oFsm.pDeviceHandler.getDeviceReasonString()}) |
mpagenko | fc4f56e | 2020-11-04 17:17:49 +0000 | [diff] [blame] | 1227 | } |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1228 | } else { |
| 1229 | //many VTFD already should exists - find and remove the one concerned by the actual remove rule |
| 1230 | // by updating the VTFD per set command with new valid list |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1231 | logger.Debugw(ctx, "UniVlanConfigFsm: VTFD removal of requested VLAN from the list on OMCI", |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1232 | log.Fields{"current vlan list": oFsm.vlanFilterList, |
| 1233 | "set-vlan": loRuleParams.SetVid, "device-id": oFsm.deviceID}) |
| 1234 | for i := uint8(0); i < oFsm.numVlanFilterEntries; i++ { |
| 1235 | if loRuleParams.SetVid == uint32(oFsm.vlanFilterList[i]) { |
| 1236 | loVlanEntryRmPos = i |
| 1237 | break //abort search |
| 1238 | } |
| 1239 | } |
| 1240 | if loVlanEntryRmPos < cVtfdTableSize { |
mpagenko | 551a4d4 | 2020-12-08 18:09:20 +0000 | [diff] [blame] | 1241 | vtfdID := macBridgePortAniEID + oFsm.pOnuUniPort.entityID + uint16(loRuleParams.TpID) |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1242 | //valid entry was found - to be eclipsed |
| 1243 | loVlanEntryClear = 2 //VlanFilter remove request for a specific entry |
| 1244 | for i := uint8(0); i < oFsm.numVlanFilterEntries; i++ { |
| 1245 | if i < loVlanEntryRmPos { |
| 1246 | vtfdFilterList[i] = oFsm.vlanFilterList[i] //copy original |
| 1247 | } else if i < (cVtfdTableSize - 1) { |
| 1248 | vtfdFilterList[i] = oFsm.vlanFilterList[i+1] //copy successor (including 0 elements) |
| 1249 | } else { |
| 1250 | vtfdFilterList[i] = 0 //set last byte if needed |
| 1251 | } |
| 1252 | } |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1253 | logger.Debugw(ctx, "UniVlanConfigFsm set VTFD", log.Fields{ |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 1254 | "EntitytId": strconv.FormatInt(int64(vtfdID), 16), |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1255 | "new vlan list": vtfdFilterList, "device-id": oFsm.deviceID}) |
| 1256 | |
mpagenko | fc4f56e | 2020-11-04 17:17:49 +0000 | [diff] [blame] | 1257 | if loAllowSpecificOmciConfig { //specific OMCI config is expected to work acc. to the device state |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 1258 | // FIXME: VOL-3685: Issues with resetting a table entry in EVTOCD ME |
Girish Gowdra | 0b23584 | 2021-03-09 13:06:46 -0800 | [diff] [blame] | 1259 | meInstance := oFsm.pOmciCC.sendDeleteVtfd(log.WithSpanFromContext(context.TODO(), ctx), oFsm.pDeviceHandler.pOpenOnuAc.omciTimeout, true, |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 1260 | oFsm.pAdaptFsm.commChan, vtfdID) |
mpagenko | fc4f56e | 2020-11-04 17:17:49 +0000 | [diff] [blame] | 1261 | oFsm.pLastTxMeInstance = meInstance |
| 1262 | } else { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1263 | logger.Debugw(ctx, "UniVlanConfigFsm set VTFD OMCI handling skipped based on device state", log.Fields{ |
Holger Hildebrandt | be52384 | 2021-03-10 10:47:18 +0000 | [diff] [blame] | 1264 | "device-id": oFsm.deviceID, "device-state": oFsm.pDeviceHandler.getDeviceReasonString()}) |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1265 | } |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1266 | } else { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1267 | logger.Warnw(ctx, "UniVlanConfigFsm: requested VLAN for removal not found in list - ignore and continue (no VTFD set)", |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1268 | log.Fields{"device-id": oFsm.deviceID}) |
| 1269 | } |
| 1270 | } |
| 1271 | if loVlanEntryClear > 0 { |
mpagenko | fc4f56e | 2020-11-04 17:17:49 +0000 | [diff] [blame] | 1272 | if loAllowSpecificOmciConfig { //specific OMCI config is expected to work acc. to the device state |
| 1273 | //waiting on response |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1274 | err := oFsm.waitforOmciResponse(ctx) |
mpagenko | fc4f56e | 2020-11-04 17:17:49 +0000 | [diff] [blame] | 1275 | if err != nil { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1276 | logger.Errorw(ctx, "VTFD delete/reset failed, aborting VlanConfig FSM!", |
mpagenko | fc4f56e | 2020-11-04 17:17:49 +0000 | [diff] [blame] | 1277 | log.Fields{"device-id": oFsm.deviceID}) |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 1278 | // Can't call FSM Event directly, decoupling it |
mpagenko | fc4f56e | 2020-11-04 17:17:49 +0000 | [diff] [blame] | 1279 | go func(a_pBaseFsm *fsm.FSM) { |
| 1280 | _ = a_pBaseFsm.Event(vlanEvReset) |
| 1281 | }(pConfigVlanStateBaseFsm) |
| 1282 | return |
| 1283 | } |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1284 | } |
| 1285 | |
mpagenko | 15ff4a5 | 2021-03-02 10:09:20 +0000 | [diff] [blame] | 1286 | oFsm.mutexFlowParams.Lock() |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1287 | if loVlanEntryClear == 1 { |
| 1288 | oFsm.vlanFilterList[0] = 0 //first entry is the only that can contain the previous only-one element |
| 1289 | oFsm.numVlanFilterEntries = 0 |
| 1290 | } else if loVlanEntryClear == 2 { |
| 1291 | // new VlanFilterList should be one entry smaller now - copy from last configured entry |
| 1292 | // this loop now includes the 0 element on previous last valid entry |
| 1293 | for i := uint8(0); i <= oFsm.numVlanFilterEntries; i++ { |
| 1294 | oFsm.vlanFilterList[i] = vtfdFilterList[i] |
| 1295 | } |
| 1296 | oFsm.numVlanFilterEntries-- |
| 1297 | } |
mpagenko | 15ff4a5 | 2021-03-02 10:09:20 +0000 | [diff] [blame] | 1298 | oFsm.mutexFlowParams.Unlock() |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1299 | } |
| 1300 | } |
| 1301 | |
mpagenko | fc4f56e | 2020-11-04 17:17:49 +0000 | [diff] [blame] | 1302 | if loAllowSpecificOmciConfig { //specific OMCI config is expected to work acc. to the device state |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1303 | go oFsm.removeEvtocdEntries(ctx, loRuleParams) |
mpagenko | fc4f56e | 2020-11-04 17:17:49 +0000 | [diff] [blame] | 1304 | } else { |
| 1305 | // OMCI processing is not done, expectation is to have the ONU in some basic config state accordingly |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1306 | logger.Debugw(ctx, "UniVlanConfigFsm remove EVTOCD OMCI handling skipped based on device state", log.Fields{ |
mpagenko | fc4f56e | 2020-11-04 17:17:49 +0000 | [diff] [blame] | 1307 | "device-id": oFsm.deviceID}) |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 1308 | // Can't call FSM Event directly, decoupling it |
mpagenko | fc4f56e | 2020-11-04 17:17:49 +0000 | [diff] [blame] | 1309 | go func(a_pBaseFsm *fsm.FSM) { |
Girish Gowdra | 26a4092 | 2021-01-29 17:14:34 -0800 | [diff] [blame] | 1310 | _ = a_pBaseFsm.Event(vlanEvRemFlowDone, loRuleParams.TpID) |
mpagenko | fc4f56e | 2020-11-04 17:17:49 +0000 | [diff] [blame] | 1311 | }(pConfigVlanStateBaseFsm) |
| 1312 | } |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1313 | } |
| 1314 | |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1315 | func (oFsm *UniVlanConfigFsm) enterVlanCleanupDone(ctx context.Context, e *fsm.Event) { |
Girish Gowdra | 26a4092 | 2021-01-29 17:14:34 -0800 | [diff] [blame] | 1316 | var tpID uint8 |
| 1317 | // Extract the tpID |
| 1318 | if len(e.Args) > 0 { |
| 1319 | tpID = e.Args[0].(uint8) |
| 1320 | logger.Debugw(ctx, "UniVlanConfigFsm - flow removed for tp id", log.Fields{"device-id": oFsm.deviceID, "tpID": e.Args[0].(uint8)}) |
| 1321 | } else { |
| 1322 | logger.Warnw(ctx, "UniVlanConfigFsm - tp id not available", log.Fields{"device-id": oFsm.deviceID}) |
| 1323 | } |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1324 | oFsm.mutexFlowParams.Lock() |
mpagenko | f1fc386 | 2021-02-16 10:09:52 +0000 | [diff] [blame] | 1325 | deletedCookie := oFsm.uniRemoveFlowsSlice[0].cookie |
| 1326 | logger.Debugw(ctx, "UniVlanConfigFsm - removing the removal data", log.Fields{ |
| 1327 | "in state": e.FSM.Current(), "device-id": oFsm.deviceID, |
| 1328 | "removed cookie": deletedCookie, "waitForDeleteCookie": oFsm.delayNewRuleCookie}) |
| 1329 | |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1330 | if len(oFsm.uniRemoveFlowsSlice) <= 1 { |
| 1331 | oFsm.uniRemoveFlowsSlice = nil //reset the slice |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1332 | logger.Debugw(ctx, "UniVlanConfigFsm flow removal - last remove-flow deleted", log.Fields{ |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1333 | "device-id": oFsm.deviceID}) |
| 1334 | } else { |
| 1335 | //cut off the actual flow by slicing out the first element |
| 1336 | oFsm.uniRemoveFlowsSlice = append( |
| 1337 | oFsm.uniRemoveFlowsSlice[:0], |
| 1338 | oFsm.uniRemoveFlowsSlice[1:]...) |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1339 | logger.Debugw(ctx, "UniVlanConfigFsm flow removal - specific flow deleted from data", log.Fields{ |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1340 | "device-id": oFsm.deviceID}) |
| 1341 | } |
| 1342 | oFsm.mutexFlowParams.Unlock() |
| 1343 | |
mpagenko | f1fc386 | 2021-02-16 10:09:52 +0000 | [diff] [blame] | 1344 | oFsm.requestEventOffset = uint8(cDeviceEventOffsetRemoveWithKvStore) //offset for last flow-remove activity (with kvStore request) |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1345 | //return to the basic config verification state |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1346 | pConfigVlanStateAFsm := oFsm.pAdaptFsm |
| 1347 | if pConfigVlanStateAFsm != nil { |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 1348 | // Can't call FSM Event directly, decoupling it |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1349 | go func(a_pAFsm *AdapterFsm) { |
| 1350 | if a_pAFsm != nil && a_pAFsm.pFsm != nil { |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1351 | _ = a_pAFsm.pFsm.Event(vlanEvFlowDataRemoved) |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1352 | } |
| 1353 | }(pConfigVlanStateAFsm) |
| 1354 | } |
Girish Gowdra | 26a4092 | 2021-01-29 17:14:34 -0800 | [diff] [blame] | 1355 | |
| 1356 | oFsm.mutexFlowParams.RLock() |
| 1357 | noOfFlowRem := len(oFsm.uniRemoveFlowsSlice) |
mpagenko | f1fc386 | 2021-02-16 10:09:52 +0000 | [diff] [blame] | 1358 | if deletedCookie == oFsm.delayNewRuleCookie { |
| 1359 | // flush the channel CookieDeleted to ensure it is not lingering from some previous (aborted) activity |
| 1360 | select { |
| 1361 | case <-oFsm.chCookieDeleted: |
| 1362 | logger.Debug(ctx, "flushed CookieDeleted") |
| 1363 | default: |
| 1364 | } |
| 1365 | oFsm.chCookieDeleted <- true // let the waiting AddFlow thread continue |
| 1366 | } |
Girish Gowdra | 26a4092 | 2021-01-29 17:14:34 -0800 | [diff] [blame] | 1367 | oFsm.mutexFlowParams.RUnlock() |
| 1368 | // If all pending flow removes are completed and TP ID is valid, processing any pending TP delete |
| 1369 | if noOfFlowRem == 0 && tpID > 0 { |
| 1370 | logger.Debugw(ctx, "processing pending tp delete", log.Fields{"device-id": oFsm.deviceID, "tpID": tpID}) |
| 1371 | // If we are here then all flows are removed. |
| 1372 | oFsm.pDeviceHandler.ProcessPendingTpDelete(ctx, oFsm.pOnuUniPort, tpID) |
| 1373 | } |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1374 | } |
| 1375 | |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1376 | func (oFsm *UniVlanConfigFsm) enterResetting(ctx context.Context, e *fsm.Event) { |
| 1377 | logger.Debugw(ctx, "UniVlanConfigFsm resetting", log.Fields{"device-id": oFsm.deviceID}) |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1378 | |
| 1379 | pConfigVlanStateAFsm := oFsm.pAdaptFsm |
| 1380 | if pConfigVlanStateAFsm != nil { |
| 1381 | // abort running message processing |
| 1382 | fsmAbortMsg := Message{ |
| 1383 | Type: TestMsg, |
| 1384 | Data: TestMessage{ |
| 1385 | TestMessageVal: AbortMessageProcessing, |
| 1386 | }, |
| 1387 | } |
| 1388 | pConfigVlanStateAFsm.commChan <- fsmAbortMsg |
| 1389 | |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 1390 | //try to restart the FSM to 'disabled' |
| 1391 | // Can't call FSM Event directly, decoupling it |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1392 | go func(a_pAFsm *AdapterFsm) { |
| 1393 | if a_pAFsm != nil && a_pAFsm.pFsm != nil { |
Himani Chawla | 4d90833 | 2020-08-31 12:30:20 +0530 | [diff] [blame] | 1394 | _ = a_pAFsm.pFsm.Event(vlanEvRestart) |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1395 | } |
| 1396 | }(pConfigVlanStateAFsm) |
| 1397 | } |
| 1398 | } |
| 1399 | |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1400 | func (oFsm *UniVlanConfigFsm) enterDisabled(ctx context.Context, e *fsm.Event) { |
| 1401 | logger.Debugw(ctx, "UniVlanConfigFsm enters disabled state", log.Fields{"device-id": oFsm.deviceID}) |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1402 | oFsm.pLastTxMeInstance = nil |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1403 | if oFsm.pDeviceHandler != nil { |
mpagenko | 2418ab0 | 2020-11-12 12:58:06 +0000 | [diff] [blame] | 1404 | //TODO: to clarify with improved error treatment for VlanConfigFsm (timeout,reception) errors |
| 1405 | // current code removes the complete FSM including all flow/rule configuration done so far |
| 1406 | // this might be a bit to much, it would require fully new flow config from rwCore (at least on OnuDown/up) |
| 1407 | // maybe a more sophisticated approach is possible without clearing the data |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 1408 | oFsm.mutexFlowParams.RLock() |
mpagenko | 2418ab0 | 2020-11-12 12:58:06 +0000 | [diff] [blame] | 1409 | if oFsm.clearPersistency { |
| 1410 | //permanently remove possibly stored persistent data |
| 1411 | if len(oFsm.uniVlanFlowParamsSlice) > 0 { |
| 1412 | var emptySlice = make([]uniVlanFlowParams, 0) |
mpagenko | f1fc386 | 2021-02-16 10:09:52 +0000 | [diff] [blame] | 1413 | _ = oFsm.pDeviceHandler.storePersUniFlowConfig(ctx, oFsm.pOnuUniPort.uniID, &emptySlice, true) //ignore errors |
mpagenko | 2418ab0 | 2020-11-12 12:58:06 +0000 | [diff] [blame] | 1414 | } |
| 1415 | } else { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1416 | logger.Debugw(ctx, "UniVlanConfigFsm persistency data not cleared", log.Fields{"device-id": oFsm.deviceID}) |
mpagenko | 2418ab0 | 2020-11-12 12:58:06 +0000 | [diff] [blame] | 1417 | } |
mpagenko | f1fc386 | 2021-02-16 10:09:52 +0000 | [diff] [blame] | 1418 | if oFsm.delayNewRuleCookie != 0 { |
| 1419 | // looks like the waiting AddFlow is stuck |
| 1420 | oFsm.chCookieDeleted <- true // let the waiting AddFlow thread continue/treminate |
| 1421 | } |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 1422 | oFsm.mutexFlowParams.RUnlock() |
mpagenko | 2418ab0 | 2020-11-12 12:58:06 +0000 | [diff] [blame] | 1423 | //request removal of 'reference' in the Handler (completely clear the FSM and its data) |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1424 | go oFsm.pDeviceHandler.RemoveVlanFilterFsm(ctx, oFsm.pOnuUniPort) |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1425 | } |
| 1426 | } |
| 1427 | |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1428 | func (oFsm *UniVlanConfigFsm) processOmciVlanMessages(ctx context.Context) { //ctx context.Context? |
| 1429 | logger.Debugw(ctx, "Start UniVlanConfigFsm Msg processing", log.Fields{"for device-id": oFsm.deviceID}) |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1430 | loop: |
| 1431 | for { |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1432 | // case <-ctx.Done(): |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1433 | // logger.Info(ctx,"MibSync Msg", log.Fields{"Message handling canceled via context for device-id": oFsm.deviceID}) |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1434 | // break loop |
Himani Chawla | 4d90833 | 2020-08-31 12:30:20 +0530 | [diff] [blame] | 1435 | message, ok := <-oFsm.pAdaptFsm.commChan |
| 1436 | if !ok { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1437 | logger.Info(ctx, "UniVlanConfigFsm Rx Msg - could not read from channel", log.Fields{"device-id": oFsm.deviceID}) |
Himani Chawla | 4d90833 | 2020-08-31 12:30:20 +0530 | [diff] [blame] | 1438 | // but then we have to ensure a restart of the FSM as well - as exceptional procedure |
| 1439 | _ = oFsm.pAdaptFsm.pFsm.Event(vlanEvReset) |
| 1440 | break loop |
| 1441 | } |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1442 | logger.Debugw(ctx, "UniVlanConfigFsm Rx Msg", log.Fields{"device-id": oFsm.deviceID}) |
Himani Chawla | 4d90833 | 2020-08-31 12:30:20 +0530 | [diff] [blame] | 1443 | |
| 1444 | switch message.Type { |
| 1445 | case TestMsg: |
| 1446 | msg, _ := message.Data.(TestMessage) |
| 1447 | if msg.TestMessageVal == AbortMessageProcessing { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1448 | logger.Infow(ctx, "UniVlanConfigFsm abort ProcessMsg", log.Fields{"for device-id": oFsm.deviceID}) |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1449 | break loop |
| 1450 | } |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1451 | logger.Warnw(ctx, "UniVlanConfigFsm unknown TestMessage", log.Fields{"device-id": oFsm.deviceID, "MessageVal": msg.TestMessageVal}) |
Himani Chawla | 4d90833 | 2020-08-31 12:30:20 +0530 | [diff] [blame] | 1452 | case OMCI: |
| 1453 | msg, _ := message.Data.(OmciMessage) |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1454 | oFsm.handleOmciVlanConfigMessage(ctx, msg) |
Himani Chawla | 4d90833 | 2020-08-31 12:30:20 +0530 | [diff] [blame] | 1455 | default: |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1456 | logger.Warn(ctx, "UniVlanConfigFsm Rx unknown message", log.Fields{"device-id": oFsm.deviceID, |
Himani Chawla | 4d90833 | 2020-08-31 12:30:20 +0530 | [diff] [blame] | 1457 | "message.Type": message.Type}) |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1458 | } |
| 1459 | } |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1460 | logger.Infow(ctx, "End UniVlanConfigFsm Msg processing", log.Fields{"device-id": oFsm.deviceID}) |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1461 | } |
| 1462 | |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1463 | func (oFsm *UniVlanConfigFsm) handleOmciVlanConfigMessage(ctx context.Context, msg OmciMessage) { |
| 1464 | logger.Debugw(ctx, "Rx OMCI UniVlanConfigFsm Msg", log.Fields{"device-id": oFsm.deviceID, |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1465 | "msgType": msg.OmciMsg.MessageType}) |
| 1466 | |
| 1467 | switch msg.OmciMsg.MessageType { |
| 1468 | case omci.CreateResponseType: |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1469 | { // had to shift that to a method to cope with StaticCodeAnalysis restrictions :-( |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1470 | if err := oFsm.handleOmciCreateResponseMessage(ctx, msg.OmciPacket); err != nil { |
| 1471 | logger.Warnw(ctx, "CreateResponse handling aborted", log.Fields{"err": err}) |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1472 | return |
| 1473 | } |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1474 | } //CreateResponseType |
| 1475 | case omci.SetResponseType: |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1476 | { //leave that here as direct code as most often used |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1477 | msgLayer := (*msg.OmciPacket).Layer(omci.LayerTypeSetResponse) |
| 1478 | if msgLayer == nil { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1479 | logger.Errorw(ctx, "Omci Msg layer could not be detected for SetResponse", |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1480 | log.Fields{"device-id": oFsm.deviceID}) |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1481 | return |
| 1482 | } |
| 1483 | msgObj, msgOk := msgLayer.(*omci.SetResponse) |
| 1484 | if !msgOk { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1485 | logger.Errorw(ctx, "Omci Msg layer could not be assigned for SetResponse", |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1486 | log.Fields{"device-id": oFsm.deviceID}) |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1487 | return |
| 1488 | } |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1489 | logger.Debugw(ctx, "UniVlanConfigFsm SetResponse Data", log.Fields{"device-id": oFsm.deviceID, "data-fields": msgObj}) |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1490 | if msgObj.Result != me.Success { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1491 | logger.Errorw(ctx, "UniVlanConfigFsm Omci SetResponse Error - later: drive FSM to abort state ?", |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1492 | log.Fields{"device-id": oFsm.deviceID, "Error": msgObj.Result}) |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1493 | // possibly force FSM into abort or ignore some errors for some messages? store error for mgmt display? |
| 1494 | return |
| 1495 | } |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1496 | if msgObj.EntityClass == oFsm.pLastTxMeInstance.GetClassID() && |
| 1497 | msgObj.EntityInstance == oFsm.pLastTxMeInstance.GetEntityID() { |
| 1498 | switch oFsm.pLastTxMeInstance.GetName() { |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 1499 | case "VlanTaggingFilterData", "ExtendedVlanTaggingOperationConfigurationData", "MulticastOperationsProfile": |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 1500 | { // let the MultiEntity config proceed by stopping the wait function |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1501 | oFsm.omciMIdsResponseReceived <- true |
| 1502 | } |
| 1503 | } |
| 1504 | } |
| 1505 | } //SetResponseType |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1506 | case omci.DeleteResponseType: |
| 1507 | { // had to shift that to a method to cope with StaticCodeAnalysis restrictions :-( |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1508 | if err := oFsm.handleOmciDeleteResponseMessage(ctx, msg.OmciPacket); err != nil { |
| 1509 | logger.Warnw(ctx, "DeleteResponse handling aborted", log.Fields{"err": err}) |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1510 | return |
| 1511 | } |
| 1512 | } //DeleteResponseType |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1513 | default: |
| 1514 | { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1515 | logger.Errorw(ctx, "Rx OMCI unhandled MsgType", |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1516 | log.Fields{"omciMsgType": msg.OmciMsg.MessageType, "device-id": oFsm.deviceID}) |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1517 | return |
| 1518 | } |
| 1519 | } |
| 1520 | } |
| 1521 | |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1522 | func (oFsm *UniVlanConfigFsm) handleOmciCreateResponseMessage(ctx context.Context, apOmciPacket *gp.Packet) error { |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1523 | msgLayer := (*apOmciPacket).Layer(omci.LayerTypeCreateResponse) |
| 1524 | if msgLayer == nil { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1525 | logger.Errorw(ctx, "Omci Msg layer could not be detected for CreateResponse", |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1526 | log.Fields{"device-id": oFsm.deviceID}) |
| 1527 | return fmt.Errorf("omci msg layer could not be detected for CreateResponse for device-id %x", |
| 1528 | oFsm.deviceID) |
| 1529 | } |
| 1530 | msgObj, msgOk := msgLayer.(*omci.CreateResponse) |
| 1531 | if !msgOk { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1532 | logger.Errorw(ctx, "Omci Msg layer could not be assigned for CreateResponse", |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1533 | log.Fields{"device-id": oFsm.deviceID}) |
| 1534 | return fmt.Errorf("omci msg layer could not be assigned for CreateResponse for device-id %x", |
| 1535 | oFsm.deviceID) |
| 1536 | } |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1537 | logger.Debugw(ctx, "UniVlanConfigFsm CreateResponse Data", log.Fields{"device-id": oFsm.deviceID, "data-fields": msgObj}) |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 1538 | if msgObj.Result != me.Success && msgObj.Result != me.InstanceExists { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1539 | logger.Errorw(ctx, "Omci CreateResponse Error - later: drive FSM to abort state ?", log.Fields{"device-id": oFsm.deviceID, |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1540 | "Error": msgObj.Result}) |
| 1541 | // possibly force FSM into abort or ignore some errors for some messages? store error for mgmt display? |
| 1542 | return fmt.Errorf("omci CreateResponse Error for device-id %x", |
| 1543 | oFsm.deviceID) |
| 1544 | } |
| 1545 | if msgObj.EntityClass == oFsm.pLastTxMeInstance.GetClassID() && |
| 1546 | msgObj.EntityInstance == oFsm.pLastTxMeInstance.GetEntityID() { |
| 1547 | // to satisfy StaticCodeAnalysis I had to move the small processing into a separate method :-( |
| 1548 | switch oFsm.pLastTxMeInstance.GetName() { |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 1549 | case "VlanTaggingFilterData", "MulticastOperationsProfile", |
| 1550 | "MulticastSubscriberConfigInfo", "MacBridgePortConfigurationData", |
| 1551 | "ExtendedVlanTaggingOperationConfigurationData": |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1552 | { |
| 1553 | if oFsm.pAdaptFsm.pFsm.Current() == vlanStConfigVtfd { |
| 1554 | // Only if CreateResponse is received from first flow entry - let the FSM proceed ... |
| 1555 | _ = oFsm.pAdaptFsm.pFsm.Event(vlanEvRxConfigVtfd) |
| 1556 | } else { // let the MultiEntity config proceed by stopping the wait function |
| 1557 | oFsm.omciMIdsResponseReceived <- true |
| 1558 | } |
| 1559 | } |
| 1560 | } |
| 1561 | } |
| 1562 | return nil |
| 1563 | } |
| 1564 | |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1565 | func (oFsm *UniVlanConfigFsm) handleOmciDeleteResponseMessage(ctx context.Context, apOmciPacket *gp.Packet) error { |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1566 | msgLayer := (*apOmciPacket).Layer(omci.LayerTypeDeleteResponse) |
| 1567 | if msgLayer == nil { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1568 | logger.Errorw(ctx, "UniVlanConfigFsm - Omci Msg layer could not be detected for DeleteResponse", |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1569 | log.Fields{"device-id": oFsm.deviceID}) |
| 1570 | return fmt.Errorf("omci msg layer could not be detected for DeleteResponse for device-id %x", |
| 1571 | oFsm.deviceID) |
| 1572 | } |
| 1573 | msgObj, msgOk := msgLayer.(*omci.DeleteResponse) |
| 1574 | if !msgOk { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1575 | logger.Errorw(ctx, "UniVlanConfigFsm - Omci Msg layer could not be assigned for DeleteResponse", |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1576 | log.Fields{"device-id": oFsm.deviceID}) |
| 1577 | return fmt.Errorf("omci msg layer could not be assigned for DeleteResponse for device-id %x", |
| 1578 | oFsm.deviceID) |
| 1579 | } |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1580 | logger.Debugw(ctx, "UniVlanConfigFsm DeleteResponse Data", log.Fields{"device-id": oFsm.deviceID, "data-fields": msgObj}) |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1581 | if msgObj.Result != me.Success { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1582 | logger.Errorw(ctx, "UniVlanConfigFsm - Omci DeleteResponse Error - later: drive FSM to abort state ?", |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1583 | log.Fields{"device-id": oFsm.deviceID, "Error": msgObj.Result}) |
| 1584 | // possibly force FSM into abort or ignore some errors for some messages? store error for mgmt display? |
| 1585 | return fmt.Errorf("omci DeleteResponse Error for device-id %x", |
| 1586 | oFsm.deviceID) |
| 1587 | } |
| 1588 | if msgObj.EntityClass == oFsm.pLastTxMeInstance.GetClassID() && |
| 1589 | msgObj.EntityInstance == oFsm.pLastTxMeInstance.GetEntityID() { |
| 1590 | switch oFsm.pLastTxMeInstance.GetName() { |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 1591 | case "VlanTaggingFilterData", "ExtendedVlanTaggingOperationConfigurationData": |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1592 | { // let the MultiEntity config proceed by stopping the wait function |
| 1593 | oFsm.omciMIdsResponseReceived <- true |
| 1594 | } |
| 1595 | } |
| 1596 | } |
| 1597 | return nil |
| 1598 | } |
| 1599 | |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1600 | func (oFsm *UniVlanConfigFsm) performConfigEvtocdEntries(ctx context.Context, aFlowEntryNo uint8) error { |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 1601 | if aFlowEntryNo == 0 { |
| 1602 | // EthType set only at first flow element |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1603 | // EVTOCD ME is expected to exist at this point already from MIB-Download (with AssociationType/Pointer) |
| 1604 | // we need to extend the configuration by EthType definition and, to be sure, downstream 'inverse' mode |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1605 | logger.Debugw(ctx, "UniVlanConfigFsm Tx Create::EVTOCD", log.Fields{ |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1606 | "EntitytId": strconv.FormatInt(int64(oFsm.evtocdID), 16), |
| 1607 | "i/oEthType": strconv.FormatInt(int64(cDefaultTpid), 16), |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1608 | "device-id": oFsm.deviceID}) |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 1609 | associationType := 2 // default to uniPPTP |
| 1610 | if oFsm.pOnuUniPort.portType == uniVEIP { |
| 1611 | associationType = 10 |
| 1612 | } |
| 1613 | // Create the EVTOCD ME |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1614 | meParams := me.ParamData{ |
| 1615 | EntityID: oFsm.evtocdID, |
| 1616 | Attributes: me.AttributeValueMap{ |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 1617 | "AssociationType": uint8(associationType), |
| 1618 | "AssociatedMePointer": oFsm.pOnuUniPort.entityID, |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1619 | }, |
| 1620 | } |
Girish Gowdra | 0b23584 | 2021-03-09 13:06:46 -0800 | [diff] [blame] | 1621 | meInstance := oFsm.pOmciCC.sendCreateEvtocdVar(context.TODO(), oFsm.pDeviceHandler.pOpenOnuAc.omciTimeout, true, |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1622 | oFsm.pAdaptFsm.commChan, meParams) |
| 1623 | //accept also nil as (error) return value for writing to LastTx |
| 1624 | // - this avoids misinterpretation of new received OMCI messages |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1625 | oFsm.pLastTxMeInstance = meInstance |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1626 | |
| 1627 | //verify response |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1628 | err := oFsm.waitforOmciResponse(ctx) |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1629 | if err != nil { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1630 | logger.Errorw(ctx, "Evtocd create failed, aborting VlanConfig FSM!", |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 1631 | log.Fields{"device-id": oFsm.deviceID}) |
| 1632 | _ = oFsm.pAdaptFsm.pFsm.Event(vlanEvReset) |
| 1633 | return fmt.Errorf("evtocd create failed %s, error %s", oFsm.deviceID, err) |
| 1634 | } |
| 1635 | |
| 1636 | // Set the EVTOCD ME default params |
| 1637 | meParams = me.ParamData{ |
| 1638 | EntityID: oFsm.evtocdID, |
| 1639 | Attributes: me.AttributeValueMap{ |
| 1640 | "InputTpid": uint16(cDefaultTpid), //could be possibly retrieved from flow config one day, by now just like py-code base |
| 1641 | "OutputTpid": uint16(cDefaultTpid), //could be possibly retrieved from flow config one day, by now just like py-code base |
| 1642 | "DownstreamMode": uint8(cDefaultDownstreamMode), |
| 1643 | }, |
| 1644 | } |
Girish Gowdra | 0b23584 | 2021-03-09 13:06:46 -0800 | [diff] [blame] | 1645 | meInstance = oFsm.pOmciCC.sendSetEvtocdVar(log.WithSpanFromContext(context.TODO(), ctx), oFsm.pDeviceHandler.pOpenOnuAc.omciTimeout, true, |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 1646 | oFsm.pAdaptFsm.commChan, meParams) |
| 1647 | //accept also nil as (error) return value for writing to LastTx |
| 1648 | // - this avoids misinterpretation of new received OMCI messages |
| 1649 | oFsm.pLastTxMeInstance = meInstance |
| 1650 | |
| 1651 | //verify response |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1652 | err = oFsm.waitforOmciResponse(ctx) |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 1653 | if err != nil { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1654 | logger.Errorw(ctx, "Evtocd set TPID failed, aborting VlanConfig FSM!", |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1655 | log.Fields{"device-id": oFsm.deviceID}) |
Himani Chawla | 4d90833 | 2020-08-31 12:30:20 +0530 | [diff] [blame] | 1656 | _ = oFsm.pAdaptFsm.pFsm.Event(vlanEvReset) |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 1657 | return fmt.Errorf("evtocd set TPID failed %s, error %s", oFsm.deviceID, err) |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1658 | } |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 1659 | } //first flow element |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1660 | |
mpagenko | 551a4d4 | 2020-12-08 18:09:20 +0000 | [diff] [blame] | 1661 | oFsm.mutexFlowParams.RLock() |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 1662 | if oFsm.actualUniVlanConfigRule.SetVid == uint32(of.OfpVlanId_OFPVID_PRESENT) { |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1663 | //transparent transmission required |
mpagenko | 551a4d4 | 2020-12-08 18:09:20 +0000 | [diff] [blame] | 1664 | oFsm.mutexFlowParams.RUnlock() |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1665 | logger.Debugw(ctx, "UniVlanConfigFsm Tx Set::EVTOCD single tagged transparent rule", log.Fields{ |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1666 | "device-id": oFsm.deviceID}) |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1667 | sliceEvtocdRule := make([]uint8, 16) |
| 1668 | // fill vlan tagging operation table bit fields using network=bigEndian order and using slice offset 0 as highest 'word' |
| 1669 | binary.BigEndian.PutUint32(sliceEvtocdRule[cFilterOuterOffset:], |
| 1670 | cPrioIgnoreTag<<cFilterPrioOffset| // Not an outer-tag rule |
| 1671 | cDoNotFilterVid<<cFilterVidOffset| // Do not filter on outer vid |
| 1672 | cDoNotFilterTPID<<cFilterTpidOffset) // Do not filter on outer TPID field |
| 1673 | |
| 1674 | binary.BigEndian.PutUint32(sliceEvtocdRule[cFilterInnerOffset:], |
| 1675 | cPrioDefaultFilter<<cFilterPrioOffset| // default inner-tag rule |
| 1676 | cDoNotFilterVid<<cFilterVidOffset| // Do not filter on inner vid |
| 1677 | cDoNotFilterTPID<<cFilterTpidOffset| // Do not filter on inner TPID field |
| 1678 | cDoNotFilterEtherType<<cFilterEtherTypeOffset) // Do not filter of EtherType |
| 1679 | |
| 1680 | binary.BigEndian.PutUint32(sliceEvtocdRule[cTreatOuterOffset:], |
| 1681 | 0<<cTreatTTROffset| // Do not pop any tags |
| 1682 | cDoNotAddPrio<<cTreatPrioOffset| // do not add outer tag |
| 1683 | cDontCareVid<<cTreatVidOffset| // Outer VID don't care |
| 1684 | cDontCareTpid<<cTreatTpidOffset) // Outer TPID field don't care |
| 1685 | |
| 1686 | binary.BigEndian.PutUint32(sliceEvtocdRule[cTreatInnerOffset:], |
| 1687 | cDoNotAddPrio<<cTreatPrioOffset| // do not add inner tag |
| 1688 | cDontCareVid<<cTreatVidOffset| // Outer VID don't care |
| 1689 | cSetOutputTpidCopyDei<<cTreatTpidOffset) // Set TPID = 0x8100 |
| 1690 | |
| 1691 | meParams := me.ParamData{ |
| 1692 | EntityID: oFsm.evtocdID, |
| 1693 | Attributes: me.AttributeValueMap{ |
| 1694 | "ReceivedFrameVlanTaggingOperationTable": sliceEvtocdRule, |
| 1695 | }, |
| 1696 | } |
Girish Gowdra | 0b23584 | 2021-03-09 13:06:46 -0800 | [diff] [blame] | 1697 | meInstance := oFsm.pOmciCC.sendSetEvtocdVar(log.WithSpanFromContext(context.TODO(), ctx), oFsm.pDeviceHandler.pOpenOnuAc.omciTimeout, true, |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1698 | oFsm.pAdaptFsm.commChan, meParams) |
| 1699 | //accept also nil as (error) return value for writing to LastTx |
| 1700 | // - this avoids misinterpretation of new received OMCI messages |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1701 | oFsm.pLastTxMeInstance = meInstance |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1702 | |
| 1703 | //verify response |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1704 | err := oFsm.waitforOmciResponse(ctx) |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1705 | if err != nil { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1706 | logger.Errorw(ctx, "Evtocd set transparent singletagged rule failed, aborting VlanConfig FSM!", |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1707 | log.Fields{"device-id": oFsm.deviceID}) |
Himani Chawla | 4d90833 | 2020-08-31 12:30:20 +0530 | [diff] [blame] | 1708 | _ = oFsm.pAdaptFsm.pFsm.Event(vlanEvReset) |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 1709 | return fmt.Errorf("evtocd set transparent singletagged rule failed %s, error %s", oFsm.deviceID, err) |
| 1710 | |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1711 | } |
| 1712 | } else { |
| 1713 | // according to py-code acceptIncrementalEvto program option decides upon stacking or translation scenario |
| 1714 | if oFsm.acceptIncrementalEvtoOption { |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 1715 | matchPcp := oFsm.actualUniVlanConfigRule.MatchPcp |
| 1716 | matchVid := oFsm.actualUniVlanConfigRule.MatchVid |
| 1717 | setPcp := oFsm.actualUniVlanConfigRule.SetPcp |
| 1718 | setVid := oFsm.actualUniVlanConfigRule.SetVid |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1719 | // this defines VID translation scenario: singletagged->singletagged (if not transparent) |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1720 | logger.Debugw(ctx, "UniVlanConfigFsm Tx Set::EVTOCD single tagged translation rule", log.Fields{ |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 1721 | "match-pcp": matchPcp, "match-vid": matchVid, "set-pcp": setPcp, "set-vid:": setVid, "device-id": oFsm.deviceID}) |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1722 | sliceEvtocdRule := make([]uint8, 16) |
| 1723 | // fill vlan tagging operation table bit fields using network=bigEndian order and using slice offset 0 as highest 'word' |
| 1724 | binary.BigEndian.PutUint32(sliceEvtocdRule[cFilterOuterOffset:], |
| 1725 | cPrioIgnoreTag<<cFilterPrioOffset| // Not an outer-tag rule |
| 1726 | cDoNotFilterVid<<cFilterVidOffset| // Do not filter on outer vid |
| 1727 | cDoNotFilterTPID<<cFilterTpidOffset) // Do not filter on outer TPID field |
| 1728 | |
| 1729 | binary.BigEndian.PutUint32(sliceEvtocdRule[cFilterInnerOffset:], |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 1730 | oFsm.actualUniVlanConfigRule.MatchPcp<<cFilterPrioOffset| // either DNFonPrio or ignore tag (default) on innerVLAN |
| 1731 | oFsm.actualUniVlanConfigRule.MatchVid<<cFilterVidOffset| // either DNFonVid or real filter VID |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1732 | cDoNotFilterTPID<<cFilterTpidOffset| // Do not filter on inner TPID field |
| 1733 | cDoNotFilterEtherType<<cFilterEtherTypeOffset) // Do not filter of EtherType |
| 1734 | |
| 1735 | binary.BigEndian.PutUint32(sliceEvtocdRule[cTreatOuterOffset:], |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 1736 | oFsm.actualUniVlanConfigRule.TagsToRemove<<cTreatTTROffset| // either 1 or 0 |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1737 | cDoNotAddPrio<<cTreatPrioOffset| // do not add outer tag |
| 1738 | cDontCareVid<<cTreatVidOffset| // Outer VID don't care |
| 1739 | cDontCareTpid<<cTreatTpidOffset) // Outer TPID field don't care |
| 1740 | |
| 1741 | binary.BigEndian.PutUint32(sliceEvtocdRule[cTreatInnerOffset:], |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 1742 | oFsm.actualUniVlanConfigRule.SetPcp<<cTreatPrioOffset| // as configured in flow |
| 1743 | oFsm.actualUniVlanConfigRule.SetVid<<cTreatVidOffset| //as configured in flow |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1744 | cSetOutputTpidCopyDei<<cTreatTpidOffset) // Set TPID = 0x8100 |
mpagenko | 551a4d4 | 2020-12-08 18:09:20 +0000 | [diff] [blame] | 1745 | oFsm.mutexFlowParams.RUnlock() |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1746 | |
| 1747 | meParams := me.ParamData{ |
| 1748 | EntityID: oFsm.evtocdID, |
| 1749 | Attributes: me.AttributeValueMap{ |
| 1750 | "ReceivedFrameVlanTaggingOperationTable": sliceEvtocdRule, |
| 1751 | }, |
| 1752 | } |
Girish Gowdra | 0b23584 | 2021-03-09 13:06:46 -0800 | [diff] [blame] | 1753 | meInstance := oFsm.pOmciCC.sendSetEvtocdVar(log.WithSpanFromContext(context.TODO(), ctx), oFsm.pDeviceHandler.pOpenOnuAc.omciTimeout, true, |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1754 | oFsm.pAdaptFsm.commChan, meParams) |
| 1755 | //accept also nil as (error) return value for writing to LastTx |
| 1756 | // - this avoids misinterpretation of new received OMCI messages |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1757 | oFsm.pLastTxMeInstance = meInstance |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1758 | |
| 1759 | //verify response |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1760 | err := oFsm.waitforOmciResponse(ctx) |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1761 | if err != nil { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1762 | logger.Errorw(ctx, "Evtocd set singletagged translation rule failed, aborting VlanConfig FSM!", |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1763 | log.Fields{"device-id": oFsm.deviceID}) |
Himani Chawla | 4d90833 | 2020-08-31 12:30:20 +0530 | [diff] [blame] | 1764 | _ = oFsm.pAdaptFsm.pFsm.Event(vlanEvReset) |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 1765 | return fmt.Errorf("evtocd set singletagged translation rule failed %s, error %s", oFsm.deviceID, err) |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1766 | } |
| 1767 | } else { |
| 1768 | //not transparent and not acceptIncrementalEvtoOption untagged/priotagged->singletagged |
| 1769 | { // just for local var's |
| 1770 | // this defines stacking scenario: untagged->singletagged |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1771 | logger.Debugw(ctx, "UniVlanConfigFsm Tx Set::EVTOCD untagged->singletagged rule", log.Fields{ |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1772 | "device-id": oFsm.deviceID}) |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1773 | sliceEvtocdRule := make([]uint8, 16) |
| 1774 | // fill vlan tagging operation table bit fields using network=bigEndian order and using slice offset 0 as highest 'word' |
| 1775 | binary.BigEndian.PutUint32(sliceEvtocdRule[cFilterOuterOffset:], |
| 1776 | cPrioIgnoreTag<<cFilterPrioOffset| // Not an outer-tag rule |
| 1777 | cDoNotFilterVid<<cFilterVidOffset| // Do not filter on outer vid |
| 1778 | cDoNotFilterTPID<<cFilterTpidOffset) // Do not filter on outer TPID field |
| 1779 | |
| 1780 | binary.BigEndian.PutUint32(sliceEvtocdRule[cFilterInnerOffset:], |
| 1781 | cPrioIgnoreTag<<cFilterPrioOffset| // Not an inner-tag rule |
| 1782 | cDoNotFilterVid<<cFilterVidOffset| // Do not filter on inner vid |
| 1783 | cDoNotFilterTPID<<cFilterTpidOffset| // Do not filter on inner TPID field |
| 1784 | cDoNotFilterEtherType<<cFilterEtherTypeOffset) // Do not filter of EtherType |
| 1785 | |
| 1786 | binary.BigEndian.PutUint32(sliceEvtocdRule[cTreatOuterOffset:], |
| 1787 | 0<<cTreatTTROffset| // Do not pop any tags |
| 1788 | cDoNotAddPrio<<cTreatPrioOffset| // do not add outer tag |
| 1789 | cDontCareVid<<cTreatVidOffset| // Outer VID don't care |
| 1790 | cDontCareTpid<<cTreatTpidOffset) // Outer TPID field don't care |
| 1791 | |
| 1792 | binary.BigEndian.PutUint32(sliceEvtocdRule[cTreatInnerOffset:], |
| 1793 | 0<<cTreatPrioOffset| // vlan prio set to 0 |
| 1794 | // (as done in Py code, maybe better option would be setPcp here, which still could be 0?) |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 1795 | oFsm.actualUniVlanConfigRule.SetVid<<cTreatVidOffset| // Outer VID don't care |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1796 | cSetOutputTpidCopyDei<<cTreatTpidOffset) // Set TPID = 0x8100 |
| 1797 | |
mpagenko | 551a4d4 | 2020-12-08 18:09:20 +0000 | [diff] [blame] | 1798 | oFsm.mutexFlowParams.RUnlock() |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1799 | meParams := me.ParamData{ |
| 1800 | EntityID: oFsm.evtocdID, |
| 1801 | Attributes: me.AttributeValueMap{ |
| 1802 | "ReceivedFrameVlanTaggingOperationTable": sliceEvtocdRule, |
| 1803 | }, |
| 1804 | } |
Girish Gowdra | 0b23584 | 2021-03-09 13:06:46 -0800 | [diff] [blame] | 1805 | meInstance := oFsm.pOmciCC.sendSetEvtocdVar(log.WithSpanFromContext(context.TODO(), ctx), oFsm.pDeviceHandler.pOpenOnuAc.omciTimeout, true, |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1806 | oFsm.pAdaptFsm.commChan, meParams) |
| 1807 | //accept also nil as (error) return value for writing to LastTx |
| 1808 | // - this avoids misinterpretation of new received OMCI messages |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1809 | oFsm.pLastTxMeInstance = meInstance |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1810 | |
| 1811 | //verify response |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1812 | err := oFsm.waitforOmciResponse(ctx) |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1813 | if err != nil { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1814 | logger.Errorw(ctx, "Evtocd set untagged->singletagged rule failed, aborting VlanConfig FSM!", |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1815 | log.Fields{"device-id": oFsm.deviceID}) |
Himani Chawla | 4d90833 | 2020-08-31 12:30:20 +0530 | [diff] [blame] | 1816 | _ = oFsm.pAdaptFsm.pFsm.Event(vlanEvReset) |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 1817 | return fmt.Errorf("evtocd set untagged->singletagged rule failed %s, error %s", oFsm.deviceID, err) |
| 1818 | |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1819 | } |
Holger Hildebrandt | 394c552 | 2020-09-11 11:23:01 +0000 | [diff] [blame] | 1820 | } // just for local var's |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1821 | { // just for local var's |
| 1822 | // this defines 'stacking' scenario: priotagged->singletagged |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1823 | logger.Debugw(ctx, "UniVlanConfigFsm Tx Set::EVTOCD priotagged->singletagged rule", log.Fields{ |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1824 | "device-id": oFsm.deviceID}) |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1825 | sliceEvtocdRule := make([]uint8, 16) |
| 1826 | // fill vlan tagging operation table bit fields using network=bigEndian order and using slice offset 0 as highest 'word' |
| 1827 | binary.BigEndian.PutUint32(sliceEvtocdRule[cFilterOuterOffset:], |
| 1828 | cPrioIgnoreTag<<cFilterPrioOffset| // Not an outer-tag rule |
| 1829 | cDoNotFilterVid<<cFilterVidOffset| // Do not filter on outer vid |
| 1830 | cDoNotFilterTPID<<cFilterTpidOffset) // Do not filter on outer TPID field |
| 1831 | |
| 1832 | binary.BigEndian.PutUint32(sliceEvtocdRule[cFilterInnerOffset:], |
| 1833 | cPrioDoNotFilter<<cFilterPrioOffset| // Do not Filter on innerprio |
| 1834 | 0<<cFilterVidOffset| // filter on inner vid 0 (prioTagged) |
| 1835 | cDoNotFilterTPID<<cFilterTpidOffset| // Do not filter on inner TPID field |
| 1836 | cDoNotFilterEtherType<<cFilterEtherTypeOffset) // Do not filter of EtherType |
| 1837 | |
| 1838 | binary.BigEndian.PutUint32(sliceEvtocdRule[cTreatOuterOffset:], |
| 1839 | 1<<cTreatTTROffset| // pop the prio-tag |
| 1840 | cDoNotAddPrio<<cTreatPrioOffset| // do not add outer tag |
| 1841 | cDontCareVid<<cTreatVidOffset| // Outer VID don't care |
| 1842 | cDontCareTpid<<cTreatTpidOffset) // Outer TPID field don't care |
| 1843 | |
mpagenko | 551a4d4 | 2020-12-08 18:09:20 +0000 | [diff] [blame] | 1844 | oFsm.mutexFlowParams.RLock() |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1845 | binary.BigEndian.PutUint32(sliceEvtocdRule[cTreatInnerOffset:], |
| 1846 | cCopyPrioFromInner<<cTreatPrioOffset| // vlan copy from PrioTag |
| 1847 | // (as done in Py code, maybe better option would be setPcp here, which still could be PrioCopy?) |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 1848 | oFsm.actualUniVlanConfigRule.SetVid<<cTreatVidOffset| // Outer VID as configured |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1849 | cSetOutputTpidCopyDei<<cTreatTpidOffset) // Set TPID = 0x8100 |
mpagenko | 551a4d4 | 2020-12-08 18:09:20 +0000 | [diff] [blame] | 1850 | oFsm.mutexFlowParams.RUnlock() |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1851 | |
| 1852 | meParams := me.ParamData{ |
| 1853 | EntityID: oFsm.evtocdID, |
| 1854 | Attributes: me.AttributeValueMap{ |
| 1855 | "ReceivedFrameVlanTaggingOperationTable": sliceEvtocdRule, |
| 1856 | }, |
| 1857 | } |
Girish Gowdra | 0b23584 | 2021-03-09 13:06:46 -0800 | [diff] [blame] | 1858 | meInstance := oFsm.pOmciCC.sendSetEvtocdVar(log.WithSpanFromContext(context.TODO(), ctx), oFsm.pDeviceHandler.pOpenOnuAc.omciTimeout, true, |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1859 | oFsm.pAdaptFsm.commChan, meParams) |
| 1860 | //accept also nil as (error) return value for writing to LastTx |
| 1861 | // - this avoids misinterpretation of new received OMCI messages |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1862 | oFsm.pLastTxMeInstance = meInstance |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1863 | |
| 1864 | //verify response |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1865 | err := oFsm.waitforOmciResponse(ctx) |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1866 | if err != nil { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1867 | logger.Errorw(ctx, "Evtocd set priotagged->singletagged rule failed, aborting VlanConfig FSM!", |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1868 | log.Fields{"device-id": oFsm.deviceID}) |
Himani Chawla | 4d90833 | 2020-08-31 12:30:20 +0530 | [diff] [blame] | 1869 | _ = oFsm.pAdaptFsm.pFsm.Event(vlanEvReset) |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 1870 | return fmt.Errorf("evtocd set priotagged->singletagged rule failed %s, error %s", oFsm.deviceID, err) |
| 1871 | |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1872 | } |
| 1873 | } //just for local var's |
| 1874 | } |
| 1875 | } |
| 1876 | |
mpagenko | fc4f56e | 2020-11-04 17:17:49 +0000 | [diff] [blame] | 1877 | // if Config has been done for all EVTOCD entries let the FSM proceed |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1878 | logger.Debugw(ctx, "EVTOCD set loop finished", log.Fields{"device-id": oFsm.deviceID}) |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1879 | oFsm.configuredUniFlow++ // one (more) flow configured |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 1880 | return nil |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 1881 | } |
| 1882 | |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1883 | func (oFsm *UniVlanConfigFsm) removeEvtocdEntries(ctx context.Context, aRuleParams uniVlanRuleParams) { |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1884 | // configured Input/Output TPID is not modified again - no influence if no filter is applied |
| 1885 | if aRuleParams.SetVid == uint32(of.OfpVlanId_OFPVID_PRESENT) { |
| 1886 | //transparent transmission was set |
| 1887 | //perhaps the config is not needed for removal, |
| 1888 | // but the specific InnerTpid setting is removed in favor of the real default forwarding rule |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1889 | logger.Debugw(ctx, "UniVlanConfigFsm Tx Set::EVTOCD reset to default single tagged rule", log.Fields{ |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1890 | "device-id": oFsm.deviceID}) |
| 1891 | sliceEvtocdRule := make([]uint8, 16) |
| 1892 | // fill vlan tagging operation table bit fields using network=bigEndian order and using slice offset 0 as highest 'word' |
| 1893 | binary.BigEndian.PutUint32(sliceEvtocdRule[cFilterOuterOffset:], |
| 1894 | cPrioIgnoreTag<<cFilterPrioOffset| // Not an outer-tag rule |
| 1895 | cDoNotFilterVid<<cFilterVidOffset| // Do not filter on outer vid |
| 1896 | cDoNotFilterTPID<<cFilterTpidOffset) // Do not filter on outer TPID field |
| 1897 | |
| 1898 | binary.BigEndian.PutUint32(sliceEvtocdRule[cFilterInnerOffset:], |
| 1899 | cPrioDefaultFilter<<cFilterPrioOffset| // default inner-tag rule |
| 1900 | cDoNotFilterVid<<cFilterVidOffset| // Do not filter on inner vid |
| 1901 | cDoNotFilterTPID<<cFilterTpidOffset| // Do not filter on inner TPID field |
| 1902 | cDoNotFilterEtherType<<cFilterEtherTypeOffset) // Do not filter of EtherType |
| 1903 | |
| 1904 | binary.BigEndian.PutUint32(sliceEvtocdRule[cTreatOuterOffset:], |
| 1905 | 0<<cTreatTTROffset| // Do not pop any tags |
| 1906 | cDoNotAddPrio<<cTreatPrioOffset| // do not add outer tag |
| 1907 | cDontCareVid<<cTreatVidOffset| // Outer VID don't care |
| 1908 | cDontCareTpid<<cTreatTpidOffset) // Outer TPID field don't care |
| 1909 | |
| 1910 | binary.BigEndian.PutUint32(sliceEvtocdRule[cTreatInnerOffset:], |
| 1911 | cDoNotAddPrio<<cTreatPrioOffset| // do not add inner tag |
| 1912 | cDontCareVid<<cTreatVidOffset| // Outer VID don't care |
| 1913 | cDontCareTpid<<cTreatTpidOffset) // copy TPID and DEI |
| 1914 | |
| 1915 | meParams := me.ParamData{ |
| 1916 | EntityID: oFsm.evtocdID, |
| 1917 | Attributes: me.AttributeValueMap{ |
| 1918 | "ReceivedFrameVlanTaggingOperationTable": sliceEvtocdRule, |
| 1919 | }, |
| 1920 | } |
Girish Gowdra | 0b23584 | 2021-03-09 13:06:46 -0800 | [diff] [blame] | 1921 | meInstance := oFsm.pOmciCC.sendSetEvtocdVar(log.WithSpanFromContext(context.TODO(), ctx), oFsm.pDeviceHandler.pOpenOnuAc.omciTimeout, true, |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1922 | oFsm.pAdaptFsm.commChan, meParams) |
| 1923 | //accept also nil as (error) return value for writing to LastTx |
| 1924 | // - this avoids misinterpretation of new received OMCI messages |
| 1925 | oFsm.pLastTxMeInstance = meInstance |
| 1926 | |
| 1927 | //verify response |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1928 | err := oFsm.waitforOmciResponse(ctx) |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1929 | if err != nil { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1930 | logger.Errorw(ctx, "Evtocd reset singletagged rule failed, aborting VlanConfig FSM!", |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1931 | log.Fields{"device-id": oFsm.deviceID}) |
| 1932 | _ = oFsm.pAdaptFsm.pFsm.Event(vlanEvReset) |
| 1933 | return |
| 1934 | } |
| 1935 | } else { |
| 1936 | // according to py-code acceptIncrementalEvto program option decides upon stacking or translation scenario |
| 1937 | if oFsm.acceptIncrementalEvtoOption { |
| 1938 | // this defines VID translation scenario: singletagged->singletagged (if not transparent) |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1939 | logger.Debugw(ctx, "UniVlanConfigFsm Tx Set::EVTOCD clear single tagged translation rule", log.Fields{ |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1940 | "device-id": oFsm.deviceID, "match-vlan": aRuleParams.MatchVid}) |
| 1941 | sliceEvtocdRule := make([]uint8, 16) |
| 1942 | // fill vlan tagging operation table bit fields using network=bigEndian order and using slice offset 0 as highest 'word' |
| 1943 | binary.BigEndian.PutUint32(sliceEvtocdRule[cFilterOuterOffset:], |
| 1944 | cPrioIgnoreTag<<cFilterPrioOffset| // Not an outer-tag rule |
| 1945 | cDoNotFilterVid<<cFilterVidOffset| // Do not filter on outer vid |
| 1946 | cDoNotFilterTPID<<cFilterTpidOffset) // Do not filter on outer TPID field |
| 1947 | |
| 1948 | binary.BigEndian.PutUint32(sliceEvtocdRule[cFilterInnerOffset:], |
| 1949 | aRuleParams.MatchPcp<<cFilterPrioOffset| // either DNFonPrio or ignore tag (default) on innerVLAN |
| 1950 | aRuleParams.MatchVid<<cFilterVidOffset| // either DNFonVid or real filter VID |
| 1951 | cDoNotFilterTPID<<cFilterTpidOffset| // Do not filter on inner TPID field |
| 1952 | cDoNotFilterEtherType<<cFilterEtherTypeOffset) // Do not filter of EtherType |
| 1953 | |
| 1954 | // delete indication for the indicated Filter |
| 1955 | binary.BigEndian.PutUint32(sliceEvtocdRule[cTreatOuterOffset:], 0xFFFFFFFF) |
| 1956 | binary.BigEndian.PutUint32(sliceEvtocdRule[cTreatInnerOffset:], 0xFFFFFFFF) |
| 1957 | |
| 1958 | meParams := me.ParamData{ |
| 1959 | EntityID: oFsm.evtocdID, |
| 1960 | Attributes: me.AttributeValueMap{ |
| 1961 | "ReceivedFrameVlanTaggingOperationTable": sliceEvtocdRule, |
| 1962 | }, |
| 1963 | } |
Girish Gowdra | 0b23584 | 2021-03-09 13:06:46 -0800 | [diff] [blame] | 1964 | meInstance := oFsm.pOmciCC.sendSetEvtocdVar(log.WithSpanFromContext(context.TODO(), ctx), oFsm.pDeviceHandler.pOpenOnuAc.omciTimeout, true, |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1965 | oFsm.pAdaptFsm.commChan, meParams) |
| 1966 | //accept also nil as (error) return value for writing to LastTx |
| 1967 | // - this avoids misinterpretation of new received OMCI messages |
| 1968 | oFsm.pLastTxMeInstance = meInstance |
| 1969 | |
| 1970 | //verify response |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1971 | err := oFsm.waitforOmciResponse(ctx) |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1972 | if err != nil { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1973 | logger.Errorw(ctx, "Evtocd clear singletagged translation rule failed, aborting VlanConfig FSM!", |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1974 | log.Fields{"device-id": oFsm.deviceID, "match-vlan": aRuleParams.MatchVid}) |
| 1975 | _ = oFsm.pAdaptFsm.pFsm.Event(vlanEvReset) |
| 1976 | return |
| 1977 | } |
| 1978 | } else { |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 1979 | // VOL-3685 |
| 1980 | // NOTE: With ALPHA ONUs it was seen that just resetting a particular entry in the EVTOCD table |
| 1981 | // and re-configuring a new entry would not work. The old entry is removed and new entry is created |
| 1982 | // indeed, but the traffic landing upstream would carry old vlan sometimes. |
| 1983 | // This is only a WORKAROUND which basically deletes the entire EVTOCD ME and re-creates it again |
| 1984 | // later when the flow is being re-installed. |
| 1985 | // Of course this is applicable to case only where single service (or single tcont) is in use and |
| 1986 | // there is only one service vlan (oFsm.acceptIncrementalEvtoOption is false in this case). |
| 1987 | // Interstingly this problem has not been observed in multi-tcont (or multi-service) scenario (in |
| 1988 | // which case the oFsm.acceptIncrementalEvtoOption is set to true). |
| 1989 | if oFsm.configuredUniFlow == 0 && !oFsm.acceptIncrementalEvtoOption { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 1990 | logger.Debugw(ctx, "UniVlanConfigFsm Tx Remove::EVTOCD", log.Fields{"device-id": oFsm.deviceID}) |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 1991 | // When there are no more EVTOCD vlan configurations on the ONU and acceptIncrementalEvtoOption |
| 1992 | // is not enabled, delete the EVTOCD ME. |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1993 | meParams := me.ParamData{ |
| 1994 | EntityID: oFsm.evtocdID, |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1995 | } |
Girish Gowdra | 0b23584 | 2021-03-09 13:06:46 -0800 | [diff] [blame] | 1996 | meInstance := oFsm.pOmciCC.sendDeleteEvtocd(log.WithSpanFromContext(context.TODO(), ctx), oFsm.pDeviceHandler.pOpenOnuAc.omciTimeout, true, |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 1997 | oFsm.pAdaptFsm.commChan, meParams) |
| 1998 | //accept also nil as (error) return value for writing to LastTx |
| 1999 | // - this avoids misinterpretation of new received OMCI messages |
| 2000 | oFsm.pLastTxMeInstance = meInstance |
| 2001 | |
| 2002 | //verify response |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 2003 | err := oFsm.waitforOmciResponse(ctx) |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 2004 | if err != nil { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 2005 | logger.Errorw(ctx, "Evtocd delete rule failed, aborting VlanConfig FSM!", |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 2006 | log.Fields{"device-id": oFsm.deviceID}) |
| 2007 | _ = oFsm.pAdaptFsm.pFsm.Event(vlanEvReset) |
| 2008 | return |
| 2009 | } |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2010 | } else { |
| 2011 | // NOTE : We should ideally never ether this section when oFsm.acceptIncrementalEvtoOption is set to false |
| 2012 | // This is true for only ATT/DT workflow |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 2013 | logger.Debugw(ctx, "UniVlanConfigFsm: Remove EVTOCD set operation", |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2014 | log.Fields{"configured-flow": oFsm.configuredUniFlow, "incremental-evto": oFsm.acceptIncrementalEvtoOption}) |
| 2015 | //not transparent and not acceptIncrementalEvtoOption: untagged/priotagged->singletagged |
| 2016 | { // just for local var's |
| 2017 | // this defines stacking scenario: untagged->singletagged |
| 2018 | //TODO!! in theory there could be different rules running in setting different PCP/VID'S |
| 2019 | // for untagged/priotagged, last rule wins (and remains the only one), maybe that should be |
| 2020 | // checked already at flow-add (and rejected) - to be observed if such is possible in Voltha |
| 2021 | // delete now assumes there is only one such rule! |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 2022 | logger.Debugw(ctx, "UniVlanConfigFsm Tx Set::EVTOCD reset untagged rule to default", log.Fields{ |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2023 | "device-id": oFsm.deviceID}) |
| 2024 | sliceEvtocdRule := make([]uint8, 16) |
| 2025 | // fill vlan tagging operation table bit fields using network=bigEndian order and using slice offset 0 as highest 'word' |
| 2026 | binary.BigEndian.PutUint32(sliceEvtocdRule[cFilterOuterOffset:], |
| 2027 | cPrioIgnoreTag<<cFilterPrioOffset| // Not an outer-tag rule |
| 2028 | cDoNotFilterVid<<cFilterVidOffset| // Do not filter on outer vid |
| 2029 | cDoNotFilterTPID<<cFilterTpidOffset) // Do not filter on outer TPID field |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 2030 | |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2031 | binary.BigEndian.PutUint32(sliceEvtocdRule[cFilterInnerOffset:], |
| 2032 | cPrioIgnoreTag<<cFilterPrioOffset| // Not an inner-tag rule |
| 2033 | cDoNotFilterVid<<cFilterVidOffset| // Do not filter on inner vid |
| 2034 | cDoNotFilterTPID<<cFilterTpidOffset| // Do not filter on inner TPID field |
| 2035 | cDoNotFilterEtherType<<cFilterEtherTypeOffset) // Do not filter of EtherType |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 2036 | |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2037 | binary.BigEndian.PutUint32(sliceEvtocdRule[cTreatOuterOffset:], |
| 2038 | 0<<cTreatTTROffset| // Do not pop any tags |
| 2039 | cDoNotAddPrio<<cTreatPrioOffset| // do not add outer tag |
| 2040 | cDontCareVid<<cTreatVidOffset| // Outer VID don't care |
| 2041 | cDontCareTpid<<cTreatTpidOffset) // Outer TPID field don't care |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 2042 | |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2043 | binary.BigEndian.PutUint32(sliceEvtocdRule[cTreatInnerOffset:], |
| 2044 | cDoNotAddPrio<<cTreatPrioOffset| // do not add inner tag |
| 2045 | cDontCareVid<<cTreatVidOffset| // Outer VID don't care |
| 2046 | cDontCareTpid<<cTreatTpidOffset) // copy TPID and DEI |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 2047 | |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2048 | meParams := me.ParamData{ |
| 2049 | EntityID: oFsm.evtocdID, |
| 2050 | Attributes: me.AttributeValueMap{ |
| 2051 | "ReceivedFrameVlanTaggingOperationTable": sliceEvtocdRule, |
| 2052 | }, |
| 2053 | } |
Girish Gowdra | 0b23584 | 2021-03-09 13:06:46 -0800 | [diff] [blame] | 2054 | meInstance := oFsm.pOmciCC.sendSetEvtocdVar(context.TODO(), oFsm.pDeviceHandler.pOpenOnuAc.omciTimeout, true, |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2055 | oFsm.pAdaptFsm.commChan, meParams) |
| 2056 | //accept also nil as (error) return value for writing to LastTx |
| 2057 | // - this avoids misinterpretation of new received OMCI messages |
| 2058 | oFsm.pLastTxMeInstance = meInstance |
| 2059 | |
| 2060 | //verify response |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 2061 | err := oFsm.waitforOmciResponse(ctx) |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2062 | if err != nil { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 2063 | logger.Errorw(ctx, "Evtocd reset untagged rule to default failed, aborting VlanConfig FSM!", |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2064 | log.Fields{"device-id": oFsm.deviceID}) |
| 2065 | _ = oFsm.pAdaptFsm.pFsm.Event(vlanEvReset) |
| 2066 | return |
| 2067 | } |
| 2068 | } // just for local var's |
| 2069 | { // just for local var's |
| 2070 | // this defines 'stacking' scenario: priotagged->singletagged |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 2071 | logger.Debugw(ctx, "UniVlanConfigFsm Tx Set::EVTOCD delete priotagged rule", log.Fields{ |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2072 | "device-id": oFsm.deviceID}) |
| 2073 | sliceEvtocdRule := make([]uint8, 16) |
| 2074 | // fill vlan tagging operation table bit fields using network=bigEndian order and using slice offset 0 as highest 'word' |
| 2075 | binary.BigEndian.PutUint32(sliceEvtocdRule[cFilterOuterOffset:], |
| 2076 | cPrioIgnoreTag<<cFilterPrioOffset| // Not an outer-tag rule |
| 2077 | cDoNotFilterVid<<cFilterVidOffset| // Do not filter on outer vid |
| 2078 | cDoNotFilterTPID<<cFilterTpidOffset) // Do not filter on outer TPID field |
| 2079 | |
| 2080 | binary.BigEndian.PutUint32(sliceEvtocdRule[cFilterInnerOffset:], |
| 2081 | cPrioDoNotFilter<<cFilterPrioOffset| // Do not Filter on innerprio |
| 2082 | 0<<cFilterVidOffset| // filter on inner vid 0 (prioTagged) |
| 2083 | cDoNotFilterTPID<<cFilterTpidOffset| // Do not filter on inner TPID field |
| 2084 | cDoNotFilterEtherType<<cFilterEtherTypeOffset) // Do not filter of EtherType |
| 2085 | |
| 2086 | // delete indication for the indicated Filter |
| 2087 | binary.BigEndian.PutUint32(sliceEvtocdRule[cTreatOuterOffset:], 0xFFFFFFFF) |
| 2088 | binary.BigEndian.PutUint32(sliceEvtocdRule[cTreatInnerOffset:], 0xFFFFFFFF) |
| 2089 | |
| 2090 | meParams := me.ParamData{ |
| 2091 | EntityID: oFsm.evtocdID, |
| 2092 | Attributes: me.AttributeValueMap{ |
| 2093 | "ReceivedFrameVlanTaggingOperationTable": sliceEvtocdRule, |
| 2094 | }, |
| 2095 | } |
Girish Gowdra | 0b23584 | 2021-03-09 13:06:46 -0800 | [diff] [blame] | 2096 | meInstance := oFsm.pOmciCC.sendSetEvtocdVar(log.WithSpanFromContext(context.TODO(), ctx), oFsm.pDeviceHandler.pOpenOnuAc.omciTimeout, true, |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2097 | oFsm.pAdaptFsm.commChan, meParams) |
| 2098 | //accept also nil as (error) return value for writing to LastTx |
| 2099 | // - this avoids misinterpretation of new received OMCI messages |
| 2100 | oFsm.pLastTxMeInstance = meInstance |
| 2101 | |
| 2102 | //verify response |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 2103 | err := oFsm.waitforOmciResponse(ctx) |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2104 | if err != nil { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 2105 | logger.Errorw(ctx, "Evtocd delete priotagged rule failed, aborting VlanConfig FSM!", |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2106 | log.Fields{"device-id": oFsm.deviceID}) |
| 2107 | _ = oFsm.pAdaptFsm.pFsm.Event(vlanEvReset) |
| 2108 | return |
| 2109 | } |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 2110 | } |
| 2111 | } //just for local var's |
| 2112 | } |
| 2113 | } |
| 2114 | |
mpagenko | fc4f56e | 2020-11-04 17:17:49 +0000 | [diff] [blame] | 2115 | // if Config has been done for all EVTOCD entries let the FSM proceed |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 2116 | logger.Debugw(ctx, "EVTOCD filter remove loop finished", log.Fields{"device-id": oFsm.deviceID}) |
Girish Gowdra | 26a4092 | 2021-01-29 17:14:34 -0800 | [diff] [blame] | 2117 | _ = oFsm.pAdaptFsm.pFsm.Event(vlanEvRemFlowDone, aRuleParams.TpID) |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 2118 | } |
| 2119 | |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 2120 | func (oFsm *UniVlanConfigFsm) waitforOmciResponse(ctx context.Context) error { |
mpagenko | 7d6bb02 | 2021-03-11 15:07:55 +0000 | [diff] [blame] | 2121 | oFsm.mutexIsAwaitingResponse.Lock() |
| 2122 | oFsm.isAwaitingResponse = true |
| 2123 | oFsm.mutexIsAwaitingResponse.Unlock() |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 2124 | select { |
Himani Chawla | 26e555c | 2020-08-31 12:30:20 +0530 | [diff] [blame] | 2125 | // maybe be also some outside cancel (but no context modeled for the moment ...) |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 2126 | // case <-ctx.Done(): |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 2127 | // logger.Infow(ctx,"LockState-bridge-init message reception canceled", log.Fields{"for device-id": oFsm.deviceID}) |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 2128 | case <-time.After(30 * time.Second): //AS FOR THE OTHER OMCI FSM's |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 2129 | logger.Warnw(ctx, "UniVlanConfigFsm multi entity timeout", log.Fields{"for device-id": oFsm.deviceID}) |
mpagenko | 7d6bb02 | 2021-03-11 15:07:55 +0000 | [diff] [blame] | 2130 | oFsm.mutexIsAwaitingResponse.Lock() |
| 2131 | oFsm.isAwaitingResponse = false |
| 2132 | oFsm.mutexIsAwaitingResponse.Unlock() |
mpagenko | 01e726e | 2020-10-23 09:45:29 +0000 | [diff] [blame] | 2133 | return fmt.Errorf("uniVlanConfigFsm multi entity timeout %s", oFsm.deviceID) |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 2134 | case success := <-oFsm.omciMIdsResponseReceived: |
Himani Chawla | 4d90833 | 2020-08-31 12:30:20 +0530 | [diff] [blame] | 2135 | if success { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 2136 | logger.Debug(ctx, "UniVlanConfigFsm multi entity response received") |
mpagenko | 7d6bb02 | 2021-03-11 15:07:55 +0000 | [diff] [blame] | 2137 | oFsm.mutexIsAwaitingResponse.Lock() |
| 2138 | oFsm.isAwaitingResponse = false |
| 2139 | oFsm.mutexIsAwaitingResponse.Unlock() |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 2140 | return nil |
| 2141 | } |
mpagenko | 7d6bb02 | 2021-03-11 15:07:55 +0000 | [diff] [blame] | 2142 | // waiting was aborted (probably on external request) |
| 2143 | logger.Debugw(ctx, "UniVlanConfigFsm wait for multi entity response aborted", log.Fields{"for device-id": oFsm.deviceID}) |
| 2144 | oFsm.mutexIsAwaitingResponse.Lock() |
| 2145 | oFsm.isAwaitingResponse = false |
| 2146 | oFsm.mutexIsAwaitingResponse.Unlock() |
| 2147 | return fmt.Errorf(cErrWaitAborted) |
mpagenko | dff5dda | 2020-08-28 11:52:01 +0000 | [diff] [blame] | 2148 | } |
| 2149 | } |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2150 | |
mpagenko | 551a4d4 | 2020-12-08 18:09:20 +0000 | [diff] [blame] | 2151 | func (oFsm *UniVlanConfigFsm) performSettingMulticastME(ctx context.Context, tpID uint8, multicastGemPortID uint16, vlanID uint32) error { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 2152 | logger.Debugw(ctx, "Setting Multicast MEs", log.Fields{"device-id": oFsm.deviceID, "tpID": tpID, |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2153 | "multicastGemPortID": multicastGemPortID, "vlanID": vlanID}) |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 2154 | errCreateMOP := oFsm.performCreatingMulticastOperationProfile(ctx) |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2155 | if errCreateMOP != nil { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 2156 | logger.Errorw(ctx, "MulticastOperationProfile create failed, aborting AniConfig FSM!", |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2157 | log.Fields{"device-id": oFsm.deviceID}) |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 2158 | _ = oFsm.pAdaptFsm.pFsm.Event(vlanEvReset) |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2159 | return fmt.Errorf("creatingMulticastSubscriberConfigInfo responseError %s, error %s", oFsm.deviceID, errCreateMOP) |
| 2160 | } |
| 2161 | |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 2162 | errSettingMOP := oFsm.performSettingMulticastOperationProfile(ctx, multicastGemPortID, vlanID) |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2163 | if errSettingMOP != nil { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 2164 | logger.Errorw(ctx, "MulticastOperationProfile setting failed, aborting AniConfig FSM!", |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2165 | log.Fields{"device-id": oFsm.deviceID}) |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 2166 | _ = oFsm.pAdaptFsm.pFsm.Event(vlanEvReset) |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2167 | return fmt.Errorf("creatingMulticastSubscriberConfigInfo responseError %s, error %s", oFsm.deviceID, errSettingMOP) |
| 2168 | } |
| 2169 | |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 2170 | errCreateMSCI := oFsm.performCreatingMulticastSubscriberConfigInfo(ctx) |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2171 | if errCreateMSCI != nil { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 2172 | logger.Errorw(ctx, "MulticastOperationProfile setting failed, aborting AniConfig FSM!", |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2173 | log.Fields{"device-id": oFsm.deviceID}) |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 2174 | _ = oFsm.pAdaptFsm.pFsm.Event(vlanEvReset) |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2175 | return fmt.Errorf("creatingMulticastSubscriberConfigInfo responseError %s, error %s", oFsm.deviceID, errCreateMSCI) |
| 2176 | } |
| 2177 | |
| 2178 | meParams := me.ParamData{ |
| 2179 | EntityID: macBridgeServiceProfileEID + uint16(oFsm.pOnuUniPort.macBpNo), |
| 2180 | Attributes: me.AttributeValueMap{ |
| 2181 | "BridgeIdPointer": macBridgeServiceProfileEID + uint16(oFsm.pOnuUniPort.macBpNo), |
| 2182 | "PortNum": 0xf0, //fixed unique ANI side indication |
| 2183 | "TpType": 6, //MCGemIWTP |
| 2184 | "TpPointer": multicastGemPortID, |
| 2185 | }, |
| 2186 | } |
Girish Gowdra | 0b23584 | 2021-03-09 13:06:46 -0800 | [diff] [blame] | 2187 | meInstance := oFsm.pOmciCC.sendCreateMBPConfigDataVar(context.TODO(), oFsm.pDeviceHandler.pOpenOnuAc.omciTimeout, true, |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2188 | oFsm.pAdaptFsm.commChan, meParams) |
| 2189 | //accept also nil as (error) return value for writing to LastTx |
| 2190 | // - this avoids misinterpretation of new received OMCI messages |
| 2191 | oFsm.pLastTxMeInstance = meInstance |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 2192 | err := oFsm.waitforOmciResponse(ctx) |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2193 | if err != nil { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 2194 | logger.Errorw(ctx, "CreateMBPConfigData failed, aborting AniConfig FSM!", |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2195 | log.Fields{"device-id": oFsm.deviceID, "MBPConfigDataID": macBridgeServiceProfileEID}) |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 2196 | _ = oFsm.pAdaptFsm.pFsm.Event(vlanEvReset) |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2197 | return fmt.Errorf("creatingMulticastSubscriberConfigInfo responseError %s, error %s", oFsm.deviceID, err) |
| 2198 | } |
| 2199 | |
| 2200 | // ==> Start creating VTFD for mcast vlan |
| 2201 | |
| 2202 | // This attribute uniquely identifies each instance of this managed entity. Through an identical ID, |
| 2203 | // this managed entity is implicitly linked to an instance of the MAC bridge port configuration data ME. |
| 2204 | mcastVtfdID := macBridgeServiceProfileEID + uint16(oFsm.pOnuUniPort.macBpNo) |
| 2205 | |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 2206 | logger.Debugw(ctx, "UniVlanConfigFsm set VTFD for mcast", log.Fields{ |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2207 | "EntitytId": strconv.FormatInt(int64(mcastVtfdID), 16), "mcastVlanID": vlanID, |
| 2208 | "in state": oFsm.pAdaptFsm.pFsm.Current(), "device-id": oFsm.deviceID}) |
| 2209 | vtfdFilterList := make([]uint16, cVtfdTableSize) //needed for parameter serialization |
| 2210 | |
| 2211 | // FIXME: VOL-3685: Issues with resetting a table entry in EVTOCD ME |
| 2212 | // VTFD has to be created afresh with a new entity ID that has the same entity ID as the MBPCD ME for every |
| 2213 | // new vlan associated with a different TP. |
| 2214 | vtfdFilterList[0] = uint16(vlanID) |
| 2215 | |
| 2216 | meParams = me.ParamData{ |
| 2217 | EntityID: mcastVtfdID, |
| 2218 | Attributes: me.AttributeValueMap{ |
| 2219 | "VlanFilterList": vtfdFilterList, |
| 2220 | "ForwardOperation": uint8(0x10), //VID investigation |
| 2221 | "NumberOfEntries": oFsm.numVlanFilterEntries, |
| 2222 | }, |
| 2223 | } |
Girish Gowdra | 0b23584 | 2021-03-09 13:06:46 -0800 | [diff] [blame] | 2224 | meInstance = oFsm.pOmciCC.sendCreateVtfdVar(context.TODO(), oFsm.pDeviceHandler.pOpenOnuAc.omciTimeout, true, |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2225 | oFsm.pAdaptFsm.commChan, meParams) |
| 2226 | oFsm.pLastTxMeInstance = meInstance |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 2227 | err = oFsm.waitforOmciResponse(ctx) |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2228 | if err != nil { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 2229 | logger.Errorw(ctx, "CreateMcastVlanFilterData failed, aborting AniConfig FSM!", |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2230 | log.Fields{"device-id": oFsm.deviceID, "mcastVtfdID": mcastVtfdID}) |
mpagenko | 9a304ea | 2020-12-16 15:54:01 +0000 | [diff] [blame] | 2231 | _ = oFsm.pAdaptFsm.pFsm.Event(vlanEvReset) |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2232 | return fmt.Errorf("createMcastVlanFilterData responseError %s, error %s", oFsm.deviceID, err) |
| 2233 | } |
| 2234 | |
| 2235 | return nil |
| 2236 | } |
| 2237 | |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 2238 | func (oFsm *UniVlanConfigFsm) performCreatingMulticastSubscriberConfigInfo(ctx context.Context) error { |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2239 | instID, err := oFsm.pDeviceHandler.getUniPortMEEntityID(oFsm.pOnuUniPort.portNo) |
| 2240 | if err != nil { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 2241 | logger.Errorw(ctx, "error fetching uni port me instance", |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2242 | log.Fields{"device-id": oFsm.deviceID, "portNo": oFsm.pOnuUniPort.portNo}) |
| 2243 | return err |
| 2244 | } |
ozgecanetsia | 5c88b76 | 2021-03-23 10:27:15 +0300 | [diff] [blame] | 2245 | instID += macBridgePortAniEID |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2246 | meParams := me.ParamData{ |
| 2247 | EntityID: instID, |
| 2248 | Attributes: me.AttributeValueMap{ |
| 2249 | "MeType": 0, |
| 2250 | //Direct reference to the Operation profile |
| 2251 | //TODO ANI side used on UNI side, not the clearest option. |
ozgecanetsia | 5c88b76 | 2021-03-23 10:27:15 +0300 | [diff] [blame] | 2252 | "MulticastOperationsProfilePointer": instID, |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2253 | }, |
| 2254 | } |
Girish Gowdra | 0b23584 | 2021-03-09 13:06:46 -0800 | [diff] [blame] | 2255 | meInstance := oFsm.pOmciCC.sendCreateMulticastSubConfigInfoVar(context.TODO(), oFsm.pDeviceHandler.pOpenOnuAc.omciTimeout, true, |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2256 | oFsm.pAdaptFsm.commChan, meParams) |
| 2257 | //accept also nil as (error) return value for writing to LastTx |
| 2258 | // - this avoids misinterpretation of new received OMCI messages |
| 2259 | oFsm.pLastTxMeInstance = meInstance |
| 2260 | //verify response |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 2261 | err = oFsm.waitforOmciResponse(ctx) |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2262 | if err != nil { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 2263 | logger.Errorw(ctx, "CreateMulticastSubConfigInfo create failed, aborting AniConfig FSM!", |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2264 | log.Fields{"device-id": oFsm.deviceID, "MulticastSubConfigInfo": instID}) |
| 2265 | return fmt.Errorf("creatingMulticastSubscriberConfigInfo responseError %s", oFsm.deviceID) |
| 2266 | } |
| 2267 | return nil |
| 2268 | } |
| 2269 | |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 2270 | func (oFsm *UniVlanConfigFsm) performCreatingMulticastOperationProfile(ctx context.Context) error { |
ozgecanetsia | 5c88b76 | 2021-03-23 10:27:15 +0300 | [diff] [blame] | 2271 | instID, err := oFsm.pDeviceHandler.getUniPortMEEntityID(oFsm.pOnuUniPort.portNo) |
| 2272 | if err != nil { |
| 2273 | logger.Errorw(ctx, "error fetching uni port me instance", |
| 2274 | log.Fields{"device-id": oFsm.deviceID, "portNo": oFsm.pOnuUniPort.portNo}) |
| 2275 | return err |
| 2276 | } |
| 2277 | instID += macBridgePortAniEID |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2278 | meParams := me.ParamData{ |
| 2279 | EntityID: instID, |
| 2280 | Attributes: me.AttributeValueMap{ |
| 2281 | "IgmpVersion": 2, |
| 2282 | "IgmpFunction": 0, |
| 2283 | //0 means false |
| 2284 | "ImmediateLeave": 0, |
| 2285 | "Robustness": 2, |
| 2286 | "QuerierIp": 0, |
| 2287 | "QueryInterval": 125, |
| 2288 | "QuerierMaxResponseTime": 100, |
| 2289 | "LastMemberResponseTime": 10, |
| 2290 | //0 means false |
| 2291 | "UnauthorizedJoinBehaviour": 0, |
| 2292 | }, |
| 2293 | } |
Girish Gowdra | 0b23584 | 2021-03-09 13:06:46 -0800 | [diff] [blame] | 2294 | meInstance := oFsm.pOmciCC.sendCreateMulticastOperationProfileVar(context.TODO(), oFsm.pDeviceHandler.pOpenOnuAc.omciTimeout, true, |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2295 | oFsm.pAdaptFsm.commChan, meParams) |
| 2296 | //accept also nil as (error) return value for writing to LastTx |
| 2297 | // - this avoids misinterpretation of new received OMCI messages |
| 2298 | oFsm.pLastTxMeInstance = meInstance |
| 2299 | //verify response |
ozgecanetsia | 5c88b76 | 2021-03-23 10:27:15 +0300 | [diff] [blame] | 2300 | err = oFsm.waitforOmciResponse(ctx) |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2301 | if err != nil { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 2302 | logger.Errorw(ctx, "CreateMulticastOperationProfile create failed, aborting AniConfig FSM!", |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2303 | log.Fields{"device-id": oFsm.deviceID, "MulticastOperationProfileID": instID}) |
| 2304 | return fmt.Errorf("createMulticastOperationProfile responseError %s", oFsm.deviceID) |
| 2305 | } |
| 2306 | return nil |
| 2307 | } |
| 2308 | |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 2309 | func (oFsm *UniVlanConfigFsm) performSettingMulticastOperationProfile(ctx context.Context, multicastGemPortID uint16, vlanID uint32) error { |
ozgecanetsia | 5c88b76 | 2021-03-23 10:27:15 +0300 | [diff] [blame] | 2310 | instID, err := oFsm.pDeviceHandler.getUniPortMEEntityID(oFsm.pOnuUniPort.portNo) |
| 2311 | if err != nil { |
| 2312 | logger.Errorw(ctx, "error fetching uni port me instance", |
| 2313 | log.Fields{"device-id": oFsm.deviceID, "portNo": oFsm.pOnuUniPort.portNo}) |
| 2314 | return err |
| 2315 | } |
| 2316 | instID += macBridgePortAniEID |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2317 | //TODO check that this is correct |
| 2318 | // Table control |
| 2319 | //setCtrl = 1 |
| 2320 | //rowPartId = 0 |
| 2321 | //test = 0 |
| 2322 | //rowKey = 0 |
| 2323 | tableCtrlStr := "0100000000000000" |
| 2324 | tableCtrl := AsByteSlice(tableCtrlStr) |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2325 | dynamicAccessCL := make([]uint8, 24) |
| 2326 | copy(dynamicAccessCL, tableCtrl) |
| 2327 | //Multicast GemPortId |
| 2328 | binary.BigEndian.PutUint16(dynamicAccessCL[2:], multicastGemPortID) |
| 2329 | // python version waits for installation of flows, see line 723 onward of |
| 2330 | // brcm_openomci_onu_handler.py |
| 2331 | binary.BigEndian.PutUint16(dynamicAccessCL[4:], uint16(vlanID)) |
| 2332 | //Source IP all to 0 |
| 2333 | binary.BigEndian.PutUint32(dynamicAccessCL[6:], IPToInt32(net.IPv4(0, 0, 0, 0))) |
| 2334 | //TODO start and end are hardcoded, get from TP |
| 2335 | // Destination IP address start of range |
| 2336 | binary.BigEndian.PutUint32(dynamicAccessCL[10:], IPToInt32(net.IPv4(225, 0, 0, 0))) |
| 2337 | // Destination IP address end of range |
| 2338 | binary.BigEndian.PutUint32(dynamicAccessCL[14:], IPToInt32(net.IPv4(239, 255, 255, 255))) |
| 2339 | //imputed group bandwidth |
| 2340 | binary.BigEndian.PutUint16(dynamicAccessCL[18:], 0) |
| 2341 | |
| 2342 | meParams := me.ParamData{ |
| 2343 | EntityID: instID, |
| 2344 | Attributes: me.AttributeValueMap{ |
| 2345 | "DynamicAccessControlListTable": dynamicAccessCL, |
| 2346 | }, |
| 2347 | } |
Girish Gowdra | 0b23584 | 2021-03-09 13:06:46 -0800 | [diff] [blame] | 2348 | meInstance := oFsm.pOmciCC.sendSetMulticastOperationProfileVar(context.TODO(), oFsm.pDeviceHandler.pOpenOnuAc.omciTimeout, true, |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2349 | oFsm.pAdaptFsm.commChan, meParams) |
| 2350 | //accept also nil as (error) return value for writing to LastTx |
| 2351 | // - this avoids misinterpretation of new received OMCI messages |
| 2352 | oFsm.pLastTxMeInstance = meInstance |
| 2353 | //verify response |
ozgecanetsia | 5c88b76 | 2021-03-23 10:27:15 +0300 | [diff] [blame] | 2354 | err = oFsm.waitforOmciResponse(ctx) |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2355 | if err != nil { |
dbainbri | 4d3a0dc | 2020-12-02 00:33:42 +0000 | [diff] [blame] | 2356 | logger.Errorw(ctx, "CreateMulticastOperationProfile create failed, aborting AniConfig FSM!", |
ozgecanetsia | b5000ef | 2020-11-27 14:38:20 +0300 | [diff] [blame] | 2357 | log.Fields{"device-id": oFsm.deviceID, "MulticastOperationProfileID": instID}) |
| 2358 | return fmt.Errorf("createMulticastOperationProfile responseError %s", oFsm.deviceID) |
| 2359 | } |
| 2360 | return nil |
| 2361 | } |
Girish Gowdra | 26a4092 | 2021-01-29 17:14:34 -0800 | [diff] [blame] | 2362 | |
| 2363 | // IsFlowRemovePending returns true if there are pending flows to remove, else false. |
| 2364 | func (oFsm *UniVlanConfigFsm) IsFlowRemovePending() bool { |
| 2365 | oFsm.mutexFlowParams.RLock() |
| 2366 | defer oFsm.mutexFlowParams.RUnlock() |
| 2367 | return len(oFsm.uniRemoveFlowsSlice) > 0 |
| 2368 | } |