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