GetPortData() returns policies

Change-Id: Ibe79d33ba92015ac15e5ea8d2a647e0efc290d19
Signed-off-by: Mohamed Abukar <abukar.mohamed@nokia.com>

diff --git a/config/config-file.json b/config/config-file.json
index 3dad244..5741d69 100755 (executable)
--- a/config/config-file.json
+++ b/config/config-file.json
@@ -53,7 +53,7 @@
                 "maxRetryOnFailure": 5,
                 "rxMessages": ["RIC_SUB_RESP", "RIC_SUB_FAILURE"],
                 "txMessages": ["RIC_SGNB_ADDITION_REQ", "RIC_SGNB_ADDITION_ACK"],
-                "policies": [],
+                "policies": [801111, 902222],
                 "description": "rmr data port for ueec"
             }
         ]

diff --git a/pkg/xapp/config.go b/pkg/xapp/config.go
index 8d427c5..bb76a07 100755 (executable)
--- a/pkg/xapp/config.go
+++ b/pkg/xapp/config.go
@@ -127,6 +127,13 @@ func PublishConfigChange(appName, eventJson string) error {
 }
 
 func GetPortData(pname string) (d PortData) {
+       var getPolicies = func(policies []interface{}) (plist []int) {
+               for _, p := range policies {
+                       plist = append(plist, int(p.(float64)))
+               }
+               return plist
+       }
+
        for _, v := range viper.GetStringMap("messaging")["ports"].([]interface{}) {
                if n, ok := v.(map[string]interface{})["name"].(string); ok && n == pname {
                        d.Name = n
@@ -148,6 +155,9 @@ func GetPortData(pname string) (d PortData) {
                        if m, _ := v.(map[string]interface{})["maxRetryOnFailure"].(float64); ok {
                                d.MaxRetryOnFailure = int(m)
                        }
+                       if policies, ok := v.(map[string]interface{})["policies"]; ok {
+                               d.Policies = getPolicies(policies.([]interface{}))
+                       }
                }
        }
        return

diff --git a/pkg/xapp/rmr.go b/pkg/xapp/rmr.go
index f2d09da..9407024 100755 (executable)
--- a/pkg/xapp/rmr.go
+++ b/pkg/xapp/rmr.go
@@ -132,8 +132,9 @@ type RMRClientParams struct {
 }
 
 func (params *RMRClientParams) String() string {
-       return fmt.Sprintf("ProtPort=%d MaxSize=%d ThreadType=%d StatDesc=%s LowLatency=%t FastAck=%t",
-               params.RmrData.Port, params.RmrData.MaxSize, params.RmrData.ThreadType, params.StatDesc, params.RmrData.LowLatency, params.RmrData.FastAck)
+       return fmt.Sprintf("ProtPort=%d MaxSize=%d ThreadType=%d StatDesc=%s LowLatency=%t FastAck=%t Policies=%v",
+               params.RmrData.Port, params.RmrData.MaxSize, params.RmrData.ThreadType, params.StatDesc,
+               params.RmrData.LowLatency, params.RmrData.FastAck, params.RmrData.Policies)
 }
 
 //-----------------------------------------------------------------------------

diff --git a/pkg/xapp/types.go b/pkg/xapp/types.go
index 387d393..b6fc49b 100755 (executable)
--- a/pkg/xapp/types.go
+++ b/pkg/xapp/types.go
@@ -78,5 +78,6 @@ type PortData struct {
        ThreadType        int
        LowLatency        bool
        FastAck           bool
+       Policies          []int
        MaxRetryOnFailure int
 }