Handling of subscription merge and inclusion of RMR lib from xapp-framework

[ric-plt/rtmgr.git] / pkg / nbi / types.go

diff --git a/pkg/nbi/types.go b/pkg/nbi/types.go
index 0f7fee6..80e7fd2 100644 (file)
--- a/pkg/nbi/types.go
+++ b/pkg/nbi/types.go
@@ -14,11 +14,16 @@
    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).
+
 ==================================================================================
 */
 /*
   Mnemonic:    nbi.go
-  Abstract:    Containes NBI (NorthBound Interface) specific types
+  Abstract:    Contains NBI (NorthBound Interface) specific types
   Date:                12 March 2019
 */
 
@@ -29,23 +34,25 @@ import (
        "routing-manager/pkg/rpe"
        "routing-manager/pkg/rtmgr"
        "routing-manager/pkg/sdl"
+       "sync"
 )
 
-type FetchAllXappsHandler func(string) (*[]rtmgr.XApp, error)
+type FetchAllXAppsHandler func(string) (*[]rtmgr.XApp, error)
 type RecvXappCallbackDataHandler func(<-chan *models.XappCallbackData) (*[]rtmgr.XApp, error)
-type LaunchRestHandler func(*string, chan<- *models.XappCallbackData, chan<- *models.XappSubscriptionData, chan<- *models.XappSubscriptionData)
+type RecvNewE2TdataHandler func(<-chan *models.E2tData) (*rtmgr.E2TInstance, string, error)
+type LaunchRestHandler func(*string, chan<- *models.XappCallbackData, chan<- *models.XappSubscriptionData, chan<- *rtmgr.XappList, chan<- *models.XappSubscriptionData, chan<- *models.E2tData, chan<- models.RanE2tMap, chan<- models.RanE2tMap, chan<- *models.E2tDeleteData)
 type ProvideXappHandleHandlerImpl func(chan<- *models.XappCallbackData, *models.XappCallbackData) error
-type RetrieveStartupDataHandler func(string, string, string, string, sdl.SdlEngine) error
+type RetrieveStartupDataHandler func(string, string, string, string, sdl.Engine) error
 
-type NbiEngineConfig struct {
+type EngineConfig struct {
        Name        string
        Version     string
        Protocol    string
-       Instance    NbiEngine
+       Instance    Engine
        IsAvailable bool
 }
 
-type NbiEngine interface {
-       Initialize(string, string, string, string, sdl.SdlEngine, rpe.RpeEngine, chan<- bool) error
+type Engine interface {
+       Initialize(string, string, string, string, sdl.Engine, rpe.Engine, chan<- bool, *sync.Mutex) error
        Terminate() error
 }