From b08d737de2fc9dcecd1700b747e0dfa76ae7c5b0 Mon Sep 17 00:00:00 2001
From: "naman.gupta" <naman.gupta@samsung.com>
Date: Fri, 12 Nov 2021 20:33:31 +0530
Subject: [PATCH] Added ranfunctionOid for E2APv1.1 for e2setup req.

	Added ranfunction Oid for E2APv1.1 for e2setup request message.

Issue-ID: RIC-640

Signed-off-by: naman.gupta <naman.gupta@samsung.com>
Change-Id: I877dcc856502e88304f4521170bda2749c5ba317
---
 E2Manager/go.mod                                   |  2 +-
 E2Manager/models/e2_setup_request_message.go       |  5 +-
 E2Manager/models/e2_setup_request_message_test.go  | 27 ++++++-
 .../resources/setupRequest/setupRequest_enb.xml    |  2 +
 .../setupRequest/setupRequest_with_oid_gnb.xml     | 90 ++++++++++++++++++++++
 5 files changed, 120 insertions(+), 6 deletions(-)
 create mode 100644 E2Manager/tests/resources/setupRequest/setupRequest_with_oid_gnb.xml

diff --git a/E2Manager/go.mod b/E2Manager/go.mod
index b14d5fb..7a9abf3 100644
--- a/E2Manager/go.mod
+++ b/E2Manager/go.mod
@@ -2,7 +2,7 @@ module e2mgr
 
 require (
 	gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common v1.2.1
-	gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities v1.2.1
+	gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities v1.2.3
 	gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader v1.2.1
 	gerrit.o-ran-sc.org/r/ric-plt/sdlgo v0.8.0
 	github.com/golang/protobuf v1.4.2
diff --git a/E2Manager/models/e2_setup_request_message.go b/E2Manager/models/e2_setup_request_message.go
index f7088b8..96a7bcf 100644
--- a/E2Manager/models/e2_setup_request_message.go
+++ b/E2Manager/models/e2_setup_request_message.go
@@ -21,8 +21,9 @@ package models
 
 import (
 	"encoding/xml"
-	"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
 	"strings"
+
+	"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
 )
 
 type Gnb struct {
@@ -135,6 +136,7 @@ type RanFunctionItem struct {
 	RanFunctionID         uint32 `xml:"ranFunctionID"`
 	RanFunctionDefinition string `xml:"ranFunctionDefinition"`
 	RanFunctionRevision   uint32 `xml:"ranFunctionRevision"`
+	RanFunctionOID        string `xml:"ranFunctionOID"`
 }
 
 type RANfunctionsList struct {
@@ -169,6 +171,7 @@ func (m *E2SetupRequestMessage) ExtractRanFunctionsList() []*entities.RanFunctio
 			RanFunctionId:         ranFunctionItem.RanFunctionID,
 			RanFunctionDefinition: ranFunctionItem.RanFunctionDefinition,
 			RanFunctionRevision:   ranFunctionItem.RanFunctionRevision,
+			RanFunctionOid:        ranFunctionItem.RanFunctionOID,
 		}
 	}
 	return funcs
diff --git a/E2Manager/models/e2_setup_request_message_test.go b/E2Manager/models/e2_setup_request_message_test.go
index 8252c71..a609eed 100644
--- a/E2Manager/models/e2_setup_request_message_test.go
+++ b/E2Manager/models/e2_setup_request_message_test.go
@@ -28,10 +28,11 @@ import (
 )
 
 const (
-	e2SetupReqGnbSetupRequestXmlPath   = "../tests/resources/setupRequest/setupRequest_gnb.xml"
-	e2SetupReqEnGnbSetupRequestXmlPath = "../tests/resources/setupRequest/setupRequest_en-gNB.xml"
-	e2SetupReqEnbSetupRequestXmlPath   = "../tests/resources/setupRequest/setupRequest_enb.xml"
-	e2SetupReqNgEnbSetupRequestXmlPath = "../tests/resources/setupRequest/setupRequest_ng-eNB.xml"
+	e2SetupReqGnbSetupRequestXmlPath        = "../tests/resources/setupRequest/setupRequest_gnb.xml"
+	e2SetupReqEnGnbSetupRequestXmlPath      = "../tests/resources/setupRequest/setupRequest_en-gNB.xml"
+	e2SetupReqEnbSetupRequestXmlPath        = "../tests/resources/setupRequest/setupRequest_enb.xml"
+	e2SetupReqNgEnbSetupRequestXmlPath      = "../tests/resources/setupRequest/setupRequest_ng-eNB.xml"
+	e2SetupReqGnbSetupRequestWithOIDXmlPath = "../tests/resources/setupRequest/setupRequest_with_oid_gnb.xml"
 )
 
 func getTestE2SetupRequest(t *testing.T, reqXmlPath string) *models.E2SetupRequestMessage {
@@ -54,6 +55,24 @@ func TestExtractRanFunctionsListFromGnbRequestSuccess(t *testing.T) {
 	assert.Equal(t, uint32(1), ranFuncList[2].RanFunctionRevision)
 }
 
+func TestExtractRanFunctionsListFromGnbRequestwithOidSuccess(t *testing.T) {
+	setupRequest := getTestE2SetupRequest(t, e2SetupReqGnbSetupRequestWithOIDXmlPath)
+
+	ranFuncList := setupRequest.ExtractRanFunctionsList()
+
+	assert.Equal(t, uint32(1), ranFuncList[0].RanFunctionId)
+	assert.Equal(t, uint32(2), ranFuncList[1].RanFunctionId)
+	assert.Equal(t, uint32(3), ranFuncList[2].RanFunctionId)
+
+	assert.Equal(t, uint32(1), ranFuncList[0].RanFunctionRevision)
+	assert.Equal(t, uint32(1), ranFuncList[1].RanFunctionRevision)
+	assert.Equal(t, uint32(1), ranFuncList[2].RanFunctionRevision)
+
+	assert.Equal(t, "OID123", ranFuncList[0].RanFunctionOid)
+	assert.Equal(t, "OID124", ranFuncList[1].RanFunctionOid)
+	assert.Equal(t, "OID125", ranFuncList[2].RanFunctionOid)
+}
+
 func TestGetPlmnIdFromGnbRequestSuccess(t *testing.T) {
 	setupRequest := getTestE2SetupRequest(t, e2SetupReqGnbSetupRequestXmlPath)
 
diff --git a/E2Manager/tests/resources/setupRequest/setupRequest_enb.xml b/E2Manager/tests/resources/setupRequest/setupRequest_enb.xml
index 3502012..230e06f 100644
--- a/E2Manager/tests/resources/setupRequest/setupRequest_enb.xml
+++ b/E2Manager/tests/resources/setupRequest/setupRequest_enb.xml
@@ -42,6 +42,7 @@
                                             <ranFunctionID>1</ranFunctionID>
                                             <ranFunctionDefinition>334455</ranFunctionDefinition>
                                             <ranFunctionRevision>0</ranFunctionRevision>
+                                            <ranFunctionOID>OID123</ranFunctionOID>
                                         </RANfunction-Item>
                                     </value>
                                 </ProtocolIE-SingleContainer>
@@ -55,6 +56,7 @@
                                             <ranFunctionID>7</ranFunctionID>
                                             <ranFunctionDefinition>334455</ranFunctionDefinition>
                                             <ranFunctionRevision>0</ranFunctionRevision>
+                                            <ranFunctionOID>OID134</ranFunctionOID>
                                         </RANfunction-Item>
                                     </value>
                                 </ProtocolIE-SingleContainer>
diff --git a/E2Manager/tests/resources/setupRequest/setupRequest_with_oid_gnb.xml b/E2Manager/tests/resources/setupRequest/setupRequest_with_oid_gnb.xml
new file mode 100644
index 0000000..d5d0bff
--- /dev/null
+++ b/E2Manager/tests/resources/setupRequest/setupRequest_with_oid_gnb.xml
@@ -0,0 +1,90 @@
+<E2AP-PDU>
+    <initiatingMessage>
+        <procedureCode>1</procedureCode>
+        <criticality>
+            <reject/>
+        </criticality>
+        <value>
+            <E2setupRequest>
+                <protocolIEs>
+                    <E2setupRequestIEs>
+                        <id>3</id>
+                        <criticality>
+                            <reject/>
+                        </criticality>
+                        <value>
+                            <GlobalE2node-ID>
+                                <gNB>
+                                    <global-gNB-ID>
+                                        <plmn-id>02 F8 29</plmn-id>
+                                        <gnb-id>
+                                            <gnb-ID>001100000011000000110000</gnb-ID>
+                                        </gnb-id>
+                                    </global-gNB-ID>
+                                </gNB>
+                            </GlobalE2node-ID>
+                        </value>
+                    </E2setupRequestIEs>
+                    <E2setupRequestIEs>
+                        <id>10</id>
+                        <criticality>
+                            <reject/>
+                        </criticality>
+                        <value>
+                            <RANfunctions-List>
+                                <ProtocolIE-SingleContainer>
+                                    <id>8</id>
+                                    <criticality>
+                                        <ignore/>
+                                    </criticality>
+                                    <value>
+                                        <RANfunction-Item>
+                                            <ranFunctionID>1</ranFunctionID>
+                                            <ranFunctionDefinition>
+                                                790280674E422D5832000020312E332E362E312E342E312E32383435382E39392E302E32312E332E332E312E320B80674E42205832204E6574776F726B20496E74657266616365010000010108004D6573736167652054797065206F6E6C7901010001010780436F6D706C657465206D6573736167650101000001058041646454696D657374616D7020010101010001010780436F6D706C657465206D6573736167650101000001058041646454696D657374616D70200101010101010001010780436F6D706C657465206D657373616765010101010101
+                                            </ranFunctionDefinition>
+                                            <ranFunctionRevision>1</ranFunctionRevision>
+                                            <ranFunctionOID>OID123</ranFunctionOID>
+                                        </RANfunction-Item>
+                                    </value>
+                                </ProtocolIE-SingleContainer>
+                                <ProtocolIE-SingleContainer>
+                                    <id>8</id>
+                                    <criticality>
+                                        <ignore/>
+                                    </criticality>
+                                    <value>
+                                        <RANfunction-Item>
+                                            <ranFunctionID>2</ranFunctionID>
+                                            <ranFunctionOID>OID124</ranFunctionOID>
+                                            <ranFunctionDefinition>
+                                                680300674E422D4E5254000020312E332E362E312E342E312E32383435382E39392E302E32312E332E332E332E330D80674E42204E65696768626F75722052656C6174696F6E205461626C6500010105804E6F74696669636174696F6E01010001010680436F6D706C657465207461626C650101000001058041646454696D657374616D70200101010100010107804E5254206D6F64696669636174696F6E010101010100
+                                            </ranFunctionDefinition>
+                                            <ranFunctionRevision>1</ranFunctionRevision>
+                                        </RANfunction-Item>
+                                    </value>
+                                </ProtocolIE-SingleContainer>
+                                <ProtocolIE-SingleContainer>
+                                    <id>8</id>
+                                    <criticality>
+                                        <ignore/>
+                                    </criticality>
+                                    <value>
+                                        <RANfunction-Item>
+                                            <ranFunctionID>3</ranFunctionID>
+                                            <ranFunctionOID>OID125</ranFunctionOID>
+                                            <ranFunctionDefinition>
+                                                450280674E422D5832000020312E332E362E312E342E312E32383435382E39392E302E32312E332E332E312E320B80674E42205832204E6574776F726B20496E74657266616365010100010108004D6573736167652054797065206F6E6C79010100010108004D6573736167652041646D697373696F6E01020400010180514349310002018041525031000301805350494400040300552D5445494431400A05004C6F61645F6F666673657400
+                                            </ranFunctionDefinition>
+                                            <ranFunctionRevision>1</ranFunctionRevision>
+                                        </RANfunction-Item>
+                                    </value>
+                                </ProtocolIE-SingleContainer>
+                            </RANfunctions-List>
+                        </value>
+                    </E2setupRequestIEs>
+                </protocolIEs>
+            </E2setupRequest>
+        </value>
+    </initiatingMessage>
+</E2AP-PDU>
-- 
2.16.6