X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=o2ims%2Fdomain%2Fsubscription_obj.py;h=a5afd9f7029d4914eb6f80bf168a364ab155e77a;hb=refs%2Fchanges%2F29%2F9429%2F2;hp=ff8beaffc3d699a41ce355b5792da1d98c78d8dc;hpb=3da89330f3837ac6cffd2cad4c4018c9f8c3327d;p=pti%2Fo2.git

diff --git a/o2ims/domain/subscription_obj.py b/o2ims/domain/subscription_obj.py
index ff8beaf..a5afd9f 100644
--- a/o2ims/domain/subscription_obj.py
+++ b/o2ims/domain/subscription_obj.py
@@ -24,11 +24,12 @@ class Subscription(AgRoot, Serializer):
                  filter: str = '') -> None:
         super().__init__()
         self.subscriptionId = id
-        self.version_number = 0
         self.callback = callback
         self.consumerSubscriptionId = consumersubid
         self.filter = filter
 
+        self.version_number = 0
+
 
 class NotificationEventEnum(str, Enum):
     CREATE = 'CREATE'
@@ -45,37 +46,19 @@ class Message2SMO(Serializer):
         self.updatetime = updatetime
 
 
-class RegistrationStatusEnum(str, Enum):
-    CREATED = 'CREATED'
-    NOTIFIED = 'NOTIFIED'
-    FAILED = 'FAILED'
-
-
-class Registration(AgRoot, Serializer):
-    def __init__(self, id: str, url: str,
-                 status: RegistrationStatusEnum =
-                 RegistrationStatusEnum.CREATED,
-                 comments: str = '') -> None:
-        super().__init__()
-        self.registrationId = id
-        self.callback = url
-        self.status = status
-        self.comments = comments
-
-
 class RegistrationMessage(Serializer):
-    def __init__(self, is_all: bool = None, id: str = '') -> None:
-        self.all = is_all if is_all is not None else False
+    def __init__(self, eventtype: NotificationEventEnum, id: str = '') -> None:
+        self.notificationEventType = eventtype
         self.id = id
 
 
 @dataclass
 class EventState():
     Initial = 0
-    NotInstalled = 1
+    # NotInstalled = 1
     Installing = 2
     Installed = 3
     Updating = 4
     Uninstalling = 5
     Abnormal = 6
-    Deleted = 7
+    Deleting = 7