Code Review / ric-plt / rtmgr.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Taking old commit for releasing image
[ric-plt/rtmgr.git] / pkg / sbi / sbi.go
diff --git a/pkg/sbi/sbi.go b/pkg/sbi/sbi.go
index 09d9381..9d1380e 100644 (file)
--- a/pkg/sbi/sbi.go
+++ b/pkg/sbi/sbi.go
@@ -15,6 +15,10 @@ w
    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.
    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.
+
+   This source code is part of the near-RT RIC (RAN Intelligent Controller)
+   platform project (RICP).
+
 ==================================================================================
 */
 /*
 ==================================================================================
 */
 /*
@@ -27,36 +31,29 @@ package sbi
 
 import (
        "errors"
 
 import (
        "errors"
-        "strconv"
+       "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
        "routing-manager/pkg/rtmgr"
        "routing-manager/pkg/rtmgr"
+       "strconv"
+       "strings"
 )
 
 )
 
-const DEFAULT_NNG_PUBSUB_SOCKET_PREFIX = "tcp://"
-const DEFAULT_NNG_PUBSUB_SOCKET_NUMBER = 4560
-const DEFAULT_NNG_PIPELINE_SOCKET_PREFIX = "tcp://"
-const DEFAULT_NNG_PIPELINE_SOCKET_NUMBER = 4561
-const PLATFORMTYPE = "platformcomponenttype"
+const DefaultNngPipelineSocketPrefix = "tcp://"
+const DefaultNngPipelineSocketNumber = 4561
+const PlatformType = "platform"
 
 var (
 
 var (
-       SupportedSbis = []*SbiEngineConfig{
-               &SbiEngineConfig{
-                        Name:     "nngpush",
-                        Version:  "v1",
-                        Protocol: "nngpipeline",
-                        Instance: NewNngPush(),
-                        IsAvailable: true,
-                },
-               &SbiEngineConfig{
-                        Name:     "nngpub",
-                        Version:  "v1",
-                        Protocol: "nngpubsub",
-                        Instance: NewNngPub(),
-                        IsAvailable: true,
-                },
+       SupportedSbis = []*EngineConfig{
+               {
+                       Name:        "nngpush",
+                       Version:     "v1",
+                       Protocol:    "nngpipeline",
+                       Instance:    NewNngPush(),
+                       IsAvailable: true,
+               },
        }
 )
 
        }
 )
 
-func GetSbi(sbiName string) (SbiEngine, error) {
+func GetSbi(sbiName string) (Engine, error) {
        for _, sbi := range SupportedSbis {
                if sbi.Name == sbiName && sbi.IsAvailable {
                        return sbi.Instance, nil
        for _, sbi := range SupportedSbis {
                if sbi.Name == sbiName && sbi.IsAvailable {
                        return sbi.Instance, nil
@@ -66,78 +63,111 @@ func GetSbi(sbiName string) (SbiEngine, error) {
 }
 
 type Sbi struct {
 }
 
 type Sbi struct {
+}
 
 
+func (s *Sbi) pruneEndpointList(sbi Engine) {
+       xapp.Logger.Debug("pruneEndpointList invoked.")
+       for _, ep := range rtmgr.Eps {
+               if !ep.Keepalive {
+                       xapp.Logger.Debug("deleting %v", ep)
+                       sbi.DeleteEndpoint(ep)
+                       delete(rtmgr.Eps, ep.Uuid)
+               } else {
+                       rtmgr.Eps[ep.Uuid].Keepalive = false
+               }
+       }
 }
 
 }
 
-func (s *Sbi) pruneEndpointList(sbii SbiEngine) {
-        for _, ep := range rtmgr.Eps {
-                if !ep.Keepalive {
-                       rtmgr.Logger.Debug("deleting %v",ep)
-                       sbii.DeleteEndpoint(ep)
-                        delete(rtmgr.Eps, ep.Uuid)
-                } else {
-                        rtmgr.Eps[ep.Uuid].Keepalive = false
-                }
-        }
+func (s *Sbi) updateEndpoints(rcs *rtmgr.RicComponents, sbi Engine) {
+       for _, xapps := range (*rcs).XApps {
+               for _, instance := range xapps.Instances {
+                       uuid := instance.Ip + ":" + strconv.Itoa(int(instance.Port))
+                       if _, ok := rtmgr.Eps[uuid]; ok {
+                               rtmgr.Eps[uuid].Keepalive = true
+                       } else {
+                               ep := &rtmgr.Endpoint{
+                                       Uuid:       uuid,
+                                       Name:       instance.Name,
+                                       XAppType:   xapps.Name,
+                                       Ip:         instance.Ip,
+                                       Port:       instance.Port,
+                                       TxMessages: instance.TxMessages,
+                                       RxMessages: instance.RxMessages,
+                                       Policies:   instance.Policies,
+                                       Socket:     nil,
+                                       IsReady:    false,
+                                       Keepalive:  true,
+                               }
+                               if err := sbi.AddEndpoint(ep); err != nil {
+                                       xapp.Logger.Error("can't create socket for endpoint: " + ep.Name + " due to:" + err.Error())
+                                       continue
+                               }
+                               rtmgr.Eps[uuid] = ep
+                       }
+               }
+       }
+       s.updatePlatformEndpoints(&((*rcs).Pcs), sbi)
+        s.updateE2TEndpoints(&((*rcs).E2Ts), sbi)
+       s.pruneEndpointList(sbi)
 }
 
 }
 
-func (s *Sbi) updateEndpoints(rcs *rtmgr.RicComponents, sbii SbiEngine) {
-       for _, xapp := range (*rcs).Xapps {
-                for _, instance := range xapp.Instances {
-                        uuid := instance.Ip + ":" + strconv.Itoa(int(instance.Port))
-                        if _, ok := rtmgr.Eps[uuid]; ok {
-                                rtmgr.Eps[uuid].Keepalive = true
-                        } else {
-                                ep := &rtmgr.Endpoint{
-                                        uuid,
-                                        instance.Name,
-                                        xapp.Name,
-                                        instance.Ip,
-                                        instance.Port,
-                                        instance.TxMessages,
-                                        instance.RxMessages,
-                                        nil,
-                                        false,
-                                        true,
-                                }
-                                if err := sbii.AddEndpoint(ep); err != nil {
-                                        rtmgr.Logger.Error("can't create socket for endpoint: " + ep.Name + " due to:" + err.Error())
-                                        continue
-                                }
-                                rtmgr.Eps[uuid] = ep
-                        }
-                }
-        }
-       s.updatePlatformEndpoints(&((*rcs).Pcs), sbii)
-        s.pruneEndpointList(sbii)
+func (s *Sbi) updatePlatformEndpoints(pcs *rtmgr.PlatformComponents, sbi Engine) {
+       xapp.Logger.Debug("updatePlatformEndpoints invoked. PCS: %v", *pcs)
+       for _, pc := range *pcs {
+               uuid := pc.Fqdn + ":" + strconv.Itoa(int(pc.Port))
+               if _, ok := rtmgr.Eps[uuid]; ok {
+                       rtmgr.Eps[uuid].Keepalive = true
+               } else {
+                       ep := &rtmgr.Endpoint{
+                               Uuid:       uuid,
+                               Name:       pc.Name,
+                               XAppType:   PlatformType,
+                               Ip:         pc.Fqdn,
+                               Port:       pc.Port,
+                               TxMessages: rtmgr.PLATFORMMESSAGETYPES[pc.Name]["tx"],
+                               RxMessages: rtmgr.PLATFORMMESSAGETYPES[pc.Name]["rx"],
+                               Socket:     nil,
+                               IsReady:    false,
+                               Keepalive:  true,
+                       }
+                       xapp.Logger.Debug("ep created: %v", ep)
+                       if err := sbi.AddEndpoint(ep); err != nil {
+                               xapp.Logger.Error("can't create socket for endpoint: " + ep.Name + " due to:" + err.Error())
+                               continue
+                       }
+                       rtmgr.Eps[uuid] = ep
+               }
+       }
 }
 
 }
 
-func (s *Sbi ) updatePlatformEndpoints(pcs *rtmgr.PlatformComponents, sbii SbiEngine) {
-       rtmgr.Logger.Debug("updatePlatformEndpoints invoked. PCS: %v", *pcs)
-        for _, pc := range *pcs {
-                uuid := pc.Fqdn + ":" + strconv.Itoa(int(pc.Port))
+func (s *Sbi) updateE2TEndpoints(E2Ts *map[string]rtmgr.E2TInstance, sbi Engine) {
+        xapp.Logger.Debug("updateE2TEndpoints invoked. E2T: %v", *E2Ts)
+        for _, e2t := range *E2Ts {
+                uuid := e2t.Fqdn
+                stringSlice := strings.Split(e2t.Fqdn, ":")
+                ipaddress := stringSlice[0]
+                port, _ := strconv.Atoi(stringSlice[1])
                 if _, ok := rtmgr.Eps[uuid]; ok {
                         rtmgr.Eps[uuid].Keepalive = true
                 } else {
                         ep := &rtmgr.Endpoint{
                 if _, ok := rtmgr.Eps[uuid]; ok {
                         rtmgr.Eps[uuid].Keepalive = true
                 } else {
                         ep := &rtmgr.Endpoint{
-                                uuid,
-                                pc.Name,
-                                PLATFORMTYPE,
-                                pc.Fqdn,
-                                pc.Port,
-                                rtmgr.PLATFORMMESSAGETYPES[pc.Name]["tx"],
-                                rtmgr.PLATFORMMESSAGETYPES[pc.Name]["rx"],
-                                nil,
-                                false,
-                                true,
+                                Uuid:       uuid,
+                                Name:       e2t.Name,
+                                XAppType:   PlatformType,
+                                Ip:         ipaddress,
+                                Port:       uint16(port),
+                                TxMessages: rtmgr.PLATFORMMESSAGETYPES[e2t.Name]["tx"],
+                                RxMessages: rtmgr.PLATFORMMESSAGETYPES[e2t.Name]["rx"],
+                                Socket:     nil,
+                                IsReady:    false,
+                                Keepalive:  true,
                         }
                         }
-                       rtmgr.Logger.Debug("ep created: %v",ep)
-                        if err := sbii.AddEndpoint(ep); err != nil {
-                                rtmgr.Logger.Error("can't create socket for endpoint: " + ep.Name + " due to:" + err.Error())
+                        xapp.Logger.Debug("ep created: %v", ep)
+                        if err := sbi.AddEndpoint(ep); err != nil {
+                                xapp.Logger.Error("can't create socket for endpoint: " + ep.Name + " due to:" + err.Error())
                                 continue
                         }
                         rtmgr.Eps[uuid] = ep
                 }
         }
 }
                                 continue
                         }
                         rtmgr.Eps[uuid] = ep
                 }
         }
 }
-
Routing Manager (ric-plt/rtmgr) is a basic RIC platform service, responsible for generating and distributing routing policies to xApps.