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