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