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