Remove duplicated entries on error-configuration.yaml

Change-Id: Ie9caf4a01283df368fd441f8ddecc82b84caa861
Issue-ID: SDC-2455
Signed-off-by: vasraz <vasyl.razinkov@est.tech>
diff --git a/asdctool/src/main/resources/config/error-configuration.yaml b/asdctool/src/main/resources/config/error-configuration.yaml
index 01f8ea4..c21f24b 100644
--- a/asdctool/src/main/resources/config/error-configuration.yaml
+++ b/asdctool/src/main/resources/config/error-configuration.yaml
@@ -1,1805 +1,1794 @@
 # Errors
 errors:
-    OK: {
-        code: 200,
-        message: "OK"
-    }
-    CREATED: {
-        code: 201,
-        message: "OK"
-    }
-    NO_CONTENT: {
-        code: 204,
-        message: "No Content"
-    }
-#--------POL4050-----------------------------     
-    NOT_ALLOWED: {
-        code: 405,
-        message: "Error: Method not allowed.",
-        messageId: "POL4050"
-    }
-#--------POL5000-----------------------------     
-    GENERAL_ERROR: {
-        code: 500,
-        message: "Error: Internal Server Error. Please try again later.",
-        messageId: "POL5000"
-    }
-#---------POL5001------------------------------     
-    MISSING_X_ECOMP_INSTANCE_ID: {
-        code: 400  ,
-        message: "Error: Missing 'X-ECOMP-InstanceID' HTTP header.",
-        messageId: "POL5001"
-    }
-#---------POL5002------------------------------     
-    AUTH_REQUIRED: {
-        code: 401  ,
-        message: "Error: Authentication is required to use the API.",
-        messageId: "POL5002"
-    }
-#---------POL5003------------------------------     
-    AUTH_FAILED: {
-        code: 403  ,
-        message: "Error: Not authorized to use the API.",
-        messageId: "POL5003"
-    }
-#---------SVC4000----------------------------- 
-    INVALID_CONTENT: {
-        code: 400,
-        message: "Error: Invalid content.",
-        messageId: "SVC4000"
-    }#---------SVC4000----------------------------- 
-    INVALID_CONTENT: {
-        code: 400,
-        message: "Error: Invalid content.",
-        messageId: "SVC4000"
-    }
-#---------SVC4002----------------------------- 
-    MISSING_INFORMATION: {
-        code: 403,
-        message: "Error: Missing information.",
-        messageId: "SVC4002"
-    }
-#---------SVC4003------------------------------ 
-# %1 - Users's USER_ID     
-    USER_NOT_FOUND: {
-        code: 404,
-        message: "Error: User '%1' was not found.",
-        messageId: "SVC4003"
-    }
-#---------SVC4004----------------------------- 
-# %1 - Users's email address     
-    INVALID_EMAIL_ADDRESS: {
-        code: 400,
-        message: "Error: Invalid email address '%1'.",
-        messageId: "SVC4004"
-    }
-#---------SVC4005------------------------------ 
-# %1 - role
-    INVALID_ROLE: {
-        code: 400,
-        message: "Error: Invalid role '%1'.",
-        messageId: "SVC4005"
-    }
-#---------SVC4006------------------------------ 
-# %1 - Users's USER_ID     
-    USER_ALREADY_EXIST: {
-        code: 409,
-        message: "Error: User with '%1' ID already exists.",
-        messageId: "SVC4006"
-    }
-#---------SVC4007------------------------------ 
-    DELETE_USER_ADMIN_CONFLICT: {
-        code: 409,
-        message: "Error: An administrator can only be deleted by another administrator.",
-        messageId: "SVC4007"
-    }
-#---------SVC4008----------------------------- 
-# %1 - Users's USER_ID     
-    INVALID_USER_ID: {
-        code: 400,
-        message: "Error: Invalid USER_ID '%1'.",
-        messageId: "SVC4008"
-    }
-#---------SVC    ------------------------------
-    INVALID_SERVICE_STATE: {
-        code: 409,
-        message: "Error: Invalid service state. Expected state: %1, actual state: %2",
-        messageId: ""
-    }
-#---------SVC4049------------------------------ 
-# %1 - service/resource
-    COMPONENT_MISSING_CONTACT: {
-        code: 400,
-        message: "Error: Invalid Content. Missing %1 Contact Id.",
-        messageId: "SVC4049"
-    } 
-#---------SVC4050----------------------------- 
-# %1 - Service/Resource/Additional parameter
-# %2 - service/resource/label name
-    COMPONENT_NAME_ALREADY_EXIST: {
-        code: 409,
-        message: "Error: %1 with name '%2' already exists.",
-        messageId: "SVC4050"
-    }
-#---------SVC4051------------------------------ 
-# %1 - resource/service 
-    COMPONENT_MISSING_CATEGORY: {
-        code: 400,
-        message: "Error: Invalid Content. Missing %1 category.",
-        messageId: "SVC4051"
-    }
+  OK: {
+    code: 200,
+    message: "OK"
+  }
+  CREATED: {
+    code: 201,
+    message: "OK"
+  }
+  NO_CONTENT: {
+    code: 204,
+    message: "No Content"
+  }
+  #--------POL4050-----------------------------
+  NOT_ALLOWED: {
+    code: 405,
+    message: "Error: Method not allowed.",
+    messageId: "POL4050"
+  }
+  #--------POL5000-----------------------------
+  GENERAL_ERROR: {
+    code: 500,
+    message: "Error: Internal Server Error. Please try again later.",
+    messageId: "POL5000"
+  }
+  #---------POL5001------------------------------
+  MISSING_X_ECOMP_INSTANCE_ID: {
+    code: 400  ,
+    message: "Error: Missing 'X-ECOMP-InstanceID' HTTP header.",
+    messageId: "POL5001"
+  }
+  #---------POL5002------------------------------
+  AUTH_REQUIRED: {
+    code: 401  ,
+    message: "Error: Authentication is required to use the API.",
+    messageId: "POL5002"
+  }
+  #---------POL5003------------------------------
+  AUTH_FAILED: {
+    code: 403  ,
+    message: "Error: Not authorized to use the API.",
+    messageId: "POL5003"
+  }
+  #---------SVC4000-----------------------------
+  INVALID_CONTENT: {
+    code: 400,
+    message: "Error: Invalid content.",
+    messageId: "SVC4000"
+  }
+  #---------SVC4002-----------------------------
+  MISSING_INFORMATION: {
+    code: 403,
+    message: "Error: Missing information.",
+    messageId: "SVC4002"
+  }
+  #---------SVC4003------------------------------
+  # %1 - Users's USER_ID
+  USER_NOT_FOUND: {
+    code: 404,
+    message: "Error: User '%1' was not found.",
+    messageId: "SVC4003"
+  }
+  #---------SVC4004-----------------------------
+  # %1 - Users's email address
+  INVALID_EMAIL_ADDRESS: {
+    code: 400,
+    message: "Error: Invalid email address '%1'.",
+    messageId: "SVC4004"
+  }
+  #---------SVC4005------------------------------
+  # %1 - role
+  INVALID_ROLE: {
+    code: 400,
+    message: "Error: Invalid role '%1'.",
+    messageId: "SVC4005"
+  }
+  #---------SVC4006------------------------------
+  # %1 - Users's USER_ID
+  USER_ALREADY_EXIST: {
+    code: 409,
+    message: "Error: User with '%1' ID already exists.",
+    messageId: "SVC4006"
+  }
+  #---------SVC4007------------------------------
+  DELETE_USER_ADMIN_CONFLICT: {
+    code: 409,
+    message: "Error: An administrator can only be deleted by another administrator.",
+    messageId: "SVC4007"
+  }
+  #---------SVC4008-----------------------------
+  # %1 - Users's USER_ID
+  INVALID_USER_ID: {
+    code: 400,
+    message: "Error: Invalid USER_ID '%1'.",
+    messageId: "SVC4008"
+  }
+  #---------SVC4049------------------------------
+  # %1 - service/resource
+  COMPONENT_MISSING_CONTACT: {
+    code: 400,
+    message: "Error: Invalid Content. Missing %1 Contact Id.",
+    messageId: "SVC4049"
+  }
+  #---------SVC4050-----------------------------
+  # %1 - Service/Resource/Additional parameter
+  # %2 - service/resource/label name
+  COMPONENT_NAME_ALREADY_EXIST: {
+    code: 409,
+    message: "Error: %1 with name '%2' already exists.",
+    messageId: "SVC4050"
+  }
+  #---------SVC4051------------------------------
+  # %1 - resource/service
+  COMPONENT_MISSING_CATEGORY: {
+    code: 400,
+    message: "Error: Invalid Content. Missing %1 category.",
+    messageId: "SVC4051"
+  }
 
-#---------SVC4052------------------------------ 
-    COMPONENT_MISSING_TAGS: {
-        code: 400,
-        message: "Error: Invalid Content. At least one tag has to be specified.",
-        messageId: "SVC4052"
-    }
+  #---------SVC4052------------------------------
+  COMPONENT_MISSING_TAGS: {
+    code: 400,
+    message: "Error: Invalid Content. At least one tag has to be specified.",
+    messageId: "SVC4052"
+  }
 
-#---------SVC4053------------------------------ 
-# %1 - service/resource
-    COMPONENT_MISSING_DESCRIPTION: {
-        code: 400,
-        message: "Error: Invalid Content. Missing %1 description.",
-        messageId: "SVC4053"
-    }
-#---------SVC4054------------------------------  
-# %1 - resource/service
-    COMPONENT_INVALID_CATEGORY: {
-        code: 400,
-        message: "Error: Invalid Content. Invalid %1 category.",
-        messageId: "SVC4054"
-    }
-#---------SVC4055------------------------------ 
-    MISSING_VENDOR_NAME: {
-        code: 400,
-        message: "Error: Invalid Content. Missing vendor name.",
-        messageId: "SVC4055"
-    }
-#---------SVC4056------------------------------ 
-    MISSING_VENDOR_RELEASE: {
-        code: 400,
-        message: "Error: Invalid Content. Missing vendor release.",
-        messageId: "SVC4056"
-    }
+  #---------SVC4053------------------------------
+  # %1 - service/resource
+  COMPONENT_MISSING_DESCRIPTION: {
+    code: 400,
+    message: "Error: Invalid Content. Missing %1 description.",
+    messageId: "SVC4053"
+  }
+  #---------SVC4054------------------------------
+  # %1 - resource/service
+  COMPONENT_INVALID_CATEGORY: {
+    code: 400,
+    message: "Error: Invalid Content. Invalid %1 category.",
+    messageId: "SVC4054"
+  }
+  #---------SVC4055------------------------------
+  MISSING_VENDOR_NAME: {
+    code: 400,
+    message: "Error: Invalid Content. Missing vendor name.",
+    messageId: "SVC4055"
+  }
+  #---------SVC4056------------------------------
+  MISSING_VENDOR_RELEASE: {
+    code: 400,
+    message: "Error: Invalid Content. Missing vendor release.",
+    messageId: "SVC4056"
+  }
 
-#---------SVC4057------------------------------  
-    MISSING_DERIVED_FROM_TEMPLATE: {
-        code: 400,
-        message: "Error: Invalid Content. Missing derived from template specification.",
-        messageId: "SVC4057"
-    }
+  #---------SVC4057------------------------------
+  MISSING_DERIVED_FROM_TEMPLATE: {
+    code: 400,
+    message: "Error: Invalid Content. Missing derived from template specification.",
+    messageId: "SVC4057"
+  }
 
-#---------SVC4058------------------------------ 
-# %1 - service/resource
-    COMPONENT_MISSING_ICON: {
-        code: 400,
-        message: "Error: Invalid Content. Missing %1 icon.",
-        messageId: "SVC4058"
-    }
-#---------SVC4059------------------------------ 
-# %1 - service/resource
-    COMPONENT_INVALID_ICON: {
-        code: 400,
-        message: "Error: Invalid Content. Invalid %1 icon.",
-        messageId: "SVC4059"
-    }
-#---------SVC4060------------------------------  
-    PARENT_RESOURCE_NOT_FOUND: {
-        code: 400,
-        message: "Error: Invalid Content. Derived from resource template was not found.",
-        messageId: "SVC4060"
-    }
-#---------SVC4061------------------------------  
-    MULTIPLE_PARENT_RESOURCE_FOUND: {
-        code: 400,
-        message: "Error: Invalid Content. Multiple derived from resource template is not allowed.",
-        messageId: "SVC4061"
-    }
+  #---------SVC4058------------------------------
+  # %1 - service/resource
+  COMPONENT_MISSING_ICON: {
+    code: 400,
+    message: "Error: Invalid Content. Missing %1 icon.",
+    messageId: "SVC4058"
+  }
+  #---------SVC4059------------------------------
+  # %1 - service/resource
+  COMPONENT_INVALID_ICON: {
+    code: 400,
+    message: "Error: Invalid Content. Invalid %1 icon.",
+    messageId: "SVC4059"
+  }
+  #---------SVC4060------------------------------
+  PARENT_RESOURCE_NOT_FOUND: {
+    code: 400,
+    message: "Error: Invalid Content. Derived from resource template was not found.",
+    messageId: "SVC4060"
+  }
+  #---------SVC4061------------------------------
+  MULTIPLE_PARENT_RESOURCE_FOUND: {
+    code: 400,
+    message: "Error: Invalid Content. Multiple derived from resource template is not allowed.",
+    messageId: "SVC4061"
+  }
 
-#---------SVC4062------------------------------ 
-# %1 - service/resource
-    MISSING_COMPONENT_NAME: {
-        code: 400,
-        message: "Error: Invalid Content. Missing %1 name.",
-        messageId: "SVC4062"
-    }
-#---------SVC4063------------------------------  
-    #%1  -  resource/service name
-    RESOURCE_NOT_FOUND: {
-        code: 404,
-        message: "Error: Requested '%1' resource was not found.",
-        messageId: "SVC4063"
-    }
+  #---------SVC4062------------------------------
+  # %1 - service/resource
+  MISSING_COMPONENT_NAME: {
+    code: 400,
+    message: "Error: Invalid Content. Missing %1 name.",
+    messageId: "SVC4062"
+  }
+  #---------SVC4063------------------------------
+  #%1  -  resource/service name
+  RESOURCE_NOT_FOUND: {
+    code: 404,
+    message: "Error: Requested '%1' resource was not found.",
+    messageId: "SVC4063"
+  }
 
-#---------SVC4064------------------------------ 
-# %1 - Service/Resource
-    COMPONENT_INVALID_DESCRIPTION: {
-        code: 400,
-        message: "Error: Invalid Content. %1 description contains non-english characters.",
-        messageId: "SVC4064"
-    }
-#---------SVC4065------------------------------ 
-# %1 - Service/Resource
-# %2 - max resource/service name length 
-    COMPONENT_DESCRIPTION_EXCEEDS_LIMIT: {
-        code: 400,
-        message: "Error: Invalid Content. %1 description exceeds limit of %2 characters.",
-        messageId: "SVC4065"
-    }
-#---------SVC4066------------------------------ 
-# %1 - max length   
-    COMPONENT_TAGS_EXCEED_LIMIT: {
-        code: 400,
-        message: "Error: Invalid Content. Tags overall length exceeds limit of %1 characters.",
-        messageId: "SVC4066"
-    }
-#---------SVC4067------------------------------
-# %1 - max length  
-    VENDOR_NAME_EXCEEDS_LIMIT: {
-        code: 400,
-        message: "Error: Invalid Content. Vendor name exceeds limit of %1 characters.",
-        messageId: "SVC4067"
-    }
-#---------SVC4068------------------------------
-# %1 - max length  
-    VENDOR_RELEASE_EXCEEDS_LIMIT: {
-        code: 400,
-        message: "Error: Invalid Content. Vendor release exceeds limit of %1 characters.",
-        messageId: "SVC4068"
-    }
+  #---------SVC4064------------------------------
+  # %1 - Service/Resource
+  COMPONENT_INVALID_DESCRIPTION: {
+    code: 400,
+    message: "Error: Invalid Content. %1 description contains non-english characters.",
+    messageId: "SVC4064"
+  }
+  #---------SVC4065------------------------------
+  # %1 - Service/Resource
+  # %2 - max resource/service name length
+  COMPONENT_DESCRIPTION_EXCEEDS_LIMIT: {
+    code: 400,
+    message: "Error: Invalid Content. %1 description exceeds limit of %2 characters.",
+    messageId: "SVC4065"
+  }
+  #---------SVC4066------------------------------
+  # %1 - max length
+  COMPONENT_TAGS_EXCEED_LIMIT: {
+    code: 400,
+    message: "Error: Invalid Content. Tags overall length exceeds limit of %1 characters.",
+    messageId: "SVC4066"
+  }
+  #---------SVC4067------------------------------
+  # %1 - max length
+  VENDOR_NAME_EXCEEDS_LIMIT: {
+    code: 400,
+    message: "Error: Invalid Content. Vendor name exceeds limit of %1 characters.",
+    messageId: "SVC4067"
+  }
+  #---------SVC4068------------------------------
+  # %1 - max length
+  VENDOR_RELEASE_EXCEEDS_LIMIT: {
+    code: 400,
+    message: "Error: Invalid Content. Vendor release exceeds limit of %1 characters.",
+    messageId: "SVC4068"
+  }
 
-#---------SVC4069------------------------------ 
-# %1 - Service/Resource/Product
-    COMPONENT_INVALID_CONTACT: {
-        code: 400,
-        message: "Error: Invalid Content. %1 Contact Id should be in format 'mnnnnnn' or 'aannna' or 'aannnn', where m=m ,a=a-zA-Z and n=0-9",
-        messageId: "SVC4069"
-    }
-#---------SVC4070------------------------------ 
-# %1 - Service/Resource
-    INVALID_COMPONENT_NAME: {
-        code: 400,
-        message: 'Error: Invalid Content. %1 name is not allowed to contain characters like <>:"\/|?* and space characters other than regular space.',
-        messageId: "SVC4070"
-    }
+  #---------SVC4069------------------------------
+  # %1 - Service/Resource/Product
+  COMPONENT_INVALID_CONTACT: {
+    code: 400,
+    message: "Error: Invalid Content. %1 Contact Id should be in format 'mnnnnnn' or 'aannna' or 'aannnn', where m=m ,a=a-zA-Z and n=0-9",
+    messageId: "SVC4069"
+  }
+  #---------SVC4070------------------------------
+  # %1 - Service/Resource
+  INVALID_COMPONENT_NAME: {
+    code: 400,
+    message: 'Error: Invalid Content. %1 name is not allowed to contain characters like <>:"\/|?* and space characters other than regular space.',
+    messageId: "SVC4070"
+  }
 
-#---------SVC4071------------------------------ 
-    INVALID_VENDOR_NAME: {
-        code: 400,
-        message: 'Error: Invalid Content. Vendor name is not allowed to contain characters like <>:"\/|?* and space characters other than regular space.',
-        messageId: "SVC4071"
-    }
-#---------SVC4072------------------------------ 
-    INVALID_VENDOR_RELEASE: {
-        code: 400,
-        message: 'Error: Invalid Content. Vendor release is not allowed to contain characters like <>:"\/|?* and space characters other than regular space.',
-        messageId: "SVC4072"
-    }
-#---------SVC4073------------------------------ 
-# %1 - Service/Resource
-# %2 - max  resource/service name  
-    COMPONENT_NAME_EXCEEDS_LIMIT: {
-        code: 400,
-        message: "Error: Invalid Content. %1 name exceeds limit of %2 characters.",
-        messageId: "SVC4073"
-    }
-#---------SVC4080------------------------------  
-# %1 - resource/service name
-# %2 - resource/service
-# %3 - First name of last modifier
-# %4 - Last name of last modifier
-# %5 - USER_ID of last modifier
-    COMPONENT_IN_CHECKOUT_STATE: {
-        code: 403,
-        message: "Error: Requested '%1' %2 is locked for modification by %3 %4(%5).",
-        messageId: "SVC4080"
-    }
-#---------SVC4081-----------------------------  
-# %1 - resource/service name
-# %2 - resource/service
-# %3 - First name of last modifier
-# %4 - Last name of last modifier
-# %5 - USER_ID of last modifier
-    COMPONENT_IN_CERT_IN_PROGRESS_STATE: {
-        code: 403,
-        message: "Error: Requested '%1' %2 is locked for certification by %3 %4(%5).",
-        messageId: "SVC4081"
-    }
+  #---------SVC4071------------------------------
+  INVALID_VENDOR_NAME: {
+    code: 400,
+    message: 'Error: Invalid Content. Vendor name is not allowed to contain characters like <>:"\/|?* and space characters other than regular space.',
+    messageId: "SVC4071"
+  }
+  #---------SVC4072------------------------------
+  INVALID_VENDOR_RELEASE: {
+    code: 400,
+    message: 'Error: Invalid Content. Vendor release is not allowed to contain characters like <>:"\/|?* and space characters other than regular space.',
+    messageId: "SVC4072"
+  }
+  #---------SVC4073------------------------------
+  # %1 - Service/Resource
+  # %2 - max  resource/service name
+  COMPONENT_NAME_EXCEEDS_LIMIT: {
+    code: 400,
+    message: "Error: Invalid Content. %1 name exceeds limit of %2 characters.",
+    messageId: "SVC4073"
+  }
+  #---------SVC4080------------------------------
+  # %1 - resource/service name
+  # %2 - resource/service
+  # %3 - First name of last modifier
+  # %4 - Last name of last modifier
+  # %5 - USER_ID of last modifier
+  COMPONENT_IN_CHECKOUT_STATE: {
+    code: 403,
+    message: "Error: Requested '%1' %2 is locked for modification by %3 %4(%5).",
+    messageId: "SVC4080"
+  }
+  #---------SVC4081-----------------------------
+  # %1 - resource/service name
+  # %2 - resource/service
+  # %3 - First name of last modifier
+  # %4 - Last name of last modifier
+  # %5 - USER_ID of last modifier
+  COMPONENT_IN_CERT_IN_PROGRESS_STATE: {
+    code: 403,
+    message: "Error: Requested '%1' %2 is locked for certification by %3 %4(%5).",
+    messageId: "SVC4081"
+  }
 
-#-----------SVC4082---------------------------  
-# %1 - resource/service name
-# %2 - resource/service
-# %3 - First name of last modifier
-# %4 - Last name of last modifier
-# %5 - USER_ID of last modifier
-    COMPONENT_SENT_FOR_CERTIFICATION: {
-        code: 403,
-        message: "Error: Requested '%1' %2 is sent for certification by %3 %4(%5).",
-        messageId: "SVC4082"
-    }
-#-----------SVC4083---------------------------
-    COMPONENT_VERSION_ALREADY_EXIST: {
-        code: 409,
-        message: "Error: Version of this %1 was already promoted.",
-        messageId: "SVC4083"
-    }
-#-----------SVC4084---------------------------
-# %1 - resource/service/product name
-# %2 - resource/service/product
-# %3 - First name of last modifier
-# %4 - Last name of last modifier
-# %5 - USER_ID of last modifier
-    COMPONENT_ALREADY_CHECKED_IN: {
-        code: 409,
-        message: "Error: The current version of '%1' %2 was already checked-in by %3 %4(%5).",
-        messageId: "SVC4084"
-    }
-#-----------SVC4085---------------------------
-# %1 - resource/service/product name
-# %2 - resource/service/product
-# %3 - First name of last modifier
-# %4 - Last name of last modifier
-# %5 - USER_ID of last modifier
-    COMPONENT_CHECKOUT_BY_ANOTHER_USER: {
-        code: 403,
-        message: "Error: %1 %2 has already been checked out by %3 %4(%5).",
-        messageId: "SVC4085"
-    }
-#-----------SVC4086---------------------------
-# %1  - resource/service name
-# %2  - resource/service
-    COMPONENT_IN_USE: {
-        code: 403,
-        message: "Error: Requested '%1' %2 is in use by another user.",
-        messageId: "SVC4086"
-    }
-#-----------SVC4087---------------------------
-# %1 - component name
-# %2 - resource/service/product
-    COMPONENT_HAS_NEWER_VERSION: {
-        code: 409,
-        message: "Error: Checking out of the requested version of the '%1' %2 is not allowed as a newer version exists.",
-        messageId: "SVC4087"
-    }
-#-----------SVC4088---------------------------
-# %1 - resource/service name
-# %2 - resource/service
-# %3 - First name of last modifier
-# %4 - Last name of last modifier
-# %5 - USER_ID of last modifier
-    COMPONENT_ALREADY_CERTIFIED: {
-        code: 403,
-        message: "Error: Requested %1 %2 has already been certified by %3 %4(%5).",
-        messageId: "SVC4088"
-    }
-#-----------SVC4089---------------------------
-# %1 - resource/service name
-# %2 - resource/service
-    COMPONENT_NOT_READY_FOR_CERTIFICATION: {
-        code: 403,
-        message: "Error: Requested '%1' %2 is not ready for certification.",
-        messageId: "SVC4089"
-    }
-#-----------SVC4100---------------------------
-#%1 - property name
-    PROPERTY_NOT_FOUND: {
-        code: 404,
-        message: "Error: Requested '%1' property was not found.",
-        messageId: "SVC4100"
-    }
-#-----------SVC4101---------------------------
-#%1 - property name
-    PROPERTY_ALREADY_EXIST: {
-        code: 409,
-        message: "Error: Property with '%1' name already exists.",
-        messageId: "SVC4101"
-    }
+  #-----------SVC4082---------------------------
+  # %1 - resource/service name
+  # %2 - resource/service
+  # %3 - First name of last modifier
+  # %4 - Last name of last modifier
+  # %5 - USER_ID of last modifier
+  COMPONENT_SENT_FOR_CERTIFICATION: {
+    code: 403,
+    message: "Error: Requested '%1' %2 is sent for certification by %3 %4(%5).",
+    messageId: "SVC4082"
+  }
+  #-----------SVC4083---------------------------
+  COMPONENT_VERSION_ALREADY_EXIST: {
+    code: 409,
+    message: "Error: Version of this %1 was already promoted.",
+    messageId: "SVC4083"
+  }
+  #-----------SVC4084---------------------------
+  # %1 - resource/service/product name
+  # %2 - resource/service/product
+  # %3 - First name of last modifier
+  # %4 - Last name of last modifier
+  # %5 - USER_ID of last modifier
+  COMPONENT_ALREADY_CHECKED_IN: {
+    code: 409,
+    message: "Error: The current version of '%1' %2 was already checked-in by %3 %4(%5).",
+    messageId: "SVC4084"
+  }
+  #-----------SVC4085---------------------------
+  # %1 - resource/service/product name
+  # %2 - resource/service/product
+  # %3 - First name of last modifier
+  # %4 - Last name of last modifier
+  # %5 - USER_ID of last modifier
+  COMPONENT_CHECKOUT_BY_ANOTHER_USER: {
+    code: 403,
+    message: "Error: %1 %2 has already been checked out by %3 %4(%5).",
+    messageId: "SVC4085"
+  }
+  #-----------SVC4086---------------------------
+  # %1  - resource/service name
+  # %2  - resource/service
+  COMPONENT_IN_USE: {
+    code: 403,
+    message: "Error: Requested '%1' %2 is in use by another user.",
+    messageId: "SVC4086"
+  }
+  #-----------SVC4087---------------------------
+  # %1 - component name
+  # %2 - resource/service/product
+  COMPONENT_HAS_NEWER_VERSION: {
+    code: 409,
+    message: "Error: Checking out of the requested version of the '%1' %2 is not allowed as a newer version exists.",
+    messageId: "SVC4087"
+  }
+  #-----------SVC4088---------------------------
+  # %1 - resource/service name
+  # %2 - resource/service
+  # %3 - First name of last modifier
+  # %4 - Last name of last modifier
+  # %5 - USER_ID of last modifier
+  COMPONENT_ALREADY_CERTIFIED: {
+    code: 403,
+    message: "Error: Requested %1 %2 has already been certified by %3 %4(%5).",
+    messageId: "SVC4088"
+  }
+  #-----------SVC4089---------------------------
+  # %1 - resource/service name
+  # %2 - resource/service
+  COMPONENT_NOT_READY_FOR_CERTIFICATION: {
+    code: 403,
+    message: "Error: Requested '%1' %2 is not ready for certification.",
+    messageId: "SVC4089"
+  }
+  #-----------SVC4100---------------------------
+  #%1 - property name
+  PROPERTY_NOT_FOUND: {
+    code: 404,
+    message: "Error: Requested '%1' property was not found.",
+    messageId: "SVC4100"
+  }
+  #-----------SVC4101---------------------------
+  #%1 - property name
+  PROPERTY_ALREADY_EXIST: {
+    code: 409,
+    message: "Error: Property with '%1' name already exists.",
+    messageId: "SVC4101"
+  }
 
-#-----------SVC4102---------------------------
-# %1 - capability type name 
-    CAPABILITY_TYPE_ALREADY_EXIST: {
-        code: 409,
-        message: "Error: Capability Type with name '%1' already exists.",
-        messageId: "SVC4102"
-    }
-#-----------SVC4114---------------------------
-    AUTH_FAILED_INVALIDE_HEADER: {
-        code: 400,
-        message: "Error: Invalid Authorization header.",
-        messageId: "SVC4114"
-    }
-#-----------SVC4115---------------------------
-# %1 - capability type name 
-    MISSING_CAPABILITY_TYPE: {
-        code: 400,
-        message: "Error: Invalid Content. Missing Capability Type '%1'.",
-        messageId: "SVC4115"
-    }
-    RESOURCE_INSTANCE_BAD_REQUEST: {
-        code: 400,
-        message: "Error: Invalid Content.",
-        messageId: "SVC4116"
-    }
-#-----------SVC4117---------------------------
-# %1 - resource instance name
-# %2 - resource instance name
-# %3 - requirement name
-    RESOURCE_INSTANCE_MATCH_NOT_FOUND: {
-        code: 404,
-        message: "Error: Match not found between resource instance '%1' and resource instance '%2' for requirement '%3'.",
-        messageId: "SVC4117"
-    }
-#-----------SVC4118---------------------------
-# %1 - resource instance name
-# %2 - resource instance name
-# %3 - requirement name
-    RESOURCE_INSTANCE_ALREADY_EXIST: {
-        code: 409,
-        message: "Error: Resource instances '%1' and '%2' are already associated with requirement '%3'.",
-        messageId: "SVC4118"
-    }
-#-----------SVC4119---------------------------
-# %1 - resource instance name
-# %2 - resource instance name
-# %3 - requirement name
-    RESOURCE_INSTANCE_RELATION_NOT_FOUND: {
-        code: 404,
-        message: "Error: No relation found between resource instances '%1' and '%2' for requirement '%3'.",
-        messageId: "SVC4119"
-    }
-#-----------SVC4120---------------------------
-# %1 - User's USER_ID
-    USER_INACTIVE: {
-        code: 404,
-        message: "Error: User %1 was not found.",
-        messageId: "SVC4120"
-    }
-#-----------SVC4121---------------------------
-# %1 - User's USER_ID
-    USER_HAS_ACTIVE_ELEMENTS: {
-        code: 403,
-        message: "Error: User with %1 ID can not be deleted since it has active elements(resources/services/artifacts).",
-        messageId: "SVC4121"
-    }
-#-----------SVC4122---------------------------
-# %1 - artifact type
-    ARTIFACT_TYPE_NOT_SUPPORTED: {
-        code: 400,
-        message: "Error: Invalid artifact type '%1'.",
-        messageId: "SVC4122"
-    }
-#-----------SVC4123---------------------------
-    ARTIFACT_LOGICAL_NAME_CANNOT_BE_CHANGED: {
-        code: 400,
-        message: "Error: Artifact logical name cannot be changed.",
-        messageId: "SVC4123"
-    }
-#-----------SVC4124---------------------------
-    MISSING_ARTIFACT_TYPE: {
-        code: 400,
-        message: "Error: Missing artifact type.",
-        messageId: "SVC4124"
-    }
-#-----------SVC4125---------------------------
-# %1-artifact name
-    ARTIFACT_EXIST: {
-        code: 400,
-        message: "Error: Artifact '%1' already exists.",
-        messageId: "SVC4125"
-    }
-#---------SVC4126------------------------------ 
-# %1 - resource/service/product/...
-# %2 - field (tag, vendor name...)
-    INVALID_FIELD_FORMAT: {
-        code: 400,
-        message: "Error:  Invalid %1 %2 format.",
-        messageId: "SVC4126"
-    }
-#-----------SVC4127---------------------------
-    ARTIFACT_INVALID_MD5: {
-        code: 400,
-        message: "Error: Invalid artifact checksum.",
-        messageId: "SVC4127"
-    }
-#-----------SVC4128---------------------------
-    MISSING_ARTIFACT_NAME: {
-        code: 400,
-        message: "Error: Invalid content. Missing artifact name.",
-        messageId: "SVC4128"
-    }
-#-----------SVC4129---------------------------
-    MISSING_PROJECT_CODE: {
-        code: 400,
-        message: "Error: Invalid Content. Missing PROJECT_CODE number.",
-        messageId: "SVC4129"
-    }
-#-----------SVC4130---------------------------
-    INVALID_PROJECT_CODE: {
-        code: 400,
-        message: "Error: Invalid Content. PROJECT_CODE must be from 3 up to 50 characters.",
-        messageId: "SVC4130"
-    }
-#-----------SVC4131---------------------------
-# %1-resource/service
-# %2-srtifact/artifacts
-# %3-semicolomn separated list of artifact 
-    COMPONENT_MISSING_MANDATORY_ARTIFACTS: {
-        code: 403,
-        message: "Error: Missing mandatory informational %1 %2: [%3].",
-        messageId: "SVC4131"
-    }
-#-----------SVC4132---------------------------
-# %1 - lifecycle  type name
-    LIFECYCLE_TYPE_ALREADY_EXIST: {
-        code: 409,
-        message: "Error: Lifecycle Type with name '%1' already exists.",
-        messageId: "SVC4132"
-    }
-#-----------SVC4133---------------------------
-# %1 - service version
-# %2 - service name
-    SERVICE_NOT_AVAILABLE_FOR_DISTRIBUTION: {
-        code: 403,
-        message: "Error: Version %1 of '%2' service is not available for distribution.",
-        messageId: "SVC4133"
-    }
-#-----------SVC4134---------------------------
-    MISSING_LIFECYCLE_TYPE: {
-        code: 400,
-        message: "Error: Invalid Content. Missing interface life-cycle type.",
-        messageId: "SVC4134"
-    }
-#---------SVC4135------------------------------ 
-    SERVICE_CATEGORY_CANNOT_BE_CHANGED: {
-        code: 400,
-        message: "Error: Service category cannot be changed once the service is certified.",
-        messageId: "SVC4135"
-    }
-#---------SVC4136------------------------------ 
-# %1 - distribution environment name    
-    DISTRIBUTION_ENVIRONMENT_NOT_AVAILABLE: {
-        code: 500,
-        message: "Error: Requested distribution environment '%1' is not available.",
-        messageId: "SVC4136"
-    }
-#---------SVC4137------------------------------ 
-# %1 - distribution environment name    
-    DISTRIBUTION_ENVIRONMENT_NOT_FOUND: {
-        code: 400,
-        message: "Error: Requested distribution environment '%1' was not found.",
-        messageId: "SVC4137"
-    }
-#---------SVC4138------------------------------     
-    DISTRIBUTION_ENVIRONMENT_INVALID: {
-        code: 400,
-        message: "Error: Invalid distribution environment.",
-        messageId: "SVC4138"
-    }
-#---------SVC4139------------------------------     
-# %1 - service name
-    DISTRIBUTION_ARTIFACT_NOT_FOUND: {
-        code: 409,
-        message: "Error: Service '%1' cannot be distributed due to missing deployment artifacts.",
-        messageId: "SVC4139"
-    }
-#---------SVC4200------------------------------ 
-# %1 - Service/Resource
-# %2 - max icon name length   
-    COMPONENT_ICON_EXCEEDS_LIMIT: {
-        code: 400,
-        message: "Error: Invalid Content. %1 icon name exceeds limit of %2 characters.",
-        messageId: "SVC4200"
-    }
-#---------SVC4300------------------------------ 
-    RESTRICTED_ACCESS: {
-        code: 403,
-        message: "Error: Restricted access.",
-        messageId: "SVC4300"
-    }
-#---------SVC4301------------------------------ 
-    RESTRICTED_OPERATION: {
-        code: 403,
-        message: "Error: Restricted operation.",
-        messageId: "SVC4301"
-    }
-#---------SVC4500------------------------------     
-    MISSING_BODY: {
-        code: 400  ,
-        message: "Error: Missing request body.",
-        messageId: "SVC4500"
-    }
-#---------SVC4501------------------------------
-    MISSING_PUBLIC_KEY: {
-        code: 400  ,
-        message: "Error: Invalid Content. Missing mandatory parameter 'apiPublicKey'." ,
-        messageId: "SVC4501"
-    }
-#---------SVC4502------------------------------     
-    DISTRIBUTION_ENV_DOES_NOT_EXIST: {
-        code: 400  ,
-        message: "Error: Invalid  Body  : Missing mandatory parameter 'distrEnvName'." ,
-        messageId: "SVC4502"
-    }
-#-----------SVC4503---------------------------
-# %1 - service name
-    SERVICE_NOT_FOUND: {
-        code: 404,
-        message: "Error: Requested '%1' service was not found.",
-        messageId: "SVC4503"
-    }
+  #-----------SVC4102---------------------------
+  # %1 - capability type name
+  CAPABILITY_TYPE_ALREADY_EXIST: {
+    code: 409,
+    message: "Error: Capability Type with name '%1' already exists.",
+    messageId: "SVC4102"
+  }
+  #-----------SVC4114---------------------------
+  AUTH_FAILED_INVALIDE_HEADER: {
+    code: 400,
+    message: "Error: Invalid Authorization header.",
+    messageId: "SVC4114"
+  }
+  #-----------SVC4115---------------------------
+  # %1 - capability type name
+  MISSING_CAPABILITY_TYPE: {
+    code: 400,
+    message: "Error: Invalid Content. Missing Capability Type '%1'.",
+    messageId: "SVC4115"
+  }
+  RESOURCE_INSTANCE_BAD_REQUEST: {
+    code: 400,
+    message: "Error: Invalid Content.",
+    messageId: "SVC4116"
+  }
+  #-----------SVC4117---------------------------
+  # %1 - resource instance name
+  # %2 - resource instance name
+  # %3 - requirement name
+  RESOURCE_INSTANCE_MATCH_NOT_FOUND: {
+    code: 404,
+    message: "Error: Match not found between resource instance '%1' and resource instance '%2' for requirement '%3'.",
+    messageId: "SVC4117"
+  }
+  #-----------SVC4118---------------------------
+  # %1 - resource instance name
+  # %2 - resource instance name
+  # %3 - requirement name
+  RESOURCE_INSTANCE_ALREADY_EXIST: {
+    code: 409,
+    message: "Error: Resource instances '%1' and '%2' are already associated with requirement '%3'.",
+    messageId: "SVC4118"
+  }
+  #-----------SVC4119---------------------------
+  # %1 - resource instance name
+  # %2 - resource instance name
+  # %3 - requirement name
+  RESOURCE_INSTANCE_RELATION_NOT_FOUND: {
+    code: 404,
+    message: "Error: No relation found between resource instances '%1' and '%2' for requirement '%3'.",
+    messageId: "SVC4119"
+  }
+  #-----------SVC4120---------------------------
+  # %1 - User's USER_ID
+  USER_INACTIVE: {
+    code: 404,
+    message: "Error: User %1 was not found.",
+    messageId: "SVC4120"
+  }
+  #-----------SVC4121---------------------------
+  # %1 - User's USER_ID
+  USER_HAS_ACTIVE_ELEMENTS: {
+    code: 403,
+    message: "Error: User with %1 ID can not be deleted since it has active elements(resources/services/artifacts).",
+    messageId: "SVC4121"
+  }
+  #-----------SVC4122---------------------------
+  # %1 - artifact type
+  ARTIFACT_TYPE_NOT_SUPPORTED: {
+    code: 400,
+    message: "Error: Invalid artifact type '%1'.",
+    messageId: "SVC4122"
+  }
+  #-----------SVC4123---------------------------
+  ARTIFACT_LOGICAL_NAME_CANNOT_BE_CHANGED: {
+    code: 400,
+    message: "Error: Artifact logical name cannot be changed.",
+    messageId: "SVC4123"
+  }
+  #-----------SVC4124---------------------------
+  MISSING_ARTIFACT_TYPE: {
+    code: 400,
+    message: "Error: Missing artifact type.",
+    messageId: "SVC4124"
+  }
+  #-----------SVC4125---------------------------
+  # %1-artifact name
+  ARTIFACT_EXIST: {
+    code: 400,
+    message: "Error: Artifact '%1' already exists.",
+    messageId: "SVC4125"
+  }
+  #---------SVC4126------------------------------
+  # %1 - resource/service/product/...
+  # %2 - field (tag, vendor name...)
+  INVALID_FIELD_FORMAT: {
+    code: 400,
+    message: "Error:  Invalid %1 %2 format.",
+    messageId: "SVC4126"
+  }
+  #-----------SVC4127---------------------------
+  ARTIFACT_INVALID_MD5: {
+    code: 400,
+    message: "Error: Invalid artifact checksum.",
+    messageId: "SVC4127"
+  }
+  #-----------SVC4128---------------------------
+  MISSING_ARTIFACT_NAME: {
+    code: 400,
+    message: "Error: Invalid content. Missing artifact name.",
+    messageId: "SVC4128"
+  }
+  #-----------SVC4129---------------------------
+  MISSING_PROJECT_CODE: {
+    code: 400,
+    message: "Error: Invalid Content. Missing PROJECT_CODE number.",
+    messageId: "SVC4129"
+  }
+  #-----------SVC4130---------------------------
+  INVALID_PROJECT_CODE: {
+    code: 400,
+    message: "Error: Invalid Content. PROJECT_CODE must be from 3 up to 50 characters.",
+    messageId: "SVC4130"
+  }
+  #-----------SVC4131---------------------------
+  # %1-resource/service
+  # %2-srtifact/artifacts
+  # %3-semicolomn separated list of artifact
+  COMPONENT_MISSING_MANDATORY_ARTIFACTS: {
+    code: 403,
+    message: "Error: Missing mandatory informational %1 %2: [%3].",
+    messageId: "SVC4131"
+  }
+  #-----------SVC4132---------------------------
+  # %1 - lifecycle  type name
+  LIFECYCLE_TYPE_ALREADY_EXIST: {
+    code: 409,
+    message: "Error: Lifecycle Type with name '%1' already exists.",
+    messageId: "SVC4132"
+  }
+  #-----------SVC4133---------------------------
+  # %1 - service version
+  # %2 - service name
+  SERVICE_NOT_AVAILABLE_FOR_DISTRIBUTION: {
+    code: 403,
+    message: "Error: Version %1 of '%2' service is not available for distribution.",
+    messageId: "SVC4133"
+  }
+  #-----------SVC4134---------------------------
+  MISSING_LIFECYCLE_TYPE: {
+    code: 400,
+    message: "Error: Invalid Content. Missing interface life-cycle type.",
+    messageId: "SVC4134"
+  }
+  #---------SVC4135------------------------------
+  SERVICE_CATEGORY_CANNOT_BE_CHANGED: {
+    code: 400,
+    message: "Error: Service category cannot be changed once the service is certified.",
+    messageId: "SVC4135"
+  }
+  #---------SVC4136------------------------------
+  # %1 - distribution environment name
+  DISTRIBUTION_ENVIRONMENT_NOT_AVAILABLE: {
+    code: 500,
+    message: "Error: Requested distribution environment '%1' is not available.",
+    messageId: "SVC4136"
+  }
+  #---------SVC4137------------------------------
+  # %1 - distribution environment name
+  DISTRIBUTION_ENVIRONMENT_NOT_FOUND: {
+    code: 400,
+    message: "Error: Requested distribution environment '%1' was not found.",
+    messageId: "SVC4137"
+  }
+  #---------SVC4138------------------------------
+  DISTRIBUTION_ENVIRONMENT_INVALID: {
+    code: 400,
+    message: "Error: Invalid distribution environment.",
+    messageId: "SVC4138"
+  }
+  #---------SVC4139------------------------------
+  # %1 - service name
+  DISTRIBUTION_ARTIFACT_NOT_FOUND: {
+    code: 409,
+    message: "Error: Service '%1' cannot be distributed due to missing deployment artifacts.",
+    messageId: "SVC4139"
+  }
+  #---------SVC4200------------------------------
+  # %1 - Service/Resource
+  # %2 - max icon name length
+  COMPONENT_ICON_EXCEEDS_LIMIT: {
+    code: 400,
+    message: "Error: Invalid Content. %1 icon name exceeds limit of %2 characters.",
+    messageId: "SVC4200"
+  }
+  #---------SVC4300------------------------------
+  RESTRICTED_ACCESS: {
+    code: 403,
+    message: "Error: Restricted access.",
+    messageId: "SVC4300"
+  }
+  #---------SVC4301------------------------------
+  RESTRICTED_OPERATION: {
+    code: 403,
+    message: "Error: Restricted operation.",
+    messageId: "SVC4301"
+  }
+  #---------SVC4500------------------------------
+  MISSING_BODY: {
+    code: 400  ,
+    message: "Error: Missing request body.",
+    messageId: "SVC4500"
+  }
+  #---------SVC4501------------------------------
+  MISSING_PUBLIC_KEY: {
+    code: 400  ,
+    message: "Error: Invalid Content. Missing mandatory parameter 'apiPublicKey'." ,
+    messageId: "SVC4501"
+  }
+  #---------SVC4502------------------------------
+  DISTRIBUTION_ENV_DOES_NOT_EXIST: {
+    code: 400  ,
+    message: "Error: Invalid  Body  : Missing mandatory parameter 'distrEnvName'." ,
+    messageId: "SVC4502"
+  }
+  #-----------SVC4503---------------------------
+  # %1 - service name
+  SERVICE_NOT_FOUND: {
+    code: 404,
+    message: "Error: Requested '%1' service was not found.",
+    messageId: "SVC4503"
+  }
 
-#---------SVC4504------------------------------ 
-# %1 - Service/Resource
-# %2 - service/resource version
-    COMPONENT_VERSION_NOT_FOUND: {
-        code: 404,
-        message: "Error: %1 version %2 was not found.",
-        messageId: "SVC4504"
-    }
-#-----------SVC4505---------------------------
-    #%1-artifact name
- 
-    ARTIFACT_NOT_FOUND: {
-        code: 404,
-        message: "Error: Artifact '%1' was not found.",
-        messageId: "SVC4505"
-    }
-#---------SVC4506------------------------------ 
-    MISSING_ENV_NAME: {
-        code: 400  ,
-        message: "Error: Invalid Content. Missing mandatory parameter 'distrEnvName'.",
-        messageId: "SVC4506"
-    }
-#---------SVC4507------------------------------ 
-    COMPONENT_INVALID_TAGS_NO_COMP_NAME: {
-        code: 400,
-        message: "Error: Invalid Content. One of the tags should be the component name.",
-        messageId: "SVC4507"
-    }
- 
-#---------SVC4508------------------------------ 
-    SERVICE_NAME_CANNOT_BE_CHANGED: {
-        code: 400,
-        message: "Error: Service name cannot be changed once the service is certified.",
-        messageId: "SVC4508"
-    }
+  #---------SVC4504------------------------------
+  # %1 - Service/Resource
+  # %2 - service/resource version
+  COMPONENT_VERSION_NOT_FOUND: {
+    code: 404,
+    message: "Error: %1 version %2 was not found.",
+    messageId: "SVC4504"
+  }
+  #-----------SVC4505---------------------------
+  #%1-artifact name
 
-#---------SVC4509------------------------------ 
-    SERVICE_ICON_CANNOT_BE_CHANGED: {
-        code: 400,
-        message: "Error: Icon cannot be changed once the service is certified.",
-        messageId: "SVC4509"
-    }
-#---------SVC4510------------------------------ 
-# %1 - icon name max length
-    SERVICE_ICON_EXCEEDS_LIMIT: {
-        code: 400,
-        message: "Error: Invalid Content. Icon name exceeds limit of %1 characters.",
-        messageId: "SVC4510"
-    }
-#---------SVC4511------------------------------ 
-    DISTRIBUTION_REQUESTED_NOT_FOUND: {
-        code: 404,
-        message: "Error: Requested distribution was not found.",
-        messageId: "SVC4511"
-    }
-#---------SVC4512------------------------------ 
-# %1 - Distribution ID
-    DISTRIBUTION_REQUESTED_FAILED: {
-        code: 403,
-        message: "Error: Requested distribution '%1' failed.",
-        messageId: "SVC4512"
-    }
-#---------SVC4513------------------------------ 
-    RESOURCE_CATEGORY_CANNOT_BE_CHANGED: {
-        code: 400,
-        message: "Error: Resource category cannot be changed once the resource is certified.",
-        messageId: "SVC4513"
-    }
-#---------SVC4514------------------------------ 
-    RESOURCE_NAME_CANNOT_BE_CHANGED: {
-        code: 400,
-        message: "Error: Resource name cannot be changed once the resource is certified.",
-        messageId: "SVC4514"
-    }
-#---------SVC4515------------------------------ 
-    RESOURCE_ICON_CANNOT_BE_CHANGED: {
-        code: 400,
-        message: "Error: Icon cannot be changed once the resource is certified.",
-        messageId: "SVC4515"
-    }
-#---------SVC4516------------------------------ 
-    RESOURCE_VENDOR_NAME_CANNOT_BE_CHANGED: {
-        code: 400,
-        message: "Error: Vendor name cannot be changed once the resource is certified.",
-        messageId: "SVC4516"
-    }
-#---------SVC4517------------------------------ 
-    RESOURCE_DERIVED_FROM_CANNOT_BE_CHANGED: {
-        code: 400,
-        message: "Error: Derived from resource template cannot be changed once the resource is certified.",
-        messageId: "SVC4517"
-    }
-#---------SVC4518------------------------------ 
-# %1 - max length 
-    COMPONENT_SINGLE_TAG_EXCEED_LIMIT: {
-        code: 400,
-        message: "Error: Invalid Content. Single tag exceeds limit of %1 characters.",
-        messageId: "SVC4518"
-    }
-#---------SVC4519------------------------------ 
-    INVALID_DEFAULT_VALUE: {
-        code: 400,
-        message: "Error: mismatch in data-type occurred for property %1. data type is %2 and default value found is %3.",
-        messageId: "SVC4519"
-    }
-#---------SVC4520------------------------------ 
-# %1 - service or resource 
-    ADDITIONAL_INFORMATION_MAX_NUMBER_REACHED: {
-        code: 409,
-        message: "Error: Maximal number of additional %1 parameters was reached.",
-        messageId: "SVC4520"
-    }
-#---------SVC4521------------------------------
-    ADDITIONAL_INFORMATION_EMPTY_STRING_NOT_ALLOWED: {
-        code: 400,
-        message: "Error: Invalid Content. The Additional information label and value cannot be empty.",
-        messageId: "SVC4521"
-    }
-#---------SVC4522------------------------------ 
-# %1 - label/value
-# %2 - Maximal length of %1
-    ADDITIONAL_INFORMATION_EXCEEDS_LIMIT: {
-        code: 400,
-        message: "Error: Invalid Content. Additional information %1 exceeds limit of %2 characters.",
-        messageId: "SVC4522"
-    }
-#---------SVC4523------------------------------
-    ADDITIONAL_INFORMATION_KEY_NOT_ALLOWED_CHARACTERS: {
-        code: 400,
-        message: 'Error: Invalid Content. Additional information label is not allowed to contain characters like <>:"\/|?* and space characters other than regular space.',
-        messageId: "SVC4523"
-    }
-#---------SVC4524------------------------------
-    ADDITIONAL_INFORMATION_NOT_FOUND: {
-        code: 409,
-        message: "Error: Requested additional information was not found.",
-        messageId: "SVC4524"
-    }
-#---------SVC4525------------------------------    
-    ADDITIONAL_INFORMATION_VALUE_NOT_ALLOWED_CHARACTERS: {
-        code: 400,
-        message: 'Error: Invalid Content. Additional information contains non-english characters.',
-        messageId: "SVC4525"
-    }
-#---------SVC4526------------------------------ 
-    RESOURCE_INSTANCE_NOT_FOUND: {
-        code: 404,
-        message: "Error: Requested '%1' resource instance was not found.",
-        messageId: "SVC4526"
-    }
-#---------SVC4527------------------------------ 
-    ASDC_VERSION_NOT_FOUND: {
-        code: 500,
-        message: 'Error: ASDC version cannot be displayed.',
-        messageId: "SVC4527"
-    }
-#---------SVC4528------------------------------ 
-# %1-artifact url/artifact label/artifact description/VNF Service Indicator
-    MISSING_DATA: {
-        code: 400,
-        message: "Error: Invalid content. Missing %1.",
-        messageId: "SVC4528"
-    }
-#---------SVC4529------------------------------ 
-# %1-artifact url/artifact label/artifact description/artifact name
-# %2 - Maximal length of %1
-    EXCEEDS_LIMIT: {
-        code: 400,
-        message: "Error: Invalid Content. %1 exceeds limit of %2 characters.",
-        messageId: "SVC4529"
-    }
-#---------SVC4530------------------------------ 
-    ARTIFACT_INVALID_TIMEOUT: {
-        code: 400,
-        message: "Error: Invalid Content. Artifact Timeout should be set to valid positive non-zero number of minutes.",
-        messageId: "SVC4530"
-    }
-#---------SVC4531------------------------------ 
-    SERVICE_IS_VNF_CANNOT_BE_CHANGED: {
-        code: 400,
-        message: "Error: VNF Indicator cannot be updated for certified service.",
-        messageId: "SVC4531"
-    }
- #---------SVC4532------------------------------ 
-    RESOURCE_INSTANCE_NOT_FOUND_ON_SERVICE: {
-        code: 404,
-        message: "Error: Requested '%1' resource instance was not found on the service '%2.",
-        messageId: "SVC4532"
-    }
- #---------SVC4533------------------------------ 
- # %1 -  "HEAT"/"HEAT_ENV"/"MURANO_PKG"/"YANG_XML" 
-    WRONG_ARTIFACT_FILE_EXTENSION: {
-        code: 400,
-        message: "Error: Invalid file extension for %1 artifact type.",
-        messageId: "SVC4533"
-    }
+  ARTIFACT_NOT_FOUND: {
+    code: 404,
+    message: "Error: Artifact '%1' was not found.",
+    messageId: "SVC4505"
+  }
+  #---------SVC4506------------------------------
+  MISSING_ENV_NAME: {
+    code: 400  ,
+    message: "Error: Invalid Content. Missing mandatory parameter 'distrEnvName'.",
+    messageId: "SVC4506"
+  }
+  #---------SVC4507------------------------------
+  COMPONENT_INVALID_TAGS_NO_COMP_NAME: {
+    code: 400,
+    message: "Error: Invalid Content. One of the tags should be the component name.",
+    messageId: "SVC4507"
+  }
 
-#---------SVC4534------------------------------ 
-# %1 -  "HEAT"/"HEAT_ENV"             
-    INVALID_YAML: {
-        code: 400,
-        message: "Error: Uploaded YAML file for %1 artifact is invalid.",
-        messageId: "SVC4534"
-    }
+  #---------SVC4508------------------------------
+  SERVICE_NAME_CANNOT_BE_CHANGED: {
+    code: 400,
+    message: "Error: Service name cannot be changed once the service is certified.",
+    messageId: "SVC4508"
+  }
 
-#---------SVC4535------------------------------ 
-# %1 -  "HEAT"             
-    INVALID_DEPLOYMENT_ARTIFACT_HEAT: {
-        code: 400,
-        message: "Error: Invalid %1 artifact.",
-        messageId: "SVC4535"
-    }
-#---------SVC4536------------------------------ 
-# %1 - "Resource"/"Service"
-# %2 -  resource/service name 
-# %3 -  "HEAT"/"HEAT_ENV"/"MURANO_PKG" 
-# %4 -  "HEAT"/"HEAT_ENV"/"MURANO_PKG
-    DEPLOYMENT_ARTIFACT_OF_TYPE_ALREADY_EXISTS: {
-        code: 400,
-        message: "Error: %1 '%2' already has a deployment artifact of %3 type .Please delete or update an existing %4 artifact.",
-        messageId: "SVC4536"
-    }
+  #---------SVC4509------------------------------
+  SERVICE_ICON_CANNOT_BE_CHANGED: {
+    code: 400,
+    message: "Error: Icon cannot be changed once the service is certified.",
+    messageId: "SVC4509"
+  }
+  #---------SVC4510------------------------------
+  # %1 - icon name max length
+  SERVICE_ICON_EXCEEDS_LIMIT: {
+    code: 400,
+    message: "Error: Invalid Content. Icon name exceeds limit of %1 characters.",
+    messageId: "SVC4510"
+  }
+  #---------SVC4511------------------------------
+  DISTRIBUTION_REQUESTED_NOT_FOUND: {
+    code: 404,
+    message: "Error: Requested distribution was not found.",
+    messageId: "SVC4511"
+  }
+  #---------SVC4512------------------------------
+  # %1 - Distribution ID
+  DISTRIBUTION_REQUESTED_FAILED: {
+    code: 403,
+    message: "Error: Requested distribution '%1' failed.",
+    messageId: "SVC4512"
+  }
+  #---------SVC4513------------------------------
+  RESOURCE_CATEGORY_CANNOT_BE_CHANGED: {
+    code: 400,
+    message: "Error: Resource category cannot be changed once the resource is certified.",
+    messageId: "SVC4513"
+  }
+  #---------SVC4514------------------------------
+  RESOURCE_NAME_CANNOT_BE_CHANGED: {
+    code: 400,
+    message: "Error: Resource name cannot be changed once the resource is certified.",
+    messageId: "SVC4514"
+  }
+  #---------SVC4515------------------------------
+  RESOURCE_ICON_CANNOT_BE_CHANGED: {
+    code: 400,
+    message: "Error: Icon cannot be changed once the resource is certified.",
+    messageId: "SVC4515"
+  }
+  #---------SVC4516------------------------------
+  RESOURCE_VENDOR_NAME_CANNOT_BE_CHANGED: {
+    code: 400,
+    message: "Error: Vendor name cannot be changed once the resource is certified.",
+    messageId: "SVC4516"
+  }
+  #---------SVC4517------------------------------
+  RESOURCE_DERIVED_FROM_CANNOT_BE_CHANGED: {
+    code: 400,
+    message: "Error: Derived from resource template cannot be changed once the resource is certified.",
+    messageId: "SVC4517"
+  }
+  #---------SVC4518------------------------------
+  # %1 - max length
+  COMPONENT_SINGLE_TAG_EXCEED_LIMIT: {
+    code: 400,
+    message: "Error: Invalid Content. Single tag exceeds limit of %1 characters.",
+    messageId: "SVC4518"
+  }
+  #---------SVC4519------------------------------
+  INVALID_DEFAULT_VALUE: {
+    code: 400,
+    message: "Error: mismatch in data-type occurred for property %1. data type is %2 and default value found is %3.",
+    messageId: "SVC4519"
+  }
+  #---------SVC4520------------------------------
+  # %1 - service or resource
+  ADDITIONAL_INFORMATION_MAX_NUMBER_REACHED: {
+    code: 409,
+    message: "Error: Maximal number of additional %1 parameters was reached.",
+    messageId: "SVC4520"
+  }
+  #---------SVC4521------------------------------
+  ADDITIONAL_INFORMATION_EMPTY_STRING_NOT_ALLOWED: {
+    code: 400,
+    message: "Error: Invalid Content. The Additional information label and value cannot be empty.",
+    messageId: "SVC4521"
+  }
+  #---------SVC4522------------------------------
+  # %1 - label/value
+  # %2 - Maximal length of %1
+  ADDITIONAL_INFORMATION_EXCEEDS_LIMIT: {
+    code: 400,
+    message: "Error: Invalid Content. Additional information %1 exceeds limit of %2 characters.",
+    messageId: "SVC4522"
+  }
+  #---------SVC4523------------------------------
+  ADDITIONAL_INFORMATION_KEY_NOT_ALLOWED_CHARACTERS: {
+    code: 400,
+    message: 'Error: Invalid Content. Additional information label is not allowed to contain characters like <>:"\/|?* and space characters other than regular space.',
+    messageId: "SVC4523"
+  }
+  #---------SVC4524------------------------------
+  ADDITIONAL_INFORMATION_NOT_FOUND: {
+    code: 409,
+    message: "Error: Requested additional information was not found.",
+    messageId: "SVC4524"
+  }
+  #---------SVC4525------------------------------
+  ADDITIONAL_INFORMATION_VALUE_NOT_ALLOWED_CHARACTERS: {
+    code: 400,
+    message: 'Error: Invalid Content. Additional information contains non-english characters.',
+    messageId: "SVC4525"
+  }
+  #---------SVC4526------------------------------
+  RESOURCE_INSTANCE_NOT_FOUND: {
+    code: 404,
+    message: "Error: Requested '%1' resource instance was not found.",
+    messageId: "SVC4526"
+  }
+  #---------SVC4527------------------------------
+  ASDC_VERSION_NOT_FOUND: {
+    code: 500,
+    message: 'Error: ASDC version cannot be displayed.',
+    messageId: "SVC4527"
+  }
+  #---------SVC4528------------------------------
+  # %1-artifact url/artifact label/artifact description/VNF Service Indicator
+  MISSING_DATA: {
+    code: 400,
+    message: "Error: Invalid content. Missing %1.",
+    messageId: "SVC4528"
+  }
+  #---------SVC4529------------------------------
+  # %1-artifact url/artifact label/artifact description/artifact name
+  # %2 - Maximal length of %1
+  EXCEEDS_LIMIT: {
+    code: 400,
+    message: "Error: Invalid Content. %1 exceeds limit of %2 characters.",
+    messageId: "SVC4529"
+  }
+  #---------SVC4530------------------------------
+  ARTIFACT_INVALID_TIMEOUT: {
+    code: 400,
+    message: "Error: Invalid Content. Artifact Timeout should be set to valid positive non-zero number of minutes.",
+    messageId: "SVC4530"
+  }
+  #---------SVC4531------------------------------
+  SERVICE_IS_VNF_CANNOT_BE_CHANGED: {
+    code: 400,
+    message: "Error: VNF Indicator cannot be updated for certified service.",
+    messageId: "SVC4531"
+  }
+  #---------SVC4532------------------------------
+  RESOURCE_INSTANCE_NOT_FOUND_ON_SERVICE: {
+    code: 404,
+    message: "Error: Requested '%1' resource instance was not found on the service '%2.",
+    messageId: "SVC4532"
+  }
+  #---------SVC4533------------------------------
+  # %1 -  "HEAT"/"HEAT_ENV"/"MURANO_PKG"/"YANG_XML"
+  WRONG_ARTIFACT_FILE_EXTENSION: {
+    code: 400,
+    message: "Error: Invalid file extension for %1 artifact type.",
+    messageId: "SVC4533"
+  }
 
-#---------SVC4537------------------------------ 
-    MISSING_HEAT: {
-        code: 400,
-        message: "Error: Missing HEAT artifact. HEAT_ENV artifact cannot be uploaded without corresponding HEAT template.",
-        messageId: "SVC4537"
-    }
-#---------SVC4538------------------------------ 
-    MISMATCH_HEAT_VS_HEAT_ENV: {
-        code: 400,
-        message: "Error: Invalid artifact content. Parameter's set in HEAT_ENV '%1' artifact doesn't match the parameters in HEAT '%2' artifact.",
-        messageId: "SVC4538"
-    }
-#---------SVC4539------------------------------ 
-    INVALID_RESOURCE_PAYLOAD: {
-        code: 400,
-        message: "Error: Invalid resource payload.",
-        messageId: "SVC4539"
-    }
-#---------SVC4540------------------------------ 
-    INVALID_TOSCA_FILE_EXTENSION: {
-        code: 400,
-        message: "Error: Invalid file extension for TOSCA template.",
-        messageId: "SVC4540"
-    }
-#---------SVC4541------------------------------ 
-    INVALID_YAML_FILE: {
-        code: 400,
-        message: "Error: Invalid YAML file.",
-        messageId: "SVC4541"
-    }
-#---------SVC4542------------------------------ 
-    INVALID_TOSCA_TEMPLATE: {
-        code: 400,
-        message: "Error: Invalid TOSCA template.",
-        messageId: "SVC4542"
-    }
-#---------SVC4543------------------------------ 
-    NOT_RESOURCE_TOSCA_TEMPLATE: {
-        code: 400,
-        message: "Error: Imported Service TOSCA template.",
-        messageId: "SVC4543"
-    }
-#---------SVC4544------------------------------ 
-    NOT_SINGLE_RESOURCE: {
-        code: 400,
-        message: "Error: Imported TOSCA template should contain one resource definition.",
-        messageId: "SVC4544"
-    }
-#---------SVC4545------------------------------ 
-    INVALID_RESOURCE_NAMESPACE: {
-        code: 400,
-        message: "Error: Invalid resource namespace.",
-        messageId: "SVC4545"
-    }
-#---------SVC4546------------------------------ 
-    RESOURCE_ALREADY_EXISTS: {
-        code: 400,
-        message: "Error: Imported resource already exists in ASDC Catalog.",
-        messageId: "SVC4546"
-    }
-#---------SVC4549------------------------------ 
-    INVALID_RESOURCE_CHECKSUM: {
-        code: 400,
-        message: "Error: Invalid resource checksum.",
-        messageId: "SVC4549"
-    }
-#---------SVC4550------------------------------ 
-    #%1  -  Consumer salt
-    INVALID_LENGTH: {
-        code: 400,
-        message: "Error: Invalid %1 length.",
-        messageId: "SVC4550"
-    }
-    #---------SVC4551------------------------------  
-    #%1  -  ECOMP User name
-    ECOMP_USER_NOT_FOUND: {
-        code: 404,
-        message: "Error: ECOMP User '%1' was not found.",
-        messageId: "SVC4551"
-    }
-#---------SVC4552------------------------------
-    CONSUMER_ALREADY_EXISTS: {
-        code: 409,
-        message: "Error: ECOMP User already exists.",
-        messageId: "SVC4552"
-    }
-#---------SVC4553-----------------------------
-    #%1  -  Consumer name / Consumer password/ Consumer salt 
-    INVALID_CONTENT_PARAM: {
-        code: 400,
-        message: "Error: %1 is invalid.",
-        messageId: "SVC4553"
-    }
-    #---------SVC4554------------------------------ 
-# %1 - "Resource"/"Service"
-    COMPONENT_ARTIFACT_NOT_FOUND: {
-        code: 404,
-        message: "Error: Requested artifact doesn't belong to specified %1.",
-        messageId: "SVC4554"
-    }
-#---------SVC4554------------------------------
-# %1 - "Service name"
-    SERVICE_DEPLOYMENT_ARTIFACT_NOT_FOUND: {
-        code: 403,
-        message: "Error: Requested '%1' service is not ready for certification. Service has to have at least one deployment artifact.",
-        messageId: "SVC4554"
-    }
-#---------SVC4555------------------------------ 
-#%1 - "Resource"/"Service"/"Product"
-#%2 - "category"
-    COMPONENT_ELEMENT_INVALID_NAME_LENGTH: {
-        code: 400,
-        message: "Error: Invalid %1 %2 name length.",
-        messageId: "SVC4555"
-    }
-#---------SVC4556------------------------------ 
-#%1 - "Resource"/"Service"/"Product"
-#%2 - "category"
-    COMPONENT_ELEMENT_INVALID_NAME_FORMAT: {
-        code: 400,
-        message: "Error: Invalid %1 %2 name format.",
-        messageId: "SVC4556"
-    }
-#---------SVC4557------------------------------ 
-#%1 - "Resource"/"Service"/"Product"
-#%2 - "category name"
-    COMPONENT_CATEGORY_ALREADY_EXISTS: {
-        code: 409,
-        message: "Error: %1 category name '%2' already exists.",
-        messageId: "SVC4557"
-    }
-#---------SVC4558------------------------------
-# %1 - "service"/"VF"
-# %2 - "Resource name"
-    VALIDATED_RESOURCE_NOT_FOUND: {
-        code: 403,
-        message: "Error: Submit for Testing is not permitted as your '%1' includes non-validated '%2' resource.",
-        messageId: "SVC4558"
-    }
-#---------SVC4559------------------------------
-# %1 - "service"/"VF"
-# %2 - "Resource name"
-    FOUND_ALREADY_VALIDATED_RESOURCE: {
-        code: 403,
-        message: "Error: Submit for Testing is not permitted as your '%1' includes non-validated '%2' resource. Please use already available validated resource version.",
-        messageId: "SVC4559"
-    }
-#---------SVC4560------------------------------
-# %1 - "service"/"VF"
-# %2 - "Resource name"
-    FOUND_LIST_VALIDATED_RESOURCES: {
-        code: 403,
-        message: "Error: Submit for Testing is not permitted as your '%1' includes non-validated '%2' resource. Please use one of available validated resource versions.",
-        messageId: "SVC4560"
-    }  
-#---------SVC4561------------------------------
-# %1 - "resource"/"product"
-# %2 - "category"
-# %3 - "category name"
-    COMPONENT_CATEGORY_NOT_FOUND: {
-        code: 404,
-        message: "Error: Requested %1 %2 '%3' was not found.",
-        messageId: "SVC4561"
-    }
-#---------SVC4562------------------------------
-# %1 - "Resource"/"Product"
-# %2 - "sub-category name"
-# %3 - "category name"
-    COMPONENT_SUB_CATEGORY_EXISTS_FOR_CATEGORY: {
-        code: 409,
-        message: "Error: %1 sub-category '%2' already exists under '%3' category.",
-        messageId: "SVC4562"
-    }
-#---------SVC4563------------------------------
-# %1 - "Product"
-# %2 - "grouping name"
-# %3 - "sub-category name"
-    COMPONENT_GROUPING_EXISTS_FOR_SUB_CATEGORY: {
-        code: 409,
-        message: "Error: %1 grouping '%2' already exists under '%3' sub-category.",
-        messageId: "SVC4563"
-    }
-#---------SVC4564------------------------------ 
-# %1 - product name
-    PRODUCT_NOT_FOUND: {
-        code: 404,
-        message: "Error: Requested '%1' product was not found.",
-        messageId: "SVC4564"
-    }
-#---------SVC4565------------------------------ 
-# %1 - "HEAT"   
-# %2  - parameter type ("string" , "boolean" , "number") 
-# %3 -  parameter name
-    INVALID_HEAT_PARAMETER_VALUE: {
-        code: 400,
-        message: "Error: Invalid %1 artifact. Invalid %2 value set for '%3' parameter.",
-        messageId: "SVC4565"
-    }
-#---------SVC4566------------------------------ 
-# %1 - "HEAT"   
-# %2  - parameter type ("string" , "boolean" , "number") 
-    INVALID_HEAT_PARAMETER_TYPE: {
-        code: 400,
-        message: "Error: Invalid %1 artifact. Unsupported '%2' parameter type.",
-        messageId: "SVC4566"
-    }
-#---------SVC4567------------------------------ 
-# %1 -  "YANG_XML"             
-    INVALID_XML: {
-        code: 400,
-        message: "Error: Uploaded XML file for %1 artifact is invalid.",
-        messageId: "SVC4567"
-    }
-#---------SVC4567------------------------------ 
-# %1 - "User Name and USER_ID"   
-# %2  -"checked-out"/"in-certification"
-    CANNOT_DELETE_USER_WITH_ACTIVE_ELEMENTS: {
-        code: 409,
-        message: "Error: User cannot be deleted. User '%1' has %2 projects.",
-        messageId: "SVC4567"
-    }
-#---------SVC4568------------------------------ 
-# %1 - "User Name and USER_ID"   
-# %2  -"checked-out"/"in-certification"
-    CANNOT_UPDATE_USER_WITH_ACTIVE_ELEMENTS: {
-        code: 409,
-        message: "Error: Role cannot be changed. User '%1' has %2 projects.",
-        messageId: "SVC4568"
-    }
-#---------SVC4570------------------------------ 
-    UPDATE_USER_ADMIN_CONFLICT: {
-        code: 409,
-        message: "Error: An administrator is not allowed to change his/her role.",
-        messageId: "SVC4570"
-    }
-#---------SVC4571------------------------------ 
-    SERVICE_CANNOT_CONTAIN_SUBCATEGORY: {
-        code: 400,
-        message: "Error: Sub category cannot be defined for service",
-        messageId: "SVC4571"
-    }
-#---------SVC4572------------------------------ 
-# %1 - "Resource"/"Service"
-    COMPONENT_TOO_MUCH_CATEGORIES: {
-        code: 400,
-        message: "Error: %1 must have only 1 category",
-        messageId: "SVC4572"
-    }
-#---------SVC4574------------------------------ 
-    RESOURCE_TOO_MUCH_SUBCATEGORIES: {
-        code: 400,
-        message: "Error: Resource must have only 1 sub category",
-        messageId: "SVC4574"
-    }
-#---------SVC4575------------------------------ 
-    COMPONENT_MISSING_SUBCATEGORY: {
-        code: 400,
-        message: "Error: Missing sub category",
-        messageId: "SVC4575"
-    }
- #---------SVC4576------------------------------ 
-# %1 - "component type"
-    UNSUPPORTED_ERROR: {
-        code: 400,
-        message: "Error : Requested component type %1 is unsupported.",
-        messageId: "SVC4576"
-    }
-    #---------SVC4577------------------------------ 
-# %1 - "resource type"
-    RESOURCE_CANNOT_CONTAIN_RESOURCE_INSTANCES: {
-        code: 409,
-        message: "Error : Resource of type %1 cannot contain resource instances.",
-        messageId: "SVC4577"
-    }
-#---------SVC4578------------------------------ 
-# %1 - "Resource"/"Service"
-# %2 -  resource/service name 
-# %3 -  "artifact name" 
-    DEPLOYMENT_ARTIFACT_NAME_ALREADY_EXISTS: {
-        code: 400,
-        message: "Error: %1 '%2' already has a deployment artifact named '%3'.",
-        messageId: "SVC4578"
-    }
-#---------SVC4579------------------------------ 
-# %1 - "Category"/"Sub-Category"/"Group"
-# %2 -  category/sub-category/grouping name.
-    INVALID_GROUP_ASSOCIATION: {
-        code: 400,
-        message: "Error: Invalid group association. %1 '%2' was not found.",
-        messageId: "SVC4579"
-    }
-#---------SVC4580------------------------------ 
-    EMPTY_PRODUCT_CONTACTS_LIST: {
-        code: 400,
-        message: "Error: Invalid content. At least one Product Contact has to be specified.",
-        messageId: "SVC4580"
-    }
-#---------SVC4581------------------------------ 
-# %1 - USER_ID
-    INVALID_PRODUCT_CONTACT: {
-        code: 400,
-        message: "Error: Invalid content. User '%1' cannot be set as Product Contact.",
-        messageId: "SVC4581"
-    }
-#---------SVC4582------------------------------ 
-# %1 - Product
-# %2 - "abbreviated"/"full"
-    MISSING_ONE_OF_COMPONENT_NAMES: {
-        code: 400,
-        message: "Error: Invalid content. Missing %1 %2 name.",
-        messageId: "SVC4582"
-    }    
-#---------SVC4583------------------------------
-# %1 - "Icon"
-# %2 - "resource"/"service"/"product"
-    COMPONENT_PARAMETER_CANNOT_BE_CHANGED: {
-        code: 400,
-        message: "Error: %1 cannot be changed once the %2 is certified.",
-        messageId: "SVC4583"
-    }
-#---------SVC4584------------------------------
-# %1  - service/VF name 
-# %2 - "service" /"VF"
-# %3 -  resource instance origin type
-# %4 -  resource instance name 
-# %5 -  requirement/capability
-# %6 -  requirement/capability name
-# %7 -  "fulfilled" (for req)/"consumed (for cap)"
-    REQ_CAP_NOT_SATISFIED_BEFORE_CERTIFICATION: {
-        code: 403,
-        message: "Error:  Requested '%1' %2 is not ready for certification.  %3 '%4' has to have %5 '%6' %7.",
-        messageId: "SVC4584"
-    }
-#---------SVC4585------------------------------ 
-    INVALID_OCCURRENCES: {
-        code: 400,
-        message: "Error: Invalid occurrences format.",
-        messageId: "SVC4585"
-    }
-#---------SVC4586------------------------------ 
-#---------SVC4586------------------------------ 
-    INVALID_SERVICE_API_URL: {
-        code: 400,
-        message: 'Error: Invalid Service API URL. Please check whether your URL has a valid domain extension and does not contain the following characters - #?&@%+;,=$<>~^`\[]{}|"*!',
-        messageId: "SVC4586"
-    }
-#---------SVC4587------------------------------ 
-# %1  - Data type name 
-    DATA_TYPE_ALREADY_EXIST: {
-        code: 409,
-        message: 'Error: Data type %1 already exists.',
-        messageId: "SVC4587"
-    }
-#---------SVC4588------------------------------ 
-# %1  - Data type name 
-    DATA_TYPE_NOR_PROPERTIES_NEITHER_DERIVED_FROM: {
-        code: 400,
-        message: 'Error: Invalid Data type %1. Data type must have either a valid derived from declaration or at least one valid property',
-        messageId: "SVC4588"
-    }
-#---------SVC4589------------------------------ 
-# %1  - Data type name 
-    DATA_TYPE_PROPERTIES_CANNOT_BE_EMPTY: {
-        code: 400,
-        message: "Error: Invalid Data type %1. 'properties' parameter cannot be empty if provided.",
-        messageId: "SVC4589"
-    }
-#---------SVC4590------------------------------ 
-# %1  - Property type name 
-# %2  - Property name
-    INVALID_PROPERTY_TYPE: {
-        code: 400,
-        message: "Error: Invalid Property type %1 in property %2.",
-        messageId: "SVC4590"
-    }
-#---------SVC4591------------------------------ 
-# %1  - Property inner type
-# %2  - Property name 
-    INVALID_PROPERTY_INNER_TYPE: {
-        code: 400,
-        message: "Error: Invalid property inner type %1, in property %2",
-        messageId: "SVC4591"
-    }
-#---------SVC4592------------------------------ 
-# %1  - component instance name
-# %2  - "resource instance"/"service instance"
-    COMPONENT_INSTANCE_NOT_FOUND: {
-        code: 404,
-        message: "Error: Requested '%1' %2 was not found.",
-        messageId: "SVC4592"
-    }
-#---------SVC4593------------------------------ 
-# %1 - component instance name
-# %2 - "resource instance"/"service instance"
-# %3 - "resource/"service"/"product"
-# %4 - container name 
-    COMPONENT_INSTANCE_NOT_FOUND_ON_CONTAINER: {
-        code: 404,
-        message: "Error: Requested '%1' %2 was not found on the %3 '%4'.",
-        messageId: "SVC4593"
-    }
-#---------SVC4594------------------------------
-#%1 - requirement / capability
-#%2 - requirement name
-    IMPORT_DUPLICATE_REQ_CAP_NAME: {
-        code: 400,
-        message: "Error: Imported TOSCA template contains more than one %1 named '%2'.",
-        messageId: "SVC4594"
-    }
-#---------SVC4595------------------------------
-#%1 - requirement / capability
-#%2 - requirement name
-#%3 - parent containing the requirement 
-    IMPORT_REQ_CAP_NAME_EXISTS_IN_DERIVED: {
-        code: 400,
-        message: "Error: Imported TOSCA template contains %1 '%2' that is already defined by derived template %3.",
-        messageId: "SVC4595"
-    }
-#---------SVC4596------------------------------ 
-# %1  - Data type name
-    DATA_TYPE_DERIVED_IS_MISSING: {
-        code: 400,
-        message: "Error: Invalid Content. The ancestor data type %1 cannot be found in the system.",
-        messageId: "SVC4596"
-    }
-#---------SVC4597------------------------------ 
-# %1  - Data type name
-# %2  - Property names
-    DATA_TYPE_PROPERTY_ALREADY_DEFINED_IN_ANCESTOR: {
-        code: 400,
-        message: "Error: Invalid Content. The data type %1 contains properties named %2 which are already defined in one of its ancestors.",
-        messageId: "SVC4597"
-    }
-#---------SVC4598------------------------------ 
-# %1  - Data type name
-    DATA_TYPE_DUPLICATE_PROPERTY: {
-        code: 400,
-        message: "Error: Invalid Content. The data type %1 contains duplicate property.",
-        messageId: "SVC4598"
-    }
-#---------SVC4599------------------------------ 
-# %1  - Data type name
-# %2  - Property names
-    DATA_TYPE_PROEPRTY_CANNOT_HAVE_SAME_TYPE_OF_DATA_TYPE: {
-        code: 400,
-        message: "Error: Invalid Content. The data type %1 contains properties %2 which their type is this data type.",
-        messageId: "SVC4599"
-    }
-#---------SVC4600------------------------------ 
-# %1  - Data type name
-    DATA_TYPE_CANNOT_HAVE_PROPERTIES: {
-        code: 400,
-        message: "Error: Invalid Content. The data type %1 cannot have properties since it is of type scalar",
-        messageId: "SVC4600"
-    }
-#---------SVC4601------------------------------ 
-    NOT_TOPOLOGY_TOSCA_TEMPLATE: {
-        code: 400,
-        message: "Error: TOSCA yaml file %1 cannot be modeled to VF as it does not contain 'topology_template.",
-        messageId: "SVC4601"
-    }
-#---------SVC4602--------------------------------
-# %1 - yaml file name
-# %2 - node_template label
-# %3 - node_template type
-    INVALID_NODE_TEMPLATE: {
-        code: 400,
-        message: "Error: TOSCA yaml file '%1' contains node_template '%2' of type '%3' that does not represent existing VFC/CP/VL",
-        messageId: "SVC4602"
-    }
-#---------SVC4603------------------------------  
-# %1 - component type
-# %2 - component name
-# %3 - state
-    ILLEGAL_COMPONENT_STATE: {
-        code: 403,
-        message: "Error: Component instance of %1 can not be created because the component '%2' is in an illegal state %3.",
-        messageId: "SVC4603"
-    }
-#---------SVC4604------------------------------  
-# %1 - csar file name
-    CSAR_INVALID: {
-        code: 400,
-        message: "Error: TOSCA CSAR '%1' is invalid. 'TOSCA-Metadata/Tosca.meta' file must be provided.",
-        messageId: "SVC4604"
-    }
-#---------SVC4605------------------------------  
-# %1 - csar file name
-    CSAR_INVALID_FORMAT: {
-        code: 400,
-        message: "Error: TOSCA CSAR '%1' is invalid. Invalid 'TOSCA-Metadata/Tosca.meta' file format.",
-        messageId: "SVC4605"
-    }
-#---------SVC4606------------------------------  
-# %1 - property name
-# %2 - property type
-# %3 - property innerType
-# %4 - default value is
-    INVALID_COMPLEX_DEFAULT_VALUE: {
-        code: 400,
-        message: "Error: Invalid default value of property %1. Data type is %2 with inner type %3 and default value found is %4.",
-        messageId: "SVC4606"
-    }
-#---------SVC4607------------------------------  
-# %1 - csar file name
-    CSAR_NOT_FOUND: {
-        code: 400,
-        message: "Error: TOSCA CSAR '%1' is not found.",
-        messageId: "SVC4607"
-    }
-#---------SVC4608------------------------------  
-# %1 - artifact name
-# %2 - component type
-# %3 - actual component type
-    MISMATCH_BETWEEN_ARTIFACT_TYPE_AND_COMPONENT_TYPE: {
-        code: 400,
-        message: "Error: Artifact %1 is only compatible with component of type %2, but component type is %3.",
-        messageId: "SVC4608"
-    }
+  #---------SVC4534------------------------------
+  # %1 -  "HEAT"/"HEAT_ENV"
+  INVALID_YAML: {
+    code: 400,
+    message: "Error: Uploaded YAML file for %1 artifact is invalid.",
+    messageId: "SVC4534"
+  }
 
-#---------SVC4609------------------------------ 
-# %1 -  "INVALID_JSON"             
-    INVALID_JSON: {
-        code: 400,
-        message: "Error: Uploaded JSON file for %1 artifact is invalid.",
-        messageId: "SVC4609"
-    }
-#---------SVC4610------------------------------  
-# %1 - csar file name
-# %2 - missing file name
-    YAML_NOT_FOUND_IN_CSAR: {
-        code: 400,
-        message: "Error - TOSCA CSAR %1 is invalid. TOSCA-Metadata/Tosca.meta refers to file %2 that is not provided.",
-        messageId: "SVC4610"
-    }
-#---------SVC4611------------------------------  
-# %1 - group name
-    GROUP_MEMBER_EMPTY: {
-        code: 400,
-        message: "Error: Invalid Content. Group %1 member list was provided but does not have values",
-        messageId: "SVC4611"
-    }
-#---------SVC4612------------------------------ 
-# %1  - group name 
-    GROUP_TYPE_ALREADY_EXIST: {
-        code: 409,
-        message: 'Error: Group type %1 already exists.',
-        messageId: "SVC4612"
-    }
-#---------SVC4613------------------------------  
-# %1 - group name
-# %2 - VF name(component name)
-# %3 - actual component type [VF]
-    GROUP_ALREADY_EXIST: {
-        code: 409,
-        message: "Error: Group with name '%1' already exists in %2 %3.",
-        messageId: "SVC4613"
-    }   
-#---------SVC4614------------------------------  
-# %1 - group type
-    GROUP_TYPE_IS_INVALID: {
-        code: 400,
-        message: "Error: Invalid content. Group type %1 does not exist",
-        messageId: "SVC4614"
-    }
-#---------SVC4615------------------------------  
-# %1 - group name
-    GROUP_MISSING_GROUP_TYPE: {
-        code: 400,
-        message: "Error: Invalid Content. Missing Group Type for group '%1'",
-        messageId: "SVC4615"
-    }
-#---------SVC4616------------------------------
-# %1 - member name
-# %2 - group name
-# %3 - VF name
-# %4 - component type [VF ]
-    GROUP_INVALID_COMPONENT_INSTANCE: {
-        code: 400,
-        message: "Error: member %1 listed in group %2 is not part of %3 %4.",
-        messageId: "SVC4616"
-    }                 
-#---------SVC4617------------------------------
-# %1 - member name
-# %2 - group name
-# %3 - group type
-    GROUP_INVALID_TOSCA_NAME_OF_COMPONENT_INSTANCE: {
-        code: 400,
-        message: "Error: member %1 listed in group %2 is not part of allowed members of group type %3.",
-        messageId: "SVC4617"
-    }
-#---------SVC4618------------------------------ 
-# %1 - missing file name
-# %2 - csar file name
-    ARTIFACT_NOT_FOUND_IN_CSAR: {
-        code: 400,
-        message: "Error: artifact %1 is defined in CSAR %2 manifest but is not provided",
-        messageId: "SVC4618"
-    }
-#---------SVC4619------------------------------ 
-# %1 - artifact name
-# %2 - artifact type
-# %3 - existing artifact type
-    ARTIFACT_ALREADY_EXIST_IN_DIFFERENT_TYPE_IN_CSAR: {
-        code: 400,
-        message: "Error: artifact %1 in type %2 already exists in type %3.",
-        messageId: "SVC4619"
-    }
-#---------SVC4620------------------------------ 
-    FAILED_RETRIVE_ARTIFACTS_TYPES: {
-        code: 400,
-        message: "Error: Failed to retrieve list of suported artifact types.",
-        messageId: "SVC4620"
-    }
-#---------SVC4621------------------------------ 
-# %1 - artifact name
-# %2 - master 
-    ARTIFACT_ALRADY_EXIST_IN_MASTER_IN_CSAR: {
-        code: 400,
-        message: "Error: artifact %1 already exists in master %2 .",
-        messageId: "SVC4621"
-    }
-#---------SVC4622------------------------------ 
-# %1 - artifact name
-# %2 - artifact type 
-# %3 - master name
-# %4 - master type
-    ARTIFACT_NOT_VALID_IN_MASTER: {
-        code: 400,
-        message: "Error: artifact %1 in type %2 can not be exists under master %3 in type %4.",
-        messageId: "SVC4622"
-    }
-#---------SVC4623------------------------------ 
-# %1 - artifact name
-# %2 - artifact type 
-# %3 - env name
-# %4 - existing env
-    ARTIFACT_NOT_VALID_ENV: {
-        code: 400,
-        message: "Error: Artifact %1 in type %2 with env %3 already exists with another env %4",
-        messageId: "SVC4623"
-    }
-#---------SVC4624------------------------------  
-# %1 - groups names
-# %2 - VF name
-# %3 - component type [VF ]
-    GROUP_IS_MISSING: {
-        code: 400,
-        message: "Error: Invalid Content. The groups '%1' cannot be found under %2 %3.",
-        messageId: "SVC4624"
-    }
-#---------SVC4625------------------------------  
-# %1 - groups name
-    GROUP_ARTIFACT_ALREADY_ASSOCIATED: {
-        code: 400,
-        message: "Error: Invalid Content. Artifact already associated to group '%1'.",
-        messageId: "SVC4625"
-    }
-#---------SVC4626------------------------------  
-# %1 - groups name
-    GROUP_ARTIFACT_ALREADY_DISSOCIATED: {
-        code: 400,
-        message: "Error: Invalid Content. Artifact already dissociated from group '%1'.",
-        messageId: "SVC4626"
-    }
-#---------SVC4627------------------------------
-# %1 - property name
-# %2 - group name
-# %3 - group type name
-    GROUP_PROPERTY_NOT_FOUND: {
-        code: 400,
-        message: "Error: property %1 listed in group %2 is not exist in group type %3.",
-        messageId: "SVC4627"
-    }
-#---------SVC4628------------------------------  
-# %1 - csarUUID
-# %2 - VF name
-    VSP_ALREADY_EXISTS: {
-        code: 400,
-        message: "Error: The VSP with UUID %1 was already imported for VF %2. Please select another or update the existing VF.",
-        messageId: "SVC4628"
-    }
-#---------SVC4629------------------------------  
-# %1 - VF name
-    MISSING_CSAR_UUID: {
-        code: 400,
-        message: "Error: The Csar UUID or payload name is missing for VF %1.",
-        messageId: "SVC4629"
-    }
-#---------SVC4630------------------------------  
-# %1 - VF name
-# %2 - new csarUUID
-# %3 - old csarUUID
-    RESOURCE_LINKED_TO_DIFFERENT_VSP: {
-        code: 400,
-        message: "Error: Resource %1 cannot be updated using CsarUUID %2 since the resource is linked to a different VSP with csarUUID %3.",
-        messageId: "SVC4630"
-    }
-#---------SVC4631------------------------------ 
-# %1  - policy name 
-    POLICY_TYPE_ALREADY_EXIST: {
-        code: 409,
-        message: "Error: Policy type %1 already exists.",
-        messageId: "SVC4631"
-    }
-#---------SVC4632------------------------------
-# %1 - target name
-# %2 - policy type name
-    TARGETS_NON_VALID: {
-        code: 400,
-        message: "Error: target %1 listed in policy type %2 is not a group or resource.",
-        messageId: "SVC4632"
-    }
-#---------SVC4633------------------------------
-# %1 - policy name
-    TARGETS_EMPTY: {
-        code: 400,
-        message: "Error: Invalid Content. Policy %1 target list was provided but does not have values",
-        messageId: "SVC4633"
-    }
-#---------SVC4634------------------------------
-    DATA_TYPE_CANNOT_BE_EMPTY: {
-        code: 500,
-        message: "Error: Data types are empty. Please import the data types.",
-        messageId: "SVC4634"
-    }
-#---------SVC4635------------------------------
-# %1 - csar uuid
-    RESOURCE_FROM_CSAR_NOT_FOUND: {
-        code: 400,
-        message: "Error: resource from csar uuid %1 not found",
-        messageId: "SVC4635"
-    }
-#---------SVC4636------------------------------
-# %1 - Data type name
-    DATA_TYPE_CANNOT_BE_UPDATED_BAD_REQUEST: {
-        code: 400,
-        message: 'Error: Data type %1 cannot be upgraded. The new data type does not contain old properties or the type of one of the properties has been changed.',
-        messageId: "SVC4636"
-    }
-#-----------SVC4637---------------------------
-#%1 - attribute name
-    ATTRIBUTE_NOT_FOUND: {
-        code: 404,
-        message: "Error: Requested '%1' attribute was not found.",
-        messageId: "SVC4637"
-    }    
-#-----------SVC4638---------------------------
-#%1 - attribute name
-    ATTRIBUTE_ALREADY_EXIST: {
-        code: 409,
-        message: "Error: Attribute with '%1' name already exists.",
-        messageId: "SVC4638"
-    }
-#-----------SVC4639---------------------------
-#%1 - property name
-    PROPERTY_NAME_ALREADY_EXISTS: {
-        code: 409,
-        message: "Error: Property with '%1' name and different type already exists.",
-        messageId: "SVC4639"
-    }
-#-----------SVC4640---------------------------
-#%1 - property name
-    INVALID_PROPERTY: {
-        code: 409,
-        message: "Error: Invalid property received.",
-        messageId: "SVC4640"
-    }
-#---------SVC4641-----------------------------
-#%1 - invalid filter
-#%2 - valid filters
-    INVALID_FILTER_KEY: {
-        code: 400,
-        message: "Error: The filter %1 is not applicable. Please use one of the following filters: %2",
-        messageId: "SVC4641"
-    }
-#---------SVC4642-----------------------------
-#%1 - asset type
-#%2 - filter
-    NO_ASSETS_FOUND: {
-        code: 404,
-        message: "No %1 were found to match criteria %2",
-        messageId: "SVC4642"
-    }
-#---------SVC4643------------------------------
-# %1 - "Resource"/"Product"
-# %2 - "sub-category name"
-# %3 - "category name"
-    COMPONENT_SUB_CATEGORY_NOT_FOUND_FOR_CATEGORY: {
-        code: 404,
-        message: "Error: %1 sub-category '%2' not found under category '%3'.",
-        messageId: "SVC4643"
-    }
-#---------SVC4644------------------------------
-# %1 - Format
-    CORRUPTED_FORMAT: {
-        code: 400,
-        message: "Error: %1 format is corrupted.",
-        messageId: "SVC4644"
-    }
-#---------SVC4645------------------------------
-# %1 - "groupType"
-    INVALID_VF_MODULE_TYPE: {
-        code: 400,
-        message: "Error: Invalid group type '%1' (should be VfModule).",
-        messageId: "SVC4645"
-    }
-#---------SVC4646------------------------------
-# %1 - "groupName"
-    INVALID_VF_MODULE_NAME: {
-        code: 400,
-        message: "Error: Invalid Content. VF Module name '%1' contains invalid characters",
-        messageId: "SVC4646"
-    }
-    
-#---------SVC4647------------------------------
-# %1 - "modifiedName"
-    INVALID_VF_MODULE_NAME_MODIFICATION: {
-        code: 400,
-        message: "Error: Invalid VF Module name modification, can not modify '%1'",
-        messageId: "SVC4647"
-    }
+  #---------SVC4535------------------------------
+  # %1 -  "HEAT"
+  INVALID_DEPLOYMENT_ARTIFACT_HEAT: {
+    code: 400,
+    message: "Error: Invalid %1 artifact.",
+    messageId: "SVC4535"
+  }
+  #---------SVC4536------------------------------
+  # %1 - "Resource"/"Service"
+  # %2 -  resource/service name
+  # %3 -  "HEAT"/"HEAT_ENV"/"MURANO_PKG"
+  # %4 -  "HEAT"/"HEAT_ENV"/"MURANO_PKG
+  DEPLOYMENT_ARTIFACT_OF_TYPE_ALREADY_EXISTS: {
+    code: 400,
+    message: "Error: %1 '%2' already has a deployment artifact of %3 type .Please delete or update an existing %4 artifact.",
+    messageId: "SVC4536"
+  }
+
+  #---------SVC4537------------------------------
+  MISSING_HEAT: {
+    code: 400,
+    message: "Error: Missing HEAT artifact. HEAT_ENV artifact cannot be uploaded without corresponding HEAT template.",
+    messageId: "SVC4537"
+  }
+  #---------SVC4538------------------------------
+  MISMATCH_HEAT_VS_HEAT_ENV: {
+    code: 400,
+    message: "Error: Invalid artifact content. Parameter's set in HEAT_ENV '%1' artifact doesn't match the parameters in HEAT '%2' artifact.",
+    messageId: "SVC4538"
+  }
+  #---------SVC4539------------------------------
+  INVALID_RESOURCE_PAYLOAD: {
+    code: 400,
+    message: "Error: Invalid resource payload.",
+    messageId: "SVC4539"
+  }
+  #---------SVC4540------------------------------
+  INVALID_TOSCA_FILE_EXTENSION: {
+    code: 400,
+    message: "Error: Invalid file extension for TOSCA template.",
+    messageId: "SVC4540"
+  }
+  #---------SVC4541------------------------------
+  INVALID_YAML_FILE: {
+    code: 400,
+    message: "Error: Invalid YAML file.",
+    messageId: "SVC4541"
+  }
+  #---------SVC4542------------------------------
+  INVALID_TOSCA_TEMPLATE: {
+    code: 400,
+    message: "Error: Invalid TOSCA template.",
+    messageId: "SVC4542"
+  }
+  #---------SVC4543------------------------------
+  NOT_RESOURCE_TOSCA_TEMPLATE: {
+    code: 400,
+    message: "Error: Imported Service TOSCA template.",
+    messageId: "SVC4543"
+  }
+  #---------SVC4544------------------------------
+  NOT_SINGLE_RESOURCE: {
+    code: 400,
+    message: "Error: Imported TOSCA template should contain one resource definition.",
+    messageId: "SVC4544"
+  }
+  #---------SVC4545------------------------------
+  INVALID_RESOURCE_NAMESPACE: {
+    code: 400,
+    message: "Error: Invalid resource namespace.",
+    messageId: "SVC4545"
+  }
+  #---------SVC4546------------------------------
+  RESOURCE_ALREADY_EXISTS: {
+    code: 400,
+    message: "Error: Imported resource already exists in ASDC Catalog.",
+    messageId: "SVC4546"
+  }
+  #---------SVC4549------------------------------
+  INVALID_RESOURCE_CHECKSUM: {
+    code: 400,
+    message: "Error: Invalid resource checksum.",
+    messageId: "SVC4549"
+  }
+  #---------SVC4550------------------------------
+  #%1  -  Consumer salt
+  INVALID_LENGTH: {
+    code: 400,
+    message: "Error: Invalid %1 length.",
+    messageId: "SVC4550"
+  }
+  #---------SVC4551------------------------------
+  #%1  -  ECOMP User name
+  ECOMP_USER_NOT_FOUND: {
+    code: 404,
+    message: "Error: ECOMP User '%1' was not found.",
+    messageId: "SVC4551"
+  }
+  #---------SVC4552------------------------------
+  CONSUMER_ALREADY_EXISTS: {
+    code: 409,
+    message: "Error: ECOMP User already exists.",
+    messageId: "SVC4552"
+  }
+  #---------SVC4553-----------------------------
+  #%1  -  Consumer name / Consumer password/ Consumer salt
+  INVALID_CONTENT_PARAM: {
+    code: 400,
+    message: "Error: %1 is invalid.",
+    messageId: "SVC4553"
+  }
+  #---------SVC4554------------------------------
+  # %1 - "Resource"/"Service"
+  COMPONENT_ARTIFACT_NOT_FOUND: {
+    code: 404,
+    message: "Error: Requested artifact doesn't belong to specified %1.",
+    messageId: "SVC4554"
+  }
+  #---------SVC4554------------------------------
+  # %1 - "Service name"
+  SERVICE_DEPLOYMENT_ARTIFACT_NOT_FOUND: {
+    code: 403,
+    message: "Error: Requested '%1' service is not ready for certification. Service has to have at least one deployment artifact.",
+    messageId: "SVC4554"
+  }
+  #---------SVC4555------------------------------
+  #%1 - "Resource"/"Service"/"Product"
+  #%2 - "category"
+  COMPONENT_ELEMENT_INVALID_NAME_LENGTH: {
+    code: 400,
+    message: "Error: Invalid %1 %2 name length.",
+    messageId: "SVC4555"
+  }
+  #---------SVC4556------------------------------
+  #%1 - "Resource"/"Service"/"Product"
+  #%2 - "category"
+  COMPONENT_ELEMENT_INVALID_NAME_FORMAT: {
+    code: 400,
+    message: "Error: Invalid %1 %2 name format.",
+    messageId: "SVC4556"
+  }
+  #---------SVC4557------------------------------
+  #%1 - "Resource"/"Service"/"Product"
+  #%2 - "category name"
+  COMPONENT_CATEGORY_ALREADY_EXISTS: {
+    code: 409,
+    message: "Error: %1 category name '%2' already exists.",
+    messageId: "SVC4557"
+  }
+  #---------SVC4558------------------------------
+  # %1 - "service"/"VF"
+  # %2 - "Resource name"
+  VALIDATED_RESOURCE_NOT_FOUND: {
+    code: 403,
+    message: "Error: Submit for Testing is not permitted as your '%1' includes non-validated '%2' resource.",
+    messageId: "SVC4558"
+  }
+  #---------SVC4559------------------------------
+  # %1 - "service"/"VF"
+  # %2 - "Resource name"
+  FOUND_ALREADY_VALIDATED_RESOURCE: {
+    code: 403,
+    message: "Error: Submit for Testing is not permitted as your '%1' includes non-validated '%2' resource. Please use already available validated resource version.",
+    messageId: "SVC4559"
+  }
+  #---------SVC4560------------------------------
+  # %1 - "service"/"VF"
+  # %2 - "Resource name"
+  FOUND_LIST_VALIDATED_RESOURCES: {
+    code: 403,
+    message: "Error: Submit for Testing is not permitted as your '%1' includes non-validated '%2' resource. Please use one of available validated resource versions.",
+    messageId: "SVC4560"
+  }
+  #---------SVC4561------------------------------
+  # %1 - "resource"/"product"
+  # %2 - "category"
+  # %3 - "category name"
+  COMPONENT_CATEGORY_NOT_FOUND: {
+    code: 404,
+    message: "Error: Requested %1 %2 '%3' was not found.",
+    messageId: "SVC4561"
+  }
+  #---------SVC4562------------------------------
+  # %1 - "Resource"/"Product"
+  # %2 - "sub-category name"
+  # %3 - "category name"
+  COMPONENT_SUB_CATEGORY_EXISTS_FOR_CATEGORY: {
+    code: 409,
+    message: "Error: %1 sub-category '%2' already exists under '%3' category.",
+    messageId: "SVC4562"
+  }
+  #---------SVC4563------------------------------
+  # %1 - "Product"
+  # %2 - "grouping name"
+  # %3 - "sub-category name"
+  COMPONENT_GROUPING_EXISTS_FOR_SUB_CATEGORY: {
+    code: 409,
+    message: "Error: %1 grouping '%2' already exists under '%3' sub-category.",
+    messageId: "SVC4563"
+  }
+  #---------SVC4564------------------------------
+  # %1 - product name
+  PRODUCT_NOT_FOUND: {
+    code: 404,
+    message: "Error: Requested '%1' product was not found.",
+    messageId: "SVC4564"
+  }
+  #---------SVC4565------------------------------
+  # %1 - "HEAT"
+  # %2  - parameter type ("string" , "boolean" , "number")
+  # %3 -  parameter name
+  INVALID_HEAT_PARAMETER_VALUE: {
+    code: 400,
+    message: "Error: Invalid %1 artifact. Invalid %2 value set for '%3' parameter.",
+    messageId: "SVC4565"
+  }
+  #---------SVC4566------------------------------
+  # %1 - "HEAT"
+  # %2  - parameter type ("string" , "boolean" , "number")
+  INVALID_HEAT_PARAMETER_TYPE: {
+    code: 400,
+    message: "Error: Invalid %1 artifact. Unsupported '%2' parameter type.",
+    messageId: "SVC4566"
+  }
+  #---------SVC4567------------------------------
+  # %1 -  "YANG_XML"
+  INVALID_XML: {
+    code: 400,
+    message: "Error: Uploaded XML file for %1 artifact is invalid.",
+    messageId: "SVC4567"
+  }
+  #---------SVC4567------------------------------
+  # %1 - "User Name and USER_ID"
+  # %2  -"checked-out"/"in-certification"
+  CANNOT_DELETE_USER_WITH_ACTIVE_ELEMENTS: {
+    code: 409,
+    message: "Error: User cannot be deleted. User '%1' has %2 projects.",
+    messageId: "SVC4567"
+  }
+  #---------SVC4568------------------------------
+  # %1 - "User Name and USER_ID"
+  # %2  -"checked-out"/"in-certification"
+  CANNOT_UPDATE_USER_WITH_ACTIVE_ELEMENTS: {
+    code: 409,
+    message: "Error: Role cannot be changed. User '%1' has %2 projects.",
+    messageId: "SVC4568"
+  }
+  #---------SVC4570------------------------------
+  UPDATE_USER_ADMIN_CONFLICT: {
+    code: 409,
+    message: "Error: An administrator is not allowed to change his/her role.",
+    messageId: "SVC4570"
+  }
+  #---------SVC4571------------------------------
+  SERVICE_CANNOT_CONTAIN_SUBCATEGORY: {
+    code: 400,
+    message: "Error: Sub category cannot be defined for service",
+    messageId: "SVC4571"
+  }
+  #---------SVC4572------------------------------
+  # %1 - "Resource"/"Service"
+  COMPONENT_TOO_MUCH_CATEGORIES: {
+    code: 400,
+    message: "Error: %1 must have only 1 category",
+    messageId: "SVC4572"
+  }
+  #---------SVC4574------------------------------
+  RESOURCE_TOO_MUCH_SUBCATEGORIES: {
+    code: 400,
+    message: "Error: Resource must have only 1 sub category",
+    messageId: "SVC4574"
+  }
+  #---------SVC4575------------------------------
+  COMPONENT_MISSING_SUBCATEGORY: {
+    code: 400,
+    message: "Error: Missing sub category",
+    messageId: "SVC4575"
+  }
+  #---------SVC4576------------------------------
+  # %1 - "component type"
+  UNSUPPORTED_ERROR: {
+    code: 400,
+    message: "Error : Requested component type %1 is unsupported.",
+    messageId: "SVC4576"
+  }
+  #---------SVC4577------------------------------
+  # %1 - "resource type"
+  RESOURCE_CANNOT_CONTAIN_RESOURCE_INSTANCES: {
+    code: 409,
+    message: "Error : Resource of type %1 cannot contain resource instances.",
+    messageId: "SVC4577"
+  }
+  #---------SVC4578------------------------------
+  # %1 - "Resource"/"Service"
+  # %2 -  resource/service name
+  # %3 -  "artifact name"
+  DEPLOYMENT_ARTIFACT_NAME_ALREADY_EXISTS: {
+    code: 400,
+    message: "Error: %1 '%2' already has a deployment artifact named '%3'.",
+    messageId: "SVC4578"
+  }
+  #---------SVC4579------------------------------
+  # %1 - "Category"/"Sub-Category"/"Group"
+  # %2 -  category/sub-category/grouping name.
+  INVALID_GROUP_ASSOCIATION: {
+    code: 400,
+    message: "Error: Invalid group association. %1 '%2' was not found.",
+    messageId: "SVC4579"
+  }
+  #---------SVC4580------------------------------
+  EMPTY_PRODUCT_CONTACTS_LIST: {
+    code: 400,
+    message: "Error: Invalid content. At least one Product Contact has to be specified.",
+    messageId: "SVC4580"
+  }
+  #---------SVC4581------------------------------
+  # %1 - USER_ID
+  INVALID_PRODUCT_CONTACT: {
+    code: 400,
+    message: "Error: Invalid content. User '%1' cannot be set as Product Contact.",
+    messageId: "SVC4581"
+  }
+  #---------SVC4582------------------------------
+  # %1 - Product
+  # %2 - "abbreviated"/"full"
+  MISSING_ONE_OF_COMPONENT_NAMES: {
+    code: 400,
+    message: "Error: Invalid content. Missing %1 %2 name.",
+    messageId: "SVC4582"
+  }
+  #---------SVC4583------------------------------
+  # %1 - "Icon"
+  # %2 - "resource"/"service"/"product"
+  COMPONENT_PARAMETER_CANNOT_BE_CHANGED: {
+    code: 400,
+    message: "Error: %1 cannot be changed once the %2 is certified.",
+    messageId: "SVC4583"
+  }
+  #---------SVC4584------------------------------
+  # %1  - service/VF name
+  # %2 - "service" /"VF"
+  # %3 -  resource instance origin type
+  # %4 -  resource instance name
+  # %5 -  requirement/capability
+  # %6 -  requirement/capability name
+  # %7 -  "fulfilled" (for req)/"consumed (for cap)"
+  REQ_CAP_NOT_SATISFIED_BEFORE_CERTIFICATION: {
+    code: 403,
+    message: "Error:  Requested '%1' %2 is not ready for certification.  %3 '%4' has to have %5 '%6' %7.",
+    messageId: "SVC4584"
+  }
+  #---------SVC4585------------------------------
+  INVALID_OCCURRENCES: {
+    code: 400,
+    message: "Error: Invalid occurrences format.",
+    messageId: "SVC4585"
+  }
+  #---------SVC4586------------------------------
+  #---------SVC4586------------------------------
+  INVALID_SERVICE_API_URL: {
+    code: 400,
+    message: 'Error: Invalid Service API URL. Please check whether your URL has a valid domain extension and does not contain the following characters - #?&@%+;,=$<>~^`\[]{}|"*!',
+    messageId: "SVC4586"
+  }
+  #---------SVC4587------------------------------
+  # %1  - Data type name
+  DATA_TYPE_ALREADY_EXIST: {
+    code: 409,
+    message: 'Error: Data type %1 already exists.',
+    messageId: "SVC4587"
+  }
+  #---------SVC4588------------------------------
+  # %1  - Data type name
+  DATA_TYPE_NOR_PROPERTIES_NEITHER_DERIVED_FROM: {
+    code: 400,
+    message: 'Error: Invalid Data type %1. Data type must have either a valid derived from declaration or at least one valid property',
+    messageId: "SVC4588"
+  }
+  #---------SVC4589------------------------------
+  # %1  - Data type name
+  DATA_TYPE_PROPERTIES_CANNOT_BE_EMPTY: {
+    code: 400,
+    message: "Error: Invalid Data type %1. 'properties' parameter cannot be empty if provided.",
+    messageId: "SVC4589"
+  }
+  #---------SVC4590------------------------------
+  # %1  - Property type name
+  # %2  - Property name
+  INVALID_PROPERTY_TYPE: {
+    code: 400,
+    message: "Error: Invalid Property type %1 in property %2.",
+    messageId: "SVC4590"
+  }
+  #---------SVC4591------------------------------
+  # %1  - Property inner type
+  # %2  - Property name
+  INVALID_PROPERTY_INNER_TYPE: {
+    code: 400,
+    message: "Error: Invalid property inner type %1, in property %2",
+    messageId: "SVC4591"
+  }
+  #---------SVC4592------------------------------
+  # %1  - component instance name
+  # %2  - "resource instance"/"service instance"
+  COMPONENT_INSTANCE_NOT_FOUND: {
+    code: 404,
+    message: "Error: Requested '%1' %2 was not found.",
+    messageId: "SVC4592"
+  }
+  #---------SVC4593------------------------------
+  # %1 - component instance name
+  # %2 - "resource instance"/"service instance"
+  # %3 - "resource/"service"/"product"
+  # %4 - container name
+  COMPONENT_INSTANCE_NOT_FOUND_ON_CONTAINER: {
+    code: 404,
+    message: "Error: Requested '%1' %2 was not found on the %3 '%4'.",
+    messageId: "SVC4593"
+  }
+  #---------SVC4594------------------------------
+  #%1 - requirement / capability
+  #%2 - requirement name
+  IMPORT_DUPLICATE_REQ_CAP_NAME: {
+    code: 400,
+    message: "Error: Imported TOSCA template contains more than one %1 named '%2'.",
+    messageId: "SVC4594"
+  }
+  #---------SVC4595------------------------------
+  #%1 - requirement / capability
+  #%2 - requirement name
+  #%3 - parent containing the requirement
+  IMPORT_REQ_CAP_NAME_EXISTS_IN_DERIVED: {
+    code: 400,
+    message: "Error: Imported TOSCA template contains %1 '%2' that is already defined by derived template %3.",
+    messageId: "SVC4595"
+  }
+  #---------SVC4596------------------------------
+  # %1  - Data type name
+  DATA_TYPE_DERIVED_IS_MISSING: {
+    code: 400,
+    message: "Error: Invalid Content. The ancestor data type %1 cannot be found in the system.",
+    messageId: "SVC4596"
+  }
+  #---------SVC4597------------------------------
+  # %1  - Data type name
+  # %2  - Property names
+  DATA_TYPE_PROPERTY_ALREADY_DEFINED_IN_ANCESTOR: {
+    code: 400,
+    message: "Error: Invalid Content. The data type %1 contains properties named %2 which are already defined in one of its ancestors.",
+    messageId: "SVC4597"
+  }
+  #---------SVC4598------------------------------
+  # %1  - Data type name
+  DATA_TYPE_DUPLICATE_PROPERTY: {
+    code: 400,
+    message: "Error: Invalid Content. The data type %1 contains duplicate property.",
+    messageId: "SVC4598"
+  }
+  #---------SVC4599------------------------------
+  # %1  - Data type name
+  # %2  - Property names
+  DATA_TYPE_PROEPRTY_CANNOT_HAVE_SAME_TYPE_OF_DATA_TYPE: {
+    code: 400,
+    message: "Error: Invalid Content. The data type %1 contains properties %2 which their type is this data type.",
+    messageId: "SVC4599"
+  }
+  #---------SVC4600------------------------------
+  # %1  - Data type name
+  DATA_TYPE_CANNOT_HAVE_PROPERTIES: {
+    code: 400,
+    message: "Error: Invalid Content. The data type %1 cannot have properties since it is of type scalar",
+    messageId: "SVC4600"
+  }
+  #---------SVC4601------------------------------
+  NOT_TOPOLOGY_TOSCA_TEMPLATE: {
+    code: 400,
+    message: "Error: TOSCA yaml file %1 cannot be modeled to VF as it does not contain 'topology_template.",
+    messageId: "SVC4601"
+  }
+  #---------SVC4602--------------------------------
+  # %1 - yaml file name
+  # %2 - node_template label
+  # %3 - node_template type
+  INVALID_NODE_TEMPLATE: {
+    code: 400,
+    message: "Error: TOSCA yaml file '%1' contains node_template '%2' of type '%3' that does not represent existing VFC/CP/VL",
+    messageId: "SVC4602"
+  }
+  #---------SVC4603------------------------------
+  # %1 - component type
+  # %2 - component name
+  # %3 - state
+  ILLEGAL_COMPONENT_STATE: {
+    code: 403,
+    message: "Error: Component instance of %1 can not be created because the component '%2' is in an illegal state %3.",
+    messageId: "SVC4603"
+  }
+  #---------SVC4604------------------------------
+  # %1 - csar file name
+  CSAR_INVALID: {
+    code: 400,
+    message: "Error: TOSCA CSAR '%1' is invalid. 'TOSCA-Metadata/Tosca.meta' file must be provided.",
+    messageId: "SVC4604"
+  }
+  #---------SVC4605------------------------------
+  # %1 - csar file name
+  CSAR_INVALID_FORMAT: {
+    code: 400,
+    message: "Error: TOSCA CSAR '%1' is invalid. Invalid 'TOSCA-Metadata/Tosca.meta' file format.",
+    messageId: "SVC4605"
+  }
+  #---------SVC4606------------------------------
+  # %1 - property name
+  # %2 - property type
+  # %3 - property innerType
+  # %4 - default value is
+  INVALID_COMPLEX_DEFAULT_VALUE: {
+    code: 400,
+    message: "Error: Invalid default value of property %1. Data type is %2 with inner type %3 and default value found is %4.",
+    messageId: "SVC4606"
+  }
+  #---------SVC4607------------------------------
+  # %1 - csar file name
+  CSAR_NOT_FOUND: {
+    code: 400,
+    message: "Error: TOSCA CSAR '%1' is not found.",
+    messageId: "SVC4607"
+  }
+  #---------SVC4608------------------------------
+  # %1 - artifact name
+  # %2 - component type
+  # %3 - actual component type
+  MISMATCH_BETWEEN_ARTIFACT_TYPE_AND_COMPONENT_TYPE: {
+    code: 400,
+    message: "Error: Artifact %1 is only compatible with component of type %2, but component type is %3.",
+    messageId: "SVC4608"
+  }
+
+  #---------SVC4609------------------------------
+  # %1 -  "INVALID_JSON"
+  INVALID_JSON: {
+    code: 400,
+    message: "Error: Uploaded JSON file for %1 artifact is invalid.",
+    messageId: "SVC4609"
+  }
+  #---------SVC4610------------------------------
+  # %1 - csar file name
+  # %2 - missing file name
+  YAML_NOT_FOUND_IN_CSAR: {
+    code: 400,
+    message: "Error - TOSCA CSAR %1 is invalid. TOSCA-Metadata/Tosca.meta refers to file %2 that is not provided.",
+    messageId: "SVC4610"
+  }
+  #---------SVC4611------------------------------
+  # %1 - group name
+  GROUP_MEMBER_EMPTY: {
+    code: 400,
+    message: "Error: Invalid Content. Group %1 member list was provided but does not have values",
+    messageId: "SVC4611"
+  }
+  #---------SVC4612------------------------------
+  # %1  - group name
+  GROUP_TYPE_ALREADY_EXIST: {
+    code: 409,
+    message: 'Error: Group type %1 already exists.',
+    messageId: "SVC4612"
+  }
+  #---------SVC4613------------------------------
+  # %1 - group name
+  # %2 - VF name(component name)
+  # %3 - actual component type [VF]
+  GROUP_ALREADY_EXIST: {
+    code: 409,
+    message: "Error: Group with name '%1' already exists in %2 %3.",
+    messageId: "SVC4613"
+  }
+  #---------SVC4614------------------------------
+  # %1 - group type
+  GROUP_TYPE_IS_INVALID: {
+    code: 400,
+    message: "Error: Invalid content. Group type %1 does not exist",
+    messageId: "SVC4614"
+  }
+  #---------SVC4615------------------------------
+  # %1 - group name
+  GROUP_MISSING_GROUP_TYPE: {
+    code: 400,
+    message: "Error: Invalid Content. Missing Group Type for group '%1'",
+    messageId: "SVC4615"
+  }
+  #---------SVC4616------------------------------
+  # %1 - member name
+  # %2 - group name
+  # %3 - VF name
+  # %4 - component type [VF ]
+  GROUP_INVALID_COMPONENT_INSTANCE: {
+    code: 400,
+    message: "Error: member %1 listed in group %2 is not part of %3 %4.",
+    messageId: "SVC4616"
+  }
+  #---------SVC4617------------------------------
+  # %1 - member name
+  # %2 - group name
+  # %3 - group type
+  GROUP_INVALID_TOSCA_NAME_OF_COMPONENT_INSTANCE: {
+    code: 400,
+    message: "Error: member %1 listed in group %2 is not part of allowed members of group type %3.",
+    messageId: "SVC4617"
+  }
+  #---------SVC4618------------------------------
+  # %1 - missing file name
+  # %2 - csar file name
+  ARTIFACT_NOT_FOUND_IN_CSAR: {
+    code: 400,
+    message: "Error: artifact %1 is defined in CSAR %2 manifest but is not provided",
+    messageId: "SVC4618"
+  }
+  #---------SVC4619------------------------------
+  # %1 - artifact name
+  # %2 - artifact type
+  # %3 - existing artifact type
+  ARTIFACT_ALREADY_EXIST_IN_DIFFERENT_TYPE_IN_CSAR: {
+    code: 400,
+    message: "Error: artifact %1 in type %2 already exists in type %3.",
+    messageId: "SVC4619"
+  }
+  #---------SVC4620------------------------------
+  FAILED_RETRIVE_ARTIFACTS_TYPES: {
+    code: 400,
+    message: "Error: Failed to retrieve list of suported artifact types.",
+    messageId: "SVC4620"
+  }
+  #---------SVC4621------------------------------
+  # %1 - artifact name
+  # %2 - master
+  ARTIFACT_ALRADY_EXIST_IN_MASTER_IN_CSAR: {
+    code: 400,
+    message: "Error: artifact %1 already exists in master %2 .",
+    messageId: "SVC4621"
+  }
+  #---------SVC4622------------------------------
+  # %1 - artifact name
+  # %2 - artifact type
+  # %3 - master name
+  # %4 - master type
+  ARTIFACT_NOT_VALID_IN_MASTER: {
+    code: 400,
+    message: "Error: artifact %1 in type %2 can not be exists under master %3 in type %4.",
+    messageId: "SVC4622"
+  }
+  #---------SVC4623------------------------------
+  # %1 - artifact name
+  # %2 - artifact type
+  # %3 - env name
+  # %4 - existing env
+  ARTIFACT_NOT_VALID_ENV: {
+    code: 400,
+    message: "Error: Artifact %1 in type %2 with env %3 already exists with another env %4",
+    messageId: "SVC4623"
+  }
+  #---------SVC4624------------------------------
+  # %1 - groups names
+  # %2 - VF name
+  # %3 - component type [VF ]
+  GROUP_IS_MISSING: {
+    code: 400,
+    message: "Error: Invalid Content. The groups '%1' cannot be found under %2 %3.",
+    messageId: "SVC4624"
+  }
+  #---------SVC4625------------------------------
+  # %1 - groups name
+  GROUP_ARTIFACT_ALREADY_ASSOCIATED: {
+    code: 400,
+    message: "Error: Invalid Content. Artifact already associated to group '%1'.",
+    messageId: "SVC4625"
+  }
+  #---------SVC4626------------------------------
+  # %1 - groups name
+  GROUP_ARTIFACT_ALREADY_DISSOCIATED: {
+    code: 400,
+    message: "Error: Invalid Content. Artifact already dissociated from group '%1'.",
+    messageId: "SVC4626"
+  }
+  #---------SVC4627------------------------------
+  # %1 - property name
+  # %2 - group name
+  # %3 - group type name
+  GROUP_PROPERTY_NOT_FOUND: {
+    code: 400,
+    message: "Error: property %1 listed in group %2 is not exist in group type %3.",
+    messageId: "SVC4627"
+  }
+  #---------SVC4628------------------------------
+  # %1 - csarUUID
+  # %2 - VF name
+  VSP_ALREADY_EXISTS: {
+    code: 400,
+    message: "Error: The VSP with UUID %1 was already imported for VF %2. Please select another or update the existing VF.",
+    messageId: "SVC4628"
+  }
+  #---------SVC4629------------------------------
+  # %1 - VF name
+  MISSING_CSAR_UUID: {
+    code: 400,
+    message: "Error: The Csar UUID or payload name is missing for VF %1.",
+    messageId: "SVC4629"
+  }
+  #---------SVC4630------------------------------
+  # %1 - VF name
+  # %2 - new csarUUID
+  # %3 - old csarUUID
+  RESOURCE_LINKED_TO_DIFFERENT_VSP: {
+    code: 400,
+    message: "Error: Resource %1 cannot be updated using CsarUUID %2 since the resource is linked to a different VSP with csarUUID %3.",
+    messageId: "SVC4630"
+  }
+  #---------SVC4631------------------------------
+  # %1  - policy name
+  POLICY_TYPE_ALREADY_EXIST: {
+    code: 409,
+    message: "Error: Policy type %1 already exists.",
+    messageId: "SVC4631"
+  }
+  #---------SVC4632------------------------------
+  # %1 - target name
+  # %2 - policy type name
+  TARGETS_NON_VALID: {
+    code: 400,
+    message: "Error: target %1 listed in policy type %2 is not a group or resource.",
+    messageId: "SVC4632"
+  }
+  #---------SVC4633------------------------------
+  # %1 - policy name
+  TARGETS_EMPTY: {
+    code: 400,
+    message: "Error: Invalid Content. Policy %1 target list was provided but does not have values",
+    messageId: "SVC4633"
+  }
+  #---------SVC4634------------------------------
+  DATA_TYPE_CANNOT_BE_EMPTY: {
+    code: 500,
+    message: "Error: Data types are empty. Please import the data types.",
+    messageId: "SVC4634"
+  }
+  #---------SVC4635------------------------------
+  # %1 - csar uuid
+  RESOURCE_FROM_CSAR_NOT_FOUND: {
+    code: 400,
+    message: "Error: resource from csar uuid %1 not found",
+    messageId: "SVC4635"
+  }
+  #---------SVC4636------------------------------
+  # %1 - Data type name
+  DATA_TYPE_CANNOT_BE_UPDATED_BAD_REQUEST: {
+    code: 400,
+    message: 'Error: Data type %1 cannot be upgraded. The new data type does not contain old properties or the type of one of the properties has been changed.',
+    messageId: "SVC4636"
+  }
+  #-----------SVC4637---------------------------
+  #%1 - attribute name
+  ATTRIBUTE_NOT_FOUND: {
+    code: 404,
+    message: "Error: Requested '%1' attribute was not found.",
+    messageId: "SVC4637"
+  }
+  #-----------SVC4638---------------------------
+  #%1 - attribute name
+  ATTRIBUTE_ALREADY_EXIST: {
+    code: 409,
+    message: "Error: Attribute with '%1' name already exists.",
+    messageId: "SVC4638"
+  }
+  #-----------SVC4639---------------------------
+  #%1 - property name
+  PROPERTY_NAME_ALREADY_EXISTS: {
+    code: 409,
+    message: "Error: Property with '%1' name and different type already exists.",
+    messageId: "SVC4639"
+  }
+  #-----------SVC4640---------------------------
+  #%1 - property name
+  INVALID_PROPERTY: {
+    code: 409,
+    message: "Error: Invalid property received.",
+    messageId: "SVC4640"
+  }
+  #---------SVC4641-----------------------------
+  #%1 - invalid filter
+  #%2 - valid filters
+  INVALID_FILTER_KEY: {
+    code: 400,
+    message: "Error: The filter %1 is not applicable. Please use one of the following filters: %2",
+    messageId: "SVC4641"
+  }
+  #---------SVC4642-----------------------------
+  #%1 - asset type
+  #%2 - filter
+  NO_ASSETS_FOUND: {
+    code: 404,
+    message: "No %1 were found to match criteria %2",
+    messageId: "SVC4642"
+  }
+  #---------SVC4643------------------------------
+  # %1 - "Resource"/"Product"
+  # %2 - "sub-category name"
+  # %3 - "category name"
+  COMPONENT_SUB_CATEGORY_NOT_FOUND_FOR_CATEGORY: {
+    code: 404,
+    message: "Error: %1 sub-category '%2' not found under category '%3'.",
+    messageId: "SVC4643"
+  }
+  #---------SVC4644------------------------------
+  # %1 - Format
+  CORRUPTED_FORMAT: {
+    code: 400,
+    message: "Error: %1 format is corrupted.",
+    messageId: "SVC4644"
+  }
+  #---------SVC4645------------------------------
+  # %1 - "groupType"
+  INVALID_VF_MODULE_TYPE: {
+    code: 400,
+    message: "Error: Invalid group type '%1' (should be VfModule).",
+    messageId: "SVC4645"
+  }
+  #---------SVC4646------------------------------
+  # %1 - "groupName"
+  INVALID_VF_MODULE_NAME: {
+    code: 400,
+    message: "Error: Invalid Content. VF Module name '%1' contains invalid characters",
+    messageId: "SVC4646"
+  }
+
+  #---------SVC4647------------------------------
+  # %1 - "modifiedName"
+  INVALID_VF_MODULE_NAME_MODIFICATION: {
+    code: 400,
+    message: "Error: Invalid VF Module name modification, can not modify '%1'",
+    messageId: "SVC4647"
+  }
 
 
-#---------SVC4673------------------------------
-    INVALID_SERVICE_STATE: {
-        code: 409,
-        message: "Error: Invalid service state. Expected state: %1, actual state: %2",
-        messageId: "SVC4673"
-    }
+  #---------SVC4673------------------------------
+  INVALID_SERVICE_STATE: {
+    code: 409,
+    message: "Error: Invalid service state. Expected state: %1, actual state: %2",
+    messageId: "SVC4673"
+  }
 
-#---------SVC4674------------------------------
-    INVALID_RESPONSE_FROM_PROXY: {
-        code: 502,
-        message: "Error: The server was acting as a gateway or proxy and received an invalid response from the upstream server",
-        messageId: "SVC4674"
-    }
-#---------SVC4675------------------------------
-# %1 - resource Id
-    CAPABILITY_NOT_FOUND: {
-        code: 400,
-        message: "Error: Capability not found in the resource '%1'.",
-        messageId: "SVC4675"
-    }
+  #---------SVC4674------------------------------
+  INVALID_RESPONSE_FROM_PROXY: {
+    code: 502,
+    message: "Error: The server was acting as a gateway or proxy and received an invalid response from the upstream server",
+    messageId: "SVC4674"
+  }
+  #---------SVC4675------------------------------
+  # %1 - resource Id
+  CAPABILITY_NOT_FOUND: {
+    code: 400,
+    message: "Error: Capability not found in the resource '%1'.",
+    messageId: "SVC4675"
+  }
 
-#---------SVC4676------------------------------
-# %1 - resource Id
-    REQUIREMENT_NOT_FOUND: {
-        code: 400,
-        message: "Error: Requirement not found in the resource '%1'.",
-        messageId: "SVC4676"
-    }
-#---------SVC4677-----------------------------
-    CAPABILITY_NAME_MANDATORY: {
-      code: 404,
-      message: "Error: Capability name is mandatory, Capability name can't be empty.",
-      messageId: "SVC4677"
-    }
-#---------SVC4678-----------------------------
-    CAPABILITY_TYPE_MANDATORY: {
-      code: 404,
-      message: "Error: Capability type is mandatory, Capability type can't be empty.",
-      messageId: "SVC4678"
-    }
-#---------SVC4679-----------------------------
-# %1 - Capability Name
-    CAPABILITY_NAME_ALREADY_IN_USE: {
-      code: 400,
-      message: "Error: Capability name '%1' already in use, Your current changes will not be saved.",
-      messageId: "SVC4679"
-    }
+  #---------SVC4676------------------------------
+  # %1 - resource Id
+  REQUIREMENT_NOT_FOUND: {
+    code: 400,
+    message: "Error: Requirement not found in the resource '%1'.",
+    messageId: "SVC4676"
+  }
+  #---------SVC4677-----------------------------
+  CAPABILITY_NAME_MANDATORY: {
+    code: 404,
+    message: "Error: Capability name is mandatory, Capability name can't be empty.",
+    messageId: "SVC4677"
+  }
+  #---------SVC4678-----------------------------
+  CAPABILITY_TYPE_MANDATORY: {
+    code: 404,
+    message: "Error: Capability type is mandatory, Capability type can't be empty.",
+    messageId: "SVC4678"
+  }
+  #---------SVC4679-----------------------------
+  # %1 - Capability Name
+  CAPABILITY_NAME_ALREADY_IN_USE: {
+    code: 400,
+    message: "Error: Capability name '%1' already in use, Your current changes will not be saved.",
+    messageId: "SVC4679"
+  }
 
-#---------SVC4680-----------------------------
-    REQUIREMENT_NAME_MANDATORY: {
-      code: 404,
-      message: "Error: Requirement name is mandatory, Requirement name can't be empty.",
-      messageId: "SVC4680"
-    }
-#---------SVC4681-----------------------------
-    REQUIREMENT_CAPABILITY_MANDATORY: {
-      code: 404,
-      message: "Error: Requirement capability is mandatory, Requirement capability can't be empty.",
-      messageId: "SVC4681"
-    }
-#---------SVC4682-----------------------------
-# %1 - Requirement Name
-    REQUIREMENT_NAME_ALREADY_IN_USE: {
-      code: 400,
-      message: "Error: Requirement name '%1' already in use, Your current changes will not be saved.",
-      messageId: "SVC4682"
-    }
-#---------SVC4683-----------------------------
-    MAX_OCCURRENCES_SHOULD_BE_GREATER_THAN_MIN_OCCURRENCES: {
-      code: 400,
-      message: "Error: maxOccurrences should be greater than minOccurrences",
-      messageId: "SVC4683"
-    }
-#---------SVC4684-----------------------------
-# %1 - Capability name
-    CAPABILITY_DELETION_NOT_ALLOWED_USED_IN_COMPOSITION: {
-        code: 409,
-        message: "Error: Capability '%1' can't be deleted,  since it is used in service composition",
-        messageId: "SVC4684"
-    }
-#---------SVC4685-----------------------------
-# %1 - Requirement name
-    REQUIREMENT_DELETION_NOT_ALLOWED_USED_IN_COMPOSITION: {
-        code: 409,
-        message: "Error: Requirement '%1' can't be deleted,  since it is used in service composition",
-        messageId: "SVC4685"
-    }
-#---------SVC4686-----------------------------
-    CAPABILITY_UPDATE_NOT_ALLOWED_USED_IN_COMPOSITION: {
-        code: 409,
-        message: "Error: Capability can't be updated,  since it is used in service composition",
-        messageId: "SVC4686"
-    }
+  #---------SVC4680-----------------------------
+  REQUIREMENT_NAME_MANDATORY: {
+    code: 404,
+    message: "Error: Requirement name is mandatory, Requirement name can't be empty.",
+    messageId: "SVC4680"
+  }
+  #---------SVC4681-----------------------------
+  REQUIREMENT_CAPABILITY_MANDATORY: {
+    code: 404,
+    message: "Error: Requirement capability is mandatory, Requirement capability can't be empty.",
+    messageId: "SVC4681"
+  }
+  #---------SVC4682-----------------------------
+  # %1 - Requirement Name
+  REQUIREMENT_NAME_ALREADY_IN_USE: {
+    code: 400,
+    message: "Error: Requirement name '%1' already in use, Your current changes will not be saved.",
+    messageId: "SVC4682"
+  }
+  #---------SVC4683-----------------------------
+  MAX_OCCURRENCES_SHOULD_BE_GREATER_THAN_MIN_OCCURRENCES: {
+    code: 400,
+    message: "Error: maxOccurrences should be greater than minOccurrences",
+    messageId: "SVC4683"
+  }
+  #---------SVC4684-----------------------------
+  # %1 - Capability name
+  CAPABILITY_DELETION_NOT_ALLOWED_USED_IN_COMPOSITION: {
+    code: 409,
+    message: "Error: Capability '%1' can't be deleted,  since it is used in service composition",
+    messageId: "SVC4684"
+  }
+  #---------SVC4685-----------------------------
+  # %1 - Requirement name
+  REQUIREMENT_DELETION_NOT_ALLOWED_USED_IN_COMPOSITION: {
+    code: 409,
+    message: "Error: Requirement '%1' can't be deleted,  since it is used in service composition",
+    messageId: "SVC4685"
+  }
+  #---------SVC4686-----------------------------
+  CAPABILITY_UPDATE_NOT_ALLOWED_USED_IN_COMPOSITION: {
+    code: 409,
+    message: "Error: Capability can't be updated,  since it is used in service composition",
+    messageId: "SVC4686"
+  }
 
-#---------SVC4687-----------------------------
-    REQUIREMENT_UPDATE_NOT_ALLOWED_USED_IN_COMPOSITION: {
-        code: 409,
-        message: "Error: Requirement can't be updated,  since it is used in service composition",
-        messageId: "SVC4687"
-    }
-#---------SVC4688-----------------------------
-    CAPABILITY_TYPE_CANNOT_BE_EMPTY: {
-      code: 500,
-      message: "Error: Capability types are empty. Please import the capability types.",
-      messageId: "SVC4688"
-    }
-#---------SVC4689-----------------------------
-    RELATIONSHIP_TYPE_ALREADY_EXIST: {
-      code: 409,
-      message: "Error: Relationship Type with name '%1' already exists.",
-      messageId: "SVC4689"
-    }
-#---------SVC4690-----------------------------
-# %1 - Requirement name
-    INVALID_REQUIREMENT_NAME: {
-        code: 400,
-        message: "Requirement name '%1' is invalid, Only alphanumeric chars, underscore and dot allowed",
-        messageId: "SVC4690"
-    }
+  #---------SVC4687-----------------------------
+  REQUIREMENT_UPDATE_NOT_ALLOWED_USED_IN_COMPOSITION: {
+    code: 409,
+    message: "Error: Requirement can't be updated,  since it is used in service composition",
+    messageId: "SVC4687"
+  }
+  #---------SVC4688-----------------------------
+  CAPABILITY_TYPE_CANNOT_BE_EMPTY: {
+    code: 500,
+    message: "Error: Capability types are empty. Please import the capability types.",
+    messageId: "SVC4688"
+  }
+  #---------SVC4689-----------------------------
+  RELATIONSHIP_TYPE_ALREADY_EXIST: {
+    code: 409,
+    message: "Error: Relationship Type with name '%1' already exists.",
+    messageId: "SVC4689"
+  }
+  #---------SVC4690-----------------------------
+  # %1 - Requirement name
+  INVALID_REQUIREMENT_NAME: {
+    code: 400,
+    message: "Requirement name '%1' is invalid, Only alphanumeric chars, underscore and dot allowed",
+    messageId: "SVC4690"
+  }
 
-#---------SVC4691-----------------------------
-# %1 - Capability name
-    INVALID_CAPABILITY_NAME: {
-        code: 400,
-        message: "Capability name '%1' is invalid, Only alphanumeric chars, underscore and dot allowed",
-        messageId: "SVC4691"
-    }
\ No newline at end of file
+  #---------SVC4691-----------------------------
+  # %1 - Capability name
+  INVALID_CAPABILITY_NAME: {
+    code: 400,
+    message: "Capability name '%1' is invalid, Only alphanumeric chars, underscore and dot allowed",
+    messageId: "SVC4691"
+  }