[VOL-3837] Checking that OnuId, AllocId and GemPorts are unique per PON
Validate that received flow carry valid GemPortId and AllocIds
Change-Id: I1b8928c7a9e580c9711f61320595a449df7c30f5
diff --git a/internal/common/omci/create.go b/internal/common/omci/create.go
index c1e2b0b..d3c88b3 100644
--- a/internal/common/omci/create.go
+++ b/internal/common/omci/create.go
@@ -42,7 +42,7 @@
return msgObj, nil
}
-func CreateCreateResponse(omciPkt gopacket.Packet, omciMsg *omci.OMCI) ([]byte, error) {
+func CreateCreateResponse(omciPkt gopacket.Packet, omciMsg *omci.OMCI, result me.Results) ([]byte, error) {
msgObj, err := ParseCreateRequest(omciPkt)
@@ -60,7 +60,7 @@
EntityClass: msgObj.EntityClass,
EntityInstance: msgObj.EntityInstance,
},
- Result: me.Success,
+ Result: result,
}
pkt, err := Serialize(omci.CreateResponseType, response, omciMsg.TransactionID)
@@ -78,75 +78,3 @@
return pkt, nil
}
-
-// methods used by BBR to drive the OMCI state machine
-
-func CreateGalEnetRequest(tid uint16) ([]byte, error) {
- params := me.ParamData{
- EntityID: 1,
- Attributes: me.AttributeValueMap{"MaximumGemPayloadSize": 48},
- }
- meDef, _ := me.NewGalEthernetProfile(params)
- pkt, err := omci.GenFrame(meDef, omci.CreateRequestType, omci.TransactionID(tid))
- if err != nil {
- omciLogger.WithField("err", err).Fatalf("Can't generate GalEnetRequest")
- }
- return HexEncode(pkt)
-}
-
-func CreateEnableUniRequest(tid uint16, uniId uint16, enabled bool, isPtp bool) ([]byte, error) {
-
- var _enabled uint8
- if enabled {
- _enabled = uint8(1)
- } else {
- _enabled = uint8(0)
- }
-
- data := me.ParamData{
- EntityID: uniId,
- Attributes: me.AttributeValueMap{
- "AdministrativeState": _enabled,
- },
- }
- var medef *me.ManagedEntity
- var omciErr me.OmciErrors
-
- if isPtp {
- medef, omciErr = me.NewPhysicalPathTerminationPointEthernetUni(data)
- } else {
- medef, omciErr = me.NewVirtualEthernetInterfacePoint(data)
- }
- if omciErr != nil {
- return nil, omciErr.GetError()
- }
- pkt, err := omci.GenFrame(medef, omci.SetRequestType, omci.TransactionID(tid))
- if err != nil {
- omciLogger.WithField("err", err).Fatalf("Can't generate EnableUniRequest")
- }
- return HexEncode(pkt)
-}
-
-func CreateGemPortRequest(tid uint16) ([]byte, error) {
- params := me.ParamData{
- EntityID: 1,
- Attributes: me.AttributeValueMap{
- "PortId": 1,
- "TContPointer": 1,
- "Direction": 0,
- "TrafficManagementPointerForUpstream": 0,
- "TrafficDescriptorProfilePointerForUpstream": 0,
- "UniCounter": 0,
- "PriorityQueuePointerForDownStream": 0,
- "EncryptionState": 0,
- "TrafficDescriptorProfilePointerForDownstream": 0,
- "EncryptionKeyRing": 0,
- },
- }
- meDef, _ := me.NewGemPortNetworkCtp(params)
- pkt, err := omci.GenFrame(meDef, omci.CreateRequestType, omci.TransactionID(tid))
- if err != nil {
- omciLogger.WithField("err", err).Fatalf("Can't generate GemPortRequest")
- }
- return HexEncode(pkt)
-}
diff --git a/internal/common/omci/create_test.go b/internal/common/omci/create_test.go
new file mode 100644
index 0000000..33d3a3e
--- /dev/null
+++ b/internal/common/omci/create_test.go
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2018-present Open Networking Foundation
+
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+
+ * http://www.apache.org/licenses/LICENSE-2.0
+
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package omci
+
+import (
+ "github.com/google/gopacket"
+ "github.com/opencord/omci-lib-go"
+ me "github.com/opencord/omci-lib-go/generated"
+ "gotest.tools/assert"
+ "testing"
+)
+
+func omciToCreateResponse(t *testing.T, omciPkt *gopacket.Packet) *omci.CreateResponse {
+ msgLayer := (*omciPkt).Layer(omci.LayerTypeCreateResponse)
+ if msgLayer == nil {
+ t.Fatal("omci Msg layer could not be detected for CreateResponse - handling of MibSyncChan stopped")
+ }
+ msgObj, msgOk := msgLayer.(*omci.CreateResponse)
+ if !msgOk {
+ t.Fatal("omci Msg layer could not be assigned for CreateResponse - handling of MibSyncChan stopped")
+ }
+ return msgObj
+}
+
+type createArgs struct {
+ omciPkt []byte
+ result me.Results
+}
+
+type createWant struct {
+ result me.Results
+}
+
+func TestCreateResponse(t *testing.T) {
+
+ // generate a CreateRequest packet to create a GemPort
+ omciReq := &omci.CreateRequest{
+ MeBasePacket: omci.MeBasePacket{
+ EntityClass: me.GemPortNetworkCtpClassID,
+ EntityInstance: 12,
+ },
+ Attributes: me.AttributeValueMap{
+ "PortId": 0,
+ "TContPointer": 0,
+ "Direction": 0,
+ "TrafficManagementPointerForUpstream": 0,
+ "TrafficDescriptorProfilePointerForUpstream": 0,
+ "PriorityQueuePointerForDownStream": 0,
+ "TrafficDescriptorProfilePointerForDownstream": 0,
+ "EncryptionKeyRing": 0,
+ },
+ }
+ omciPkt, err := Serialize(omci.CreateRequestType, omciReq, 66)
+ if err != nil {
+ t.Fatal(err.Error())
+ }
+
+ omciPkt, _ = HexEncode(omciPkt)
+
+ tests := []struct {
+ name string
+ args createArgs
+ want createWant
+ }{
+ {"createSuccess",
+ createArgs{omciPkt, me.Success},
+ createWant{me.Success},
+ },
+ {"createProcessingError",
+ createArgs{omciPkt, me.ProcessingError},
+ createWant{me.ProcessingError},
+ },
+ }
+ for _, tt := range tests {
+ t.Run(tt.name, func(t *testing.T) {
+ pkt, msg, _ := ParseOpenOltOmciPacket(tt.args.omciPkt)
+ requestPkt, _ := CreateCreateResponse(pkt, msg, tt.args.result)
+
+ omciMsg, omciPkt := omciBytesToMsg(t, requestPkt)
+
+ assert.Equal(t, omciMsg.MessageType, omci.CreateResponseType)
+
+ getResponseLayer := omciToCreateResponse(t, omciPkt)
+
+ assert.Equal(t, getResponseLayer.Result, tt.want.result)
+
+ })
+ }
+}
diff --git a/internal/common/omci/get_test.go b/internal/common/omci/get_test.go
index ca580ed..d995bba 100644
--- a/internal/common/omci/get_test.go
+++ b/internal/common/omci/get_test.go
@@ -55,12 +55,12 @@
return msgObj
}
-type args struct {
+type getArgs struct {
generatedPkt *omci.GetResponse
transactionId uint16
}
-type want struct {
+type getWant struct {
transactionId uint16
attributes map[string]interface{}
}
@@ -77,20 +77,20 @@
tests := []struct {
name string
- args args
- want want
+ args getArgs
+ want getWant
}{
{"getOnu2gResponse",
- args{createOnu2gResponse(57344, 10), 1},
- want{1, map[string]interface{}{"OpticalNetworkUnitManagementAndControlChannelOmccVersion": uint8(180)}},
+ getArgs{createOnu2gResponse(57344, 10), 1},
+ getWant{1, map[string]interface{}{"OpticalNetworkUnitManagementAndControlChannelOmccVersion": uint8(180)}},
},
{"getOnugResponse",
- args{createOnugResponse(40960, 10, sn), 1},
- want{1, map[string]interface{}{}},
+ getArgs{createOnugResponse(40960, 10, sn), 1},
+ getWant{1, map[string]interface{}{}},
},
{"getOnuDataResponse",
- args{createOnuDataResponse(32768, 10, 129), 2},
- want{2, map[string]interface{}{"MibDataSync": uint8(129)}},
+ getArgs{createOnuDataResponse(32768, 10, 129), 2},
+ getWant{2, map[string]interface{}{"MibDataSync": uint8(129)}},
},
}
for _, tt := range tests {
diff --git a/internal/common/omci/set.go b/internal/common/omci/set.go
index 64f048f..73e17df 100644
--- a/internal/common/omci/set.go
+++ b/internal/common/omci/set.go
@@ -40,7 +40,7 @@
return msgObj, nil
}
-func CreateSetResponse(omciPkt gopacket.Packet, omciMsg *omci.OMCI) ([]byte, error) {
+func CreateSetResponse(omciPkt gopacket.Packet, omciMsg *omci.OMCI, result me.Results) ([]byte, error) {
msgObj, err := ParseSetRequest(omciPkt)
@@ -59,7 +59,7 @@
EntityClass: msgObj.EntityClass,
EntityInstance: msgObj.EntityInstance,
},
- Result: me.Success,
+ Result: result,
}
pkt, err := Serialize(omci.SetResponseType, response, omciMsg.TransactionID)