Add is_readonly and is_appuser user flags to TOSCA

Change-Id: If3742a00e37ddf168e0e19227fa39f95f9e0752e
diff --git a/xos/tosca/custom_types/xos.m4 b/xos/tosca/custom_types/xos.m4
index f500ca7..d84672e 100644
--- a/xos/tosca/custom_types/xos.m4
+++ b/xos/tosca/custom_types/xos.m4
@@ -651,6 +651,16 @@
                 required: false
                 #default: false
                 description: If True, the user has root admin privileges.
+            is_readonly:
+                type: boolean
+                required: false
+                #default: false
+                description: If True, the user has read-only privileges in the UI.
+            is_appuser:
+                type: boolean
+                required: false
+                #default: false
+                description: If True, the user may only login to XOS to use apps.
             login_page:
                 type: string
                 required: false
diff --git a/xos/tosca/custom_types/xos.yaml b/xos/tosca/custom_types/xos.yaml
index 9c79786..b2adcb5 100644
--- a/xos/tosca/custom_types/xos.yaml
+++ b/xos/tosca/custom_types/xos.yaml
@@ -1283,6 +1283,16 @@
                 required: false
                 #default: false
                 description: If True, the user has root admin privileges.
+            is_readonly:
+                type: boolean
+                required: false
+                #default: false
+                description: If True, the user has read-only privileges in the UI.
+            is_appuser:
+                type: boolean
+                required: false
+                #default: false
+                description: If True, the user may only login to XOS to use apps.
             login_page:
                 type: string
                 required: false
diff --git a/xos/tosca/resources/user.py b/xos/tosca/resources/user.py
index 55c0423..52456d5 100644
--- a/xos/tosca/resources/user.py
+++ b/xos/tosca/resources/user.py
@@ -13,7 +13,7 @@
     provides = "tosca.nodes.User"
     xos_model = User
     name_field = "email"
-    copyin_props = ["password", "firstname", "lastname", "phone", "user_url", "public_key", "is_active", "is_admin", "login_page"]
+    copyin_props = ["password", "firstname", "lastname", "phone", "user_url", "public_key", "is_active", "is_admin", "is_readonly", "is_appuser", "login_page"]
 
     def get_xos_args(self):
         args = super(XOSUser, self).get_xos_args()