Fix INF-375 get default mask strip failed

Issue-ID: INF-375
Signed-off-by: Zhang Rong(Jon) <rong.zhang@windriver.com>
Change-Id: Id192c5c74905cb72e6e3bbfce2a14c32a84eb958

diff --git a/o2common/views/route.py b/o2common/views/route.py
index e740333..9776458 100644 (file)
--- a/o2common/views/route.py
+++ b/o2common/views/route.py
@@ -232,5 +232,5 @@ class o2_marshal_with(marshal_with):
             for s in selector_all:
                 selector[s] = val
             return
-        default_selector = str(mask).strip(' ()')
+        default_selector = str(mask).strip(' {}')
         self.__update_selector_value(selector, default_selector, val)

diff --git a/o2ims/views/alarm_dto.py b/o2ims/views/alarm_dto.py
index 781bfb0..dd90e75 100644 (file)
--- a/o2ims/views/alarm_dto.py
+++ b/o2ims/views/alarm_dto.py
@@ -39,11 +39,11 @@ class AlarmDTO:
             'alarmAcknowledged': fields.Boolean,
             'perceivedSeverity': fields.String,
             'extensions': fields.Raw(attribute='extensions'),
-        },
-        mask='{alarmEventRecordId,resourceTypeID,resourceID,' +
-        'alarmDefinitionID,probableCauseID,' +
-        'alarmRaisedTime,perceivedSeverity,alarmChangedTime,' +
-        'alarmAcknowledgeTime,alarmAcknowledged,extensions}'
+        }
+        # mask='{alarmEventRecordId,resourceTypeID,resourceID,' +
+        # 'alarmDefinitionID,probableCauseID,' +
+        # 'alarmRaisedTime,perceivedSeverity,alarmChangedTime,' +
+        # 'alarmAcknowledgeTime,alarmAcknowledged,extensions}'
     )
 
 

diff --git a/o2ims/views/ocloud_dto.py b/o2ims/views/ocloud_dto.py
index 0003f5b..078064b 100644 (file)
--- a/o2ims/views/ocloud_dto.py
+++ b/o2ims/views/ocloud_dto.py
@@ -24,6 +24,7 @@ class OcloudDTO:
         "OcloudDto",
         {
             'oCloudId': fields.String(required=True),
+            'globalCloudId': fields.String,
             'globalcloudId': fields.String(attribute='globalCloudId'),
             'name': fields.String,
             'description': fields.String,
@@ -38,7 +39,8 @@ class OcloudDTO:
             # 'smoRegistrationService': fields.String
             'extensions': fields.String
         },
-        mask='{oCloudId,globalcloudId,name,description,serviceUri}'
+        mask='{oCloudId,globalCloudId,globalcloudId,name,description,' +\
+        'serviceUri}'
     )