Revert "Renaming Files having BluePrint to have Blueprint"1.1.5

The renaming in CCSDK-3098 caused breaking changes to the grpc api and
compile issues for kotlin scripts.

Issue-ID: CCSDK-3385
Change-Id: I0d745cb858371678eabcb2284671c1fd76a1ab6d
Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca>

11 files changed, 1274 insertions, 1153 deletions

diff --git a/py-modules/common/proto/BluePrintCommon_pb2.py b/py-modules/common/proto/BluePrintCommon_pb2.py
new file mode 100644
index 000000000..bfa353abc
--- /dev/null
+++ b/py-modules/common/proto/BluePrintCommon_pb2.py
@@ -0,0 +1,325 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: BluePrintCommon.proto
+"""Generated protocol buffer code."""
+from google.protobuf.internal import enum_type_wrapper
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from google.protobuf import reflection as _reflection
+from google.protobuf import symbol_database as _symbol_database
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+
+
+DESCRIPTOR = _descriptor.FileDescriptor(
+    name='BluePrintCommon.proto',
+    package='org.onap.ccsdk.cds.controllerblueprints.common.api',
+    syntax='proto3',
+    serialized_options=b'P\001',
+    create_key=_descriptor._internal_create_key,
+    serialized_pb=b'\n\x15\x42luePrintCommon.proto\x12\x32org.onap.ccsdk.cds.controllerblueprints.common.api\"\xa8\x01\n\x0c\x43ommonHeader\x12\x11\n\ttimestamp\x18\x01 \x01(\t\x12\x14\n\x0coriginatorId\x18\x17 \x01(\t\x12\x11\n\trequestId\x18\x03 \x01(\t\x12\x14\n\x0csubRequestId\x18\x04 \x01(\t\x12\x46\n\x04\x66lag\x18\x05 \x01(\x0b\x32\x38.org.onap.ccsdk.cds.controllerblueprints.common.api.Flag\"$\n\x04\x46lag\x12\x0f\n\x07isForce\x18\x01 \x01(\x08\x12\x0b\n\x03ttl\x18\x02 \x01(\x05\"f\n\x11\x41\x63tionIdentifiers\x12\x15\n\rblueprintName\x18\x01 \x01(\t\x12\x18\n\x10\x62lueprintVersion\x18\x02 \x01(\t\x12\x12\n\nactionName\x18\x03 \x01(\t\x12\x0c\n\x04mode\x18\x04 \x01(\t\"\xa2\x01\n\x06Status\x12\x0c\n\x04\x63ode\x18\x01 \x01(\x05\x12\x14\n\x0c\x65rrorMessage\x18\x02 \x01(\t\x12\x0f\n\x07message\x18\x03 \x01(\t\x12P\n\teventType\x18\x04 \x01(\x0e\x32=.org.onap.ccsdk.cds.controllerblueprints.common.api.EventType\x12\x11\n\ttimestamp\x18\x05 \x01(\t*\xa3\x01\n\tEventType\x12\x1b\n\x17\x45VENT_COMPONENT_FAILURE\x10\x00\x12\x1e\n\x1a\x45VENT_COMPONENT_PROCESSING\x10\x01\x12 \n\x1c\x45VENT_COMPONENT_NOTIFICATION\x10\x02\x12\x1c\n\x18\x45VENT_COMPONENT_EXECUTED\x10\x03\x12\x19\n\x15\x45VENT_COMPONENT_TRACE\x10\x04\x42\x02P\x01\x62\x06proto3'
+)
+
+_EVENTTYPE = _descriptor.EnumDescriptor(
+    name='EventType',
+    full_name='org.onap.ccsdk.cds.controllerblueprints.common.api.EventType',
+    filename=None,
+    file=DESCRIPTOR,
+    create_key=_descriptor._internal_create_key,
+    values=[
+      _descriptor.EnumValueDescriptor(
+          name='EVENT_COMPONENT_FAILURE', index=0, number=0,
+          serialized_options=None,
+          type=None,
+          create_key=_descriptor._internal_create_key),
+      _descriptor.EnumValueDescriptor(
+          name='EVENT_COMPONENT_PROCESSING', index=1, number=1,
+          serialized_options=None,
+          type=None,
+          create_key=_descriptor._internal_create_key),
+      _descriptor.EnumValueDescriptor(
+          name='EVENT_COMPONENT_NOTIFICATION', index=2, number=2,
+          serialized_options=None,
+          type=None,
+          create_key=_descriptor._internal_create_key),
+      _descriptor.EnumValueDescriptor(
+          name='EVENT_COMPONENT_EXECUTED', index=3, number=3,
+          serialized_options=None,
+          type=None,
+          create_key=_descriptor._internal_create_key),
+      _descriptor.EnumValueDescriptor(
+          name='EVENT_COMPONENT_TRACE', index=4, number=4,
+          serialized_options=None,
+          type=None,
+          create_key=_descriptor._internal_create_key),
+    ],
+    containing_type=None,
+    serialized_options=None,
+    serialized_start=556,
+    serialized_end=719,
+)
+_sym_db.RegisterEnumDescriptor(_EVENTTYPE)
+
+EventType = enum_type_wrapper.EnumTypeWrapper(_EVENTTYPE)
+EVENT_COMPONENT_FAILURE = 0
+EVENT_COMPONENT_PROCESSING = 1
+EVENT_COMPONENT_NOTIFICATION = 2
+EVENT_COMPONENT_EXECUTED = 3
+EVENT_COMPONENT_TRACE = 4
+
+
+
+_COMMONHEADER = _descriptor.Descriptor(
+    name='CommonHeader',
+    full_name='org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader',
+    filename=None,
+    file=DESCRIPTOR,
+    containing_type=None,
+    create_key=_descriptor._internal_create_key,
+    fields=[
+      _descriptor.FieldDescriptor(
+          name='timestamp', full_name='org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader.timestamp', index=0,
+          number=1, type=9, cpp_type=9, label=1,
+          has_default_value=False, default_value=b"".decode('utf-8'),
+          message_type=None, enum_type=None, containing_type=None,
+          is_extension=False, extension_scope=None,
+          serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+      _descriptor.FieldDescriptor(
+          name='originatorId', full_name='org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader.originatorId', index=1,
+          number=23, type=9, cpp_type=9, label=1,
+          has_default_value=False, default_value=b"".decode('utf-8'),
+          message_type=None, enum_type=None, containing_type=None,
+          is_extension=False, extension_scope=None,
+          serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+      _descriptor.FieldDescriptor(
+          name='requestId', full_name='org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader.requestId', index=2,
+          number=3, type=9, cpp_type=9, label=1,
+          has_default_value=False, default_value=b"".decode('utf-8'),
+          message_type=None, enum_type=None, containing_type=None,
+          is_extension=False, extension_scope=None,
+          serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+      _descriptor.FieldDescriptor(
+          name='subRequestId', full_name='org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader.subRequestId', index=3,
+          number=4, type=9, cpp_type=9, label=1,
+          has_default_value=False, default_value=b"".decode('utf-8'),
+          message_type=None, enum_type=None, containing_type=None,
+          is_extension=False, extension_scope=None,
+          serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+      _descriptor.FieldDescriptor(
+          name='flag', full_name='org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader.flag', index=4,
+          number=5, type=11, cpp_type=10, label=1,
+          has_default_value=False, default_value=None,
+          message_type=None, enum_type=None, containing_type=None,
+          is_extension=False, extension_scope=None,
+          serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    ],
+    extensions=[
+    ],
+    nested_types=[],
+    enum_types=[
+    ],
+    serialized_options=None,
+    is_extendable=False,
+    syntax='proto3',
+    extension_ranges=[],
+    oneofs=[
+    ],
+    serialized_start=78,
+    serialized_end=246,
+)
+
+
+_FLAG = _descriptor.Descriptor(
+    name='Flag',
+    full_name='org.onap.ccsdk.cds.controllerblueprints.common.api.Flag',
+    filename=None,
+    file=DESCRIPTOR,
+    containing_type=None,
+    create_key=_descriptor._internal_create_key,
+    fields=[
+      _descriptor.FieldDescriptor(
+          name='isForce', full_name='org.onap.ccsdk.cds.controllerblueprints.common.api.Flag.isForce', index=0,
+          number=1, type=8, cpp_type=7, label=1,
+          has_default_value=False, default_value=False,
+          message_type=None, enum_type=None, containing_type=None,
+          is_extension=False, extension_scope=None,
+          serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+      _descriptor.FieldDescriptor(
+          name='ttl', full_name='org.onap.ccsdk.cds.controllerblueprints.common.api.Flag.ttl', index=1,
+          number=2, type=5, cpp_type=1, label=1,
+          has_default_value=False, default_value=0,
+          message_type=None, enum_type=None, containing_type=None,
+          is_extension=False, extension_scope=None,
+          serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    ],
+    extensions=[
+    ],
+    nested_types=[],
+    enum_types=[
+    ],
+    serialized_options=None,
+    is_extendable=False,
+    syntax='proto3',
+    extension_ranges=[],
+    oneofs=[
+    ],
+    serialized_start=248,
+    serialized_end=284,
+)
+
+
+_ACTIONIDENTIFIERS = _descriptor.Descriptor(
+    name='ActionIdentifiers',
+    full_name='org.onap.ccsdk.cds.controllerblueprints.common.api.ActionIdentifiers',
+    filename=None,
+    file=DESCRIPTOR,
+    containing_type=None,
+    create_key=_descriptor._internal_create_key,
+    fields=[
+      _descriptor.FieldDescriptor(
+          name='blueprintName', full_name='org.onap.ccsdk.cds.controllerblueprints.common.api.ActionIdentifiers.blueprintName', index=0,
+          number=1, type=9, cpp_type=9, label=1,
+          has_default_value=False, default_value=b"".decode('utf-8'),
+          message_type=None, enum_type=None, containing_type=None,
+          is_extension=False, extension_scope=None,
+          serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+      _descriptor.FieldDescriptor(
+          name='blueprintVersion', full_name='org.onap.ccsdk.cds.controllerblueprints.common.api.ActionIdentifiers.blueprintVersion', index=1,
+          number=2, type=9, cpp_type=9, label=1,
+          has_default_value=False, default_value=b"".decode('utf-8'),
+          message_type=None, enum_type=None, containing_type=None,
+          is_extension=False, extension_scope=None,
+          serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+      _descriptor.FieldDescriptor(
+          name='actionName', full_name='org.onap.ccsdk.cds.controllerblueprints.common.api.ActionIdentifiers.actionName', index=2,
+          number=3, type=9, cpp_type=9, label=1,
+          has_default_value=False, default_value=b"".decode('utf-8'),
+          message_type=None, enum_type=None, containing_type=None,
+          is_extension=False, extension_scope=None,
+          serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+      _descriptor.FieldDescriptor(
+          name='mode', full_name='org.onap.ccsdk.cds.controllerblueprints.common.api.ActionIdentifiers.mode', index=3,
+          number=4, type=9, cpp_type=9, label=1,
+          has_default_value=False, default_value=b"".decode('utf-8'),
+          message_type=None, enum_type=None, containing_type=None,
+          is_extension=False, extension_scope=None,
+          serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    ],
+    extensions=[
+    ],
+    nested_types=[],
+    enum_types=[
+    ],
+    serialized_options=None,
+    is_extendable=False,
+    syntax='proto3',
+    extension_ranges=[],
+    oneofs=[
+    ],
+    serialized_start=286,
+    serialized_end=388,
+)
+
+
+_STATUS = _descriptor.Descriptor(
+    name='Status',
+    full_name='org.onap.ccsdk.cds.controllerblueprints.common.api.Status',
+    filename=None,
+    file=DESCRIPTOR,
+    containing_type=None,
+    create_key=_descriptor._internal_create_key,
+    fields=[
+      _descriptor.FieldDescriptor(
+          name='code', full_name='org.onap.ccsdk.cds.controllerblueprints.common.api.Status.code', index=0,
+          number=1, type=5, cpp_type=1, label=1,
+          has_default_value=False, default_value=0,
+          message_type=None, enum_type=None, containing_type=None,
+          is_extension=False, extension_scope=None,
+          serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+      _descriptor.FieldDescriptor(
+          name='errorMessage', full_name='org.onap.ccsdk.cds.controllerblueprints.common.api.Status.errorMessage', index=1,
+          number=2, type=9, cpp_type=9, label=1,
+          has_default_value=False, default_value=b"".decode('utf-8'),
+          message_type=None, enum_type=None, containing_type=None,
+          is_extension=False, extension_scope=None,
+          serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+      _descriptor.FieldDescriptor(
+          name='message', full_name='org.onap.ccsdk.cds.controllerblueprints.common.api.Status.message', index=2,
+          number=3, type=9, cpp_type=9, label=1,
+          has_default_value=False, default_value=b"".decode('utf-8'),
+          message_type=None, enum_type=None, containing_type=None,
+          is_extension=False, extension_scope=None,
+          serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+      _descriptor.FieldDescriptor(
+          name='eventType', full_name='org.onap.ccsdk.cds.controllerblueprints.common.api.Status.eventType', index=3,
+          number=4, type=14, cpp_type=8, label=1,
+          has_default_value=False, default_value=0,
+          message_type=None, enum_type=None, containing_type=None,
+          is_extension=False, extension_scope=None,
+          serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+      _descriptor.FieldDescriptor(
+          name='timestamp', full_name='org.onap.ccsdk.cds.controllerblueprints.common.api.Status.timestamp', index=4,
+          number=5, type=9, cpp_type=9, label=1,
+          has_default_value=False, default_value=b"".decode('utf-8'),
+          message_type=None, enum_type=None, containing_type=None,
+          is_extension=False, extension_scope=None,
+          serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    ],
+    extensions=[
+    ],
+    nested_types=[],
+    enum_types=[
+    ],
+    serialized_options=None,
+    is_extendable=False,
+    syntax='proto3',
+    extension_ranges=[],
+    oneofs=[
+    ],
+    serialized_start=391,
+    serialized_end=553,
+)
+
+_COMMONHEADER.fields_by_name['flag'].message_type = _FLAG
+_STATUS.fields_by_name['eventType'].enum_type = _EVENTTYPE
+DESCRIPTOR.message_types_by_name['CommonHeader'] = _COMMONHEADER
+DESCRIPTOR.message_types_by_name['Flag'] = _FLAG
+DESCRIPTOR.message_types_by_name['ActionIdentifiers'] = _ACTIONIDENTIFIERS
+DESCRIPTOR.message_types_by_name['Status'] = _STATUS
+DESCRIPTOR.enum_types_by_name['EventType'] = _EVENTTYPE
+_sym_db.RegisterFileDescriptor(DESCRIPTOR)
+
+CommonHeader = _reflection.GeneratedProtocolMessageType('CommonHeader', (_message.Message,), {
+  'DESCRIPTOR' : _COMMONHEADER,
+  '__module__' : 'BluePrintCommon_pb2'
+  # @@protoc_insertion_point(class_scope:org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader)
+})
+_sym_db.RegisterMessage(CommonHeader)
+
+Flag = _reflection.GeneratedProtocolMessageType('Flag', (_message.Message,), {
+  'DESCRIPTOR' : _FLAG,
+  '__module__' : 'BluePrintCommon_pb2'
+  # @@protoc_insertion_point(class_scope:org.onap.ccsdk.cds.controllerblueprints.common.api.Flag)
+})
+_sym_db.RegisterMessage(Flag)
+
+ActionIdentifiers = _reflection.GeneratedProtocolMessageType('ActionIdentifiers', (_message.Message,), {
+  'DESCRIPTOR' : _ACTIONIDENTIFIERS,
+  '__module__' : 'BluePrintCommon_pb2'
+  # @@protoc_insertion_point(class_scope:org.onap.ccsdk.cds.controllerblueprints.common.api.ActionIdentifiers)
+})
+_sym_db.RegisterMessage(ActionIdentifiers)
+
+Status = _reflection.GeneratedProtocolMessageType('Status', (_message.Message,), {
+  'DESCRIPTOR' : _STATUS,
+  '__module__' : 'BluePrintCommon_pb2'
+  # @@protoc_insertion_point(class_scope:org.onap.ccsdk.cds.controllerblueprints.common.api.Status)
+})
+_sym_db.RegisterMessage(Status)
+
+
+DESCRIPTOR._options = None
+# @@protoc_insertion_point(module_scope)
diff --git a/py-modules/common/proto/BlueprintCommon_pb2_grpc.py b/py-modules/common/proto/BluePrintCommon_pb2_grpc.py
index a89435267..a89435267 100644
--- a/py-modules/common/proto/BlueprintCommon_pb2_grpc.py
+++ b/py-modules/common/proto/BluePrintCommon_pb2_grpc.py
diff --git a/py-modules/common/proto/BluePrintManagement_pb2.py b/py-modules/common/proto/BluePrintManagement_pb2.py
new file mode 100644
index 000000000..43a8356c2
--- /dev/null
+++ b/py-modules/common/proto/BluePrintManagement_pb2.py
@@ -0,0 +1,536 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: BluePrintManagement.proto
+"""Generated protocol buffer code."""
+from google.protobuf.internal import enum_type_wrapper
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from google.protobuf import reflection as _reflection
+from google.protobuf import symbol_database as _symbol_database
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from google.protobuf import struct_pb2 as google_dot_protobuf_dot_struct__pb2
+import proto.BluePrintCommon_pb2 as BluePrintCommon__pb2
+
+
+DESCRIPTOR = _descriptor.FileDescriptor(
+    name='BluePrintManagement.proto',
+    package='org.onap.ccsdk.cds.controllerblueprints.management.api',
+    syntax='proto3',
+    serialized_options=b'P\001',
+    create_key=_descriptor._internal_create_key,
+    serialized_pb=b'\n\x19\x42luePrintManagement.proto\x12\x36org.onap.ccsdk.cds.controllerblueprints.management.api\x1a\x1cgoogle/protobuf/struct.proto\x1a\x15\x42luePrintCommon.proto\"\xd3\x02\n\x14\x42luePrintUploadInput\x12V\n\x0c\x63ommonHeader\x18\x01 \x01(\x0b\x32@.org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader\x12T\n\tfileChunk\x18\x02 \x01(\x0b\x32\x41.org.onap.ccsdk.cds.controllerblueprints.management.api.FileChunk\x12`\n\x11\x61\x63tionIdentifiers\x18\x03 \x01(\x0b\x32\x45.org.onap.ccsdk.cds.controllerblueprints.common.api.ActionIdentifiers\x12+\n\nproperties\x18\x04 \x01(\x0b\x32\x17.google.protobuf.Struct\"\xff\x01\n\x16\x42luePrintDownloadInput\x12V\n\x0c\x63ommonHeader\x18\x01 \x01(\x0b\x32@.org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader\x12`\n\x11\x61\x63tionIdentifiers\x18\x02 \x01(\x0b\x32\x45.org.onap.ccsdk.cds.controllerblueprints.common.api.ActionIdentifiers\x12+\n\nproperties\x18\x03 \x01(\x0b\x32\x17.google.protobuf.Struct\"\xfd\x01\n\x14\x42luePrintRemoveInput\x12V\n\x0c\x63ommonHeader\x18\x01 \x01(\x0b\x32@.org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader\x12`\n\x11\x61\x63tionIdentifiers\x18\x02 \x01(\x0b\x32\x45.org.onap.ccsdk.cds.controllerblueprints.common.api.ActionIdentifiers\x12+\n\nproperties\x18\x03 \x01(\x0b\x32\x17.google.protobuf.Struct\"\xb9\x01\n\x17\x42luePrintBootstrapInput\x12V\n\x0c\x63ommonHeader\x18\x01 \x01(\x0b\x32@.org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader\x12\x0f\n\x07loadCBA\x18\x02 \x01(\x08\x12\x15\n\rloadModelType\x18\x03 \x01(\x08\x12\x1e\n\x16loadResourceDictionary\x18\x04 \x01(\x08\"\xc2\x02\n\x19\x42luePrintManagementOutput\x12V\n\x0c\x63ommonHeader\x18\x01 \x01(\x0b\x32@.org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader\x12T\n\tfileChunk\x18\x02 \x01(\x0b\x32\x41.org.onap.ccsdk.cds.controllerblueprints.management.api.FileChunk\x12J\n\x06status\x18\x03 \x01(\x0b\x32:.org.onap.ccsdk.cds.controllerblueprints.common.api.Status\x12+\n\nproperties\x18\x04 \x01(\x0b\x32\x17.google.protobuf.Struct\"\x1a\n\tFileChunk\x12\r\n\x05\x63hunk\x18\x01 \x01(\x0c*4\n\x0e\x44ownloadAction\x12\n\n\x06SEARCH\x10\x00\x12\x0b\n\x07STARTER\x10\x01\x12\t\n\x05\x43LONE\x10\x02*@\n\x0cUploadAction\x12\t\n\x05\x44RAFT\x10\x00\x12\n\n\x06\x45NRICH\x10\x01\x12\x0c\n\x08VALIDATE\x10\x02\x12\x0b\n\x07PUBLISH\x10\x03*\x1b\n\x0cRemoveAction\x12\x0b\n\x07\x44\x45\x46\x41ULT\x10\x00\x32\xfa\x05\n\x1a\x42luePrintManagementService\x12\xb6\x01\n\x11\x64ownloadBlueprint\x12N.org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintDownloadInput\x1aQ.org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintManagementOutput\x12\xb2\x01\n\x0fuploadBlueprint\x12L.org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintUploadInput\x1aQ.org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintManagementOutput\x12\xb2\x01\n\x0fremoveBlueprint\x12L.org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintRemoveInput\x1aQ.org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintManagementOutput\x12\xb8\x01\n\x12\x62ootstrapBlueprint\x12O.org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintBootstrapInput\x1aQ.org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintManagementOutputB\x02P\x01\x62\x06proto3'
+    ,
+    dependencies=[google_dot_protobuf_dot_struct__pb2.DESCRIPTOR,BluePrintCommon__pb2.DESCRIPTOR,])
+
+_DOWNLOADACTION = _descriptor.EnumDescriptor(
+    name='DownloadAction',
+    full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.DownloadAction',
+    filename=None,
+    file=DESCRIPTOR,
+    create_key=_descriptor._internal_create_key,
+    values=[
+      _descriptor.EnumValueDescriptor(
+          name='SEARCH', index=0, number=0,
+          serialized_options=None,
+          type=None,
+          create_key=_descriptor._internal_create_key),
+      _descriptor.EnumValueDescriptor(
+          name='STARTER', index=1, number=1,
+          serialized_options=None,
+          type=None,
+          create_key=_descriptor._internal_create_key),
+      _descriptor.EnumValueDescriptor(
+          name='CLONE', index=2, number=2,
+          serialized_options=None,
+          type=None,
+          create_key=_descriptor._internal_create_key),
+    ],
+    containing_type=None,
+    serialized_options=None,
+    serialized_start=1535,
+    serialized_end=1587,
+)
+_sym_db.RegisterEnumDescriptor(_DOWNLOADACTION)
+
+DownloadAction = enum_type_wrapper.EnumTypeWrapper(_DOWNLOADACTION)
+_UPLOADACTION = _descriptor.EnumDescriptor(
+    name='UploadAction',
+    full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.UploadAction',
+    filename=None,
+    file=DESCRIPTOR,
+    create_key=_descriptor._internal_create_key,
+    values=[
+      _descriptor.EnumValueDescriptor(
+          name='DRAFT', index=0, number=0,
+          serialized_options=None,
+          type=None,
+          create_key=_descriptor._internal_create_key),
+      _descriptor.EnumValueDescriptor(
+          name='ENRICH', index=1, number=1,
+          serialized_options=None,
+          type=None,
+          create_key=_descriptor._internal_create_key),
+      _descriptor.EnumValueDescriptor(
+          name='VALIDATE', index=2, number=2,
+          serialized_options=None,
+          type=None,
+          create_key=_descriptor._internal_create_key),
+      _descriptor.EnumValueDescriptor(
+          name='PUBLISH', index=3, number=3,
+          serialized_options=None,
+          type=None,
+          create_key=_descriptor._internal_create_key),
+    ],
+    containing_type=None,
+    serialized_options=None,
+    serialized_start=1589,
+    serialized_end=1653,
+)
+_sym_db.RegisterEnumDescriptor(_UPLOADACTION)
+
+UploadAction = enum_type_wrapper.EnumTypeWrapper(_UPLOADACTION)
+_REMOVEACTION = _descriptor.EnumDescriptor(
+    name='RemoveAction',
+    full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.RemoveAction',
+    filename=None,
+    file=DESCRIPTOR,
+    create_key=_descriptor._internal_create_key,
+    values=[
+      _descriptor.EnumValueDescriptor(
+          name='DEFAULT', index=0, number=0,
+          serialized_options=None,
+          type=None,
+          create_key=_descriptor._internal_create_key),
+    ],
+    containing_type=None,
+    serialized_options=None,
+    serialized_start=1655,
+    serialized_end=1682,
+)
+_sym_db.RegisterEnumDescriptor(_REMOVEACTION)
+
+RemoveAction = enum_type_wrapper.EnumTypeWrapper(_REMOVEACTION)
+SEARCH = 0
+STARTER = 1
+CLONE = 2
+DRAFT = 0
+ENRICH = 1
+VALIDATE = 2
+PUBLISH = 3
+DEFAULT = 0
+
+
+
+_BLUEPRINTUPLOADINPUT = _descriptor.Descriptor(
+    name='BluePrintUploadInput',
+    full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintUploadInput',
+    filename=None,
+    file=DESCRIPTOR,
+    containing_type=None,
+    create_key=_descriptor._internal_create_key,
+    fields=[
+      _descriptor.FieldDescriptor(
+          name='commonHeader', full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintUploadInput.commonHeader', index=0,
+          number=1, type=11, cpp_type=10, label=1,
+          has_default_value=False, default_value=None,
+          message_type=None, enum_type=None, containing_type=None,
+          is_extension=False, extension_scope=None,
+          serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+      _descriptor.FieldDescriptor(
+          name='fileChunk', full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintUploadInput.fileChunk', index=1,
+          number=2, type=11, cpp_type=10, label=1,
+          has_default_value=False, default_value=None,
+          message_type=None, enum_type=None, containing_type=None,
+          is_extension=False, extension_scope=None,
+          serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+      _descriptor.FieldDescriptor(
+          name='actionIdentifiers', full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintUploadInput.actionIdentifiers', index=2,
+          number=3, type=11, cpp_type=10, label=1,
+          has_default_value=False, default_value=None,
+          message_type=None, enum_type=None, containing_type=None,
+          is_extension=False, extension_scope=None,
+          serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+      _descriptor.FieldDescriptor(
+          name='properties', full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintUploadInput.properties', index=3,
+          number=4, type=11, cpp_type=10, label=1,
+          has_default_value=False, default_value=None,
+          message_type=None, enum_type=None, containing_type=None,
+          is_extension=False, extension_scope=None,
+          serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    ],
+    extensions=[
+    ],
+    nested_types=[],
+    enum_types=[
+    ],
+    serialized_options=None,
+    is_extendable=False,
+    syntax='proto3',
+    extension_ranges=[],
+    oneofs=[
+    ],
+    serialized_start=139,
+    serialized_end=478,
+)
+
+
+_BLUEPRINTDOWNLOADINPUT = _descriptor.Descriptor(
+    name='BluePrintDownloadInput',
+    full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintDownloadInput',
+    filename=None,
+    file=DESCRIPTOR,
+    containing_type=None,
+    create_key=_descriptor._internal_create_key,
+    fields=[
+      _descriptor.FieldDescriptor(
+          name='commonHeader', full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintDownloadInput.commonHeader', index=0,
+          number=1, type=11, cpp_type=10, label=1,
+          has_default_value=False, default_value=None,
+          message_type=None, enum_type=None, containing_type=None,
+          is_extension=False, extension_scope=None,
+          serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+      _descriptor.FieldDescriptor(
+          name='actionIdentifiers', full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintDownloadInput.actionIdentifiers', index=1,
+          number=2, type=11, cpp_type=10, label=1,
+          has_default_value=False, default_value=None,
+          message_type=None, enum_type=None, containing_type=None,
+          is_extension=False, extension_scope=None,
+          serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+      _descriptor.FieldDescriptor(
+          name='properties', full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintDownloadInput.properties', index=2,
+          number=3, type=11, cpp_type=10, label=1,
+          has_default_value=False, default_value=None,
+          message_type=None, enum_type=None, containing_type=None,
+          is_extension=False, extension_scope=None,
+          serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    ],
+    extensions=[
+    ],
+    nested_types=[],
+    enum_types=[
+    ],
+    serialized_options=None,
+    is_extendable=False,
+    syntax='proto3',
+    extension_ranges=[],
+    oneofs=[
+    ],
+    serialized_start=481,
+    serialized_end=736,
+)
+
+
+_BLUEPRINTREMOVEINPUT = _descriptor.Descriptor(
+    name='BluePrintRemoveInput',
+    full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintRemoveInput',
+    filename=None,
+    file=DESCRIPTOR,
+    containing_type=None,
+    create_key=_descriptor._internal_create_key,
+    fields=[
+      _descriptor.FieldDescriptor(
+          name='commonHeader', full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintRemoveInput.commonHeader', index=0,
+          number=1, type=11, cpp_type=10, label=1,
+          has_default_value=False, default_value=None,
+          message_type=None, enum_type=None, containing_type=None,
+          is_extension=False, extension_scope=None,
+          serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+      _descriptor.FieldDescriptor(
+          name='actionIdentifiers', full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintRemoveInput.actionIdentifiers', index=1,
+          number=2, type=11, cpp_type=10, label=1,
+          has_default_value=False, default_value=None,
+          message_type=None, enum_type=None, containing_type=None,
+          is_extension=False, extension_scope=None,
+          serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+      _descriptor.FieldDescriptor(
+          name='properties', full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintRemoveInput.properties', index=2,
+          number=3, type=11, cpp_type=10, label=1,
+          has_default_value=False, default_value=None,
+          message_type=None, enum_type=None, containing_type=None,
+          is_extension=False, extension_scope=None,
+          serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    ],
+    extensions=[
+    ],
+    nested_types=[],
+    enum_types=[
+    ],
+    serialized_options=None,
+    is_extendable=False,
+    syntax='proto3',
+    extension_ranges=[],
+    oneofs=[
+    ],
+    serialized_start=739,
+    serialized_end=992,
+)
+
+
+_BLUEPRINTBOOTSTRAPINPUT = _descriptor.Descriptor(
+    name='BluePrintBootstrapInput',
+    full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintBootstrapInput',
+    filename=None,
+    file=DESCRIPTOR,
+    containing_type=None,
+    create_key=_descriptor._internal_create_key,
+    fields=[
+      _descriptor.FieldDescriptor(
+          name='commonHeader', full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintBootstrapInput.commonHeader', index=0,
+          number=1, type=11, cpp_type=10, label=1,
+          has_default_value=False, default_value=None,
+          message_type=None, enum_type=None, containing_type=None,
+          is_extension=False, extension_scope=None,
+          serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+      _descriptor.FieldDescriptor(
+          name='loadCBA', full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintBootstrapInput.loadCBA', index=1,
+          number=2, type=8, cpp_type=7, label=1,
+          has_default_value=False, default_value=False,
+          message_type=None, enum_type=None, containing_type=None,
+          is_extension=False, extension_scope=None,
+          serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+      _descriptor.FieldDescriptor(
+          name='loadModelType', full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintBootstrapInput.loadModelType', index=2,
+          number=3, type=8, cpp_type=7, label=1,
+          has_default_value=False, default_value=False,
+          message_type=None, enum_type=None, containing_type=None,
+          is_extension=False, extension_scope=None,
+          serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+      _descriptor.FieldDescriptor(
+          name='loadResourceDictionary', full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintBootstrapInput.loadResourceDictionary', index=3,
+          number=4, type=8, cpp_type=7, label=1,
+          has_default_value=False, default_value=False,
+          message_type=None, enum_type=None, containing_type=None,
+          is_extension=False, extension_scope=None,
+          serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    ],
+    extensions=[
+    ],
+    nested_types=[],
+    enum_types=[
+    ],
+    serialized_options=None,
+    is_extendable=False,
+    syntax='proto3',
+    extension_ranges=[],
+    oneofs=[
+    ],
+    serialized_start=995,
+    serialized_end=1180,
+)
+
+
+_BLUEPRINTMANAGEMENTOUTPUT = _descriptor.Descriptor(
+    name='BluePrintManagementOutput',
+    full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintManagementOutput',
+    filename=None,
+    file=DESCRIPTOR,
+    containing_type=None,
+    create_key=_descriptor._internal_create_key,
+    fields=[
+      _descriptor.FieldDescriptor(
+          name='commonHeader', full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintManagementOutput.commonHeader', index=0,
+          number=1, type=11, cpp_type=10, label=1,
+          has_default_value=False, default_value=None,
+          message_type=None, enum_type=None, containing_type=None,
+          is_extension=False, extension_scope=None,
+          serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+      _descriptor.FieldDescriptor(
+          name='fileChunk', full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintManagementOutput.fileChunk', index=1,
+          number=2, type=11, cpp_type=10, label=1,
+          has_default_value=False, default_value=None,
+          message_type=None, enum_type=None, containing_type=None,
+          is_extension=False, extension_scope=None,
+          serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+      _descriptor.FieldDescriptor(
+          name='status', full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintManagementOutput.status', index=2,
+          number=3, type=11, cpp_type=10, label=1,
+          has_default_value=False, default_value=None,
+          message_type=None, enum_type=None, containing_type=None,
+          is_extension=False, extension_scope=None,
+          serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+      _descriptor.FieldDescriptor(
+          name='properties', full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintManagementOutput.properties', index=3,
+          number=4, type=11, cpp_type=10, label=1,
+          has_default_value=False, default_value=None,
+          message_type=None, enum_type=None, containing_type=None,
+          is_extension=False, extension_scope=None,
+          serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    ],
+    extensions=[
+    ],
+    nested_types=[],
+    enum_types=[
+    ],
+    serialized_options=None,
+    is_extendable=False,
+    syntax='proto3',
+    extension_ranges=[],
+    oneofs=[
+    ],
+    serialized_start=1183,
+    serialized_end=1505,
+)
+
+
+_FILECHUNK = _descriptor.Descriptor(
+    name='FileChunk',
+    full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.FileChunk',
+    filename=None,
+    file=DESCRIPTOR,
+    containing_type=None,
+    create_key=_descriptor._internal_create_key,
+    fields=[
+      _descriptor.FieldDescriptor(
+          name='chunk', full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.FileChunk.chunk', index=0,
+          number=1, type=12, cpp_type=9, label=1,
+          has_default_value=False, default_value=b"",
+          message_type=None, enum_type=None, containing_type=None,
+          is_extension=False, extension_scope=None,
+          serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    ],
+    extensions=[
+    ],
+    nested_types=[],
+    enum_types=[
+    ],
+    serialized_options=None,
+    is_extendable=False,
+    syntax='proto3',
+    extension_ranges=[],
+    oneofs=[
+    ],
+    serialized_start=1507,
+    serialized_end=1533,
+)
+
+_BLUEPRINTUPLOADINPUT.fields_by_name['commonHeader'].message_type = BluePrintCommon__pb2._COMMONHEADER
+_BLUEPRINTUPLOADINPUT.fields_by_name['fileChunk'].message_type = _FILECHUNK
+_BLUEPRINTUPLOADINPUT.fields_by_name['actionIdentifiers'].message_type = BluePrintCommon__pb2._ACTIONIDENTIFIERS
+_BLUEPRINTUPLOADINPUT.fields_by_name['properties'].message_type = google_dot_protobuf_dot_struct__pb2._STRUCT
+_BLUEPRINTDOWNLOADINPUT.fields_by_name['commonHeader'].message_type = BluePrintCommon__pb2._COMMONHEADER
+_BLUEPRINTDOWNLOADINPUT.fields_by_name['actionIdentifiers'].message_type = BluePrintCommon__pb2._ACTIONIDENTIFIERS
+_BLUEPRINTDOWNLOADINPUT.fields_by_name['properties'].message_type = google_dot_protobuf_dot_struct__pb2._STRUCT
+_BLUEPRINTREMOVEINPUT.fields_by_name['commonHeader'].message_type = BluePrintCommon__pb2._COMMONHEADER
+_BLUEPRINTREMOVEINPUT.fields_by_name['actionIdentifiers'].message_type = BluePrintCommon__pb2._ACTIONIDENTIFIERS
+_BLUEPRINTREMOVEINPUT.fields_by_name['properties'].message_type = google_dot_protobuf_dot_struct__pb2._STRUCT
+_BLUEPRINTBOOTSTRAPINPUT.fields_by_name['commonHeader'].message_type = BluePrintCommon__pb2._COMMONHEADER
+_BLUEPRINTMANAGEMENTOUTPUT.fields_by_name['commonHeader'].message_type = BluePrintCommon__pb2._COMMONHEADER
+_BLUEPRINTMANAGEMENTOUTPUT.fields_by_name['fileChunk'].message_type = _FILECHUNK
+_BLUEPRINTMANAGEMENTOUTPUT.fields_by_name['status'].message_type = BluePrintCommon__pb2._STATUS
+_BLUEPRINTMANAGEMENTOUTPUT.fields_by_name['properties'].message_type = google_dot_protobuf_dot_struct__pb2._STRUCT
+DESCRIPTOR.message_types_by_name['BluePrintUploadInput'] = _BLUEPRINTUPLOADINPUT
+DESCRIPTOR.message_types_by_name['BluePrintDownloadInput'] = _BLUEPRINTDOWNLOADINPUT
+DESCRIPTOR.message_types_by_name['BluePrintRemoveInput'] = _BLUEPRINTREMOVEINPUT
+DESCRIPTOR.message_types_by_name['BluePrintBootstrapInput'] = _BLUEPRINTBOOTSTRAPINPUT
+DESCRIPTOR.message_types_by_name['BluePrintManagementOutput'] = _BLUEPRINTMANAGEMENTOUTPUT
+DESCRIPTOR.message_types_by_name['FileChunk'] = _FILECHUNK
+DESCRIPTOR.enum_types_by_name['DownloadAction'] = _DOWNLOADACTION
+DESCRIPTOR.enum_types_by_name['UploadAction'] = _UPLOADACTION
+DESCRIPTOR.enum_types_by_name['RemoveAction'] = _REMOVEACTION
+_sym_db.RegisterFileDescriptor(DESCRIPTOR)
+
+BluePrintUploadInput = _reflection.GeneratedProtocolMessageType('BluePrintUploadInput', (_message.Message,), {
+  'DESCRIPTOR' : _BLUEPRINTUPLOADINPUT,
+  '__module__' : 'BluePrintManagement_pb2'
+  # @@protoc_insertion_point(class_scope:org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintUploadInput)
+})
+_sym_db.RegisterMessage(BluePrintUploadInput)
+
+BluePrintDownloadInput = _reflection.GeneratedProtocolMessageType('BluePrintDownloadInput', (_message.Message,), {
+  'DESCRIPTOR' : _BLUEPRINTDOWNLOADINPUT,
+  '__module__' : 'BluePrintManagement_pb2'
+  # @@protoc_insertion_point(class_scope:org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintDownloadInput)
+})
+_sym_db.RegisterMessage(BluePrintDownloadInput)
+
+BluePrintRemoveInput = _reflection.GeneratedProtocolMessageType('BluePrintRemoveInput', (_message.Message,), {
+  'DESCRIPTOR' : _BLUEPRINTREMOVEINPUT,
+  '__module__' : 'BluePrintManagement_pb2'
+  # @@protoc_insertion_point(class_scope:org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintRemoveInput)
+})
+_sym_db.RegisterMessage(BluePrintRemoveInput)
+
+BluePrintBootstrapInput = _reflection.GeneratedProtocolMessageType('BluePrintBootstrapInput', (_message.Message,), {
+  'DESCRIPTOR' : _BLUEPRINTBOOTSTRAPINPUT,
+  '__module__' : 'BluePrintManagement_pb2'
+  # @@protoc_insertion_point(class_scope:org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintBootstrapInput)
+})
+_sym_db.RegisterMessage(BluePrintBootstrapInput)
+
+BluePrintManagementOutput = _reflection.GeneratedProtocolMessageType('BluePrintManagementOutput', (_message.Message,), {
+  'DESCRIPTOR' : _BLUEPRINTMANAGEMENTOUTPUT,
+  '__module__' : 'BluePrintManagement_pb2'
+  # @@protoc_insertion_point(class_scope:org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintManagementOutput)
+})
+_sym_db.RegisterMessage(BluePrintManagementOutput)
+
+FileChunk = _reflection.GeneratedProtocolMessageType('FileChunk', (_message.Message,), {
+  'DESCRIPTOR' : _FILECHUNK,
+  '__module__' : 'BluePrintManagement_pb2'
+  # @@protoc_insertion_point(class_scope:org.onap.ccsdk.cds.controllerblueprints.management.api.FileChunk)
+})
+_sym_db.RegisterMessage(FileChunk)
+
+
+DESCRIPTOR._options = None
+
+_BLUEPRINTMANAGEMENTSERVICE = _descriptor.ServiceDescriptor(
+    name='BluePrintManagementService',
+    full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintManagementService',
+    file=DESCRIPTOR,
+    index=0,
+    serialized_options=None,
+    create_key=_descriptor._internal_create_key,
+    serialized_start=1685,
+    serialized_end=2447,
+    methods=[
+      _descriptor.MethodDescriptor(
+          name='downloadBlueprint',
+          full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintManagementService.downloadBlueprint',
+          index=0,
+          containing_service=None,
+          input_type=_BLUEPRINTDOWNLOADINPUT,
+          output_type=_BLUEPRINTMANAGEMENTOUTPUT,
+          serialized_options=None,
+          create_key=_descriptor._internal_create_key,
+      ),
+      _descriptor.MethodDescriptor(
+          name='uploadBlueprint',
+          full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintManagementService.uploadBlueprint',
+          index=1,
+          containing_service=None,
+          input_type=_BLUEPRINTUPLOADINPUT,
+          output_type=_BLUEPRINTMANAGEMENTOUTPUT,
+          serialized_options=None,
+          create_key=_descriptor._internal_create_key,
+      ),
+      _descriptor.MethodDescriptor(
+          name='removeBlueprint',
+          full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintManagementService.removeBlueprint',
+          index=2,
+          containing_service=None,
+          input_type=_BLUEPRINTREMOVEINPUT,
+          output_type=_BLUEPRINTMANAGEMENTOUTPUT,
+          serialized_options=None,
+          create_key=_descriptor._internal_create_key,
+      ),
+      _descriptor.MethodDescriptor(
+          name='bootstrapBlueprint',
+          full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintManagementService.bootstrapBlueprint',
+          index=3,
+          containing_service=None,
+          input_type=_BLUEPRINTBOOTSTRAPINPUT,
+          output_type=_BLUEPRINTMANAGEMENTOUTPUT,
+          serialized_options=None,
+          create_key=_descriptor._internal_create_key,
+      ),
+    ])
+_sym_db.RegisterServiceDescriptor(_BLUEPRINTMANAGEMENTSERVICE)
+
+DESCRIPTOR.services_by_name['BluePrintManagementService'] = _BLUEPRINTMANAGEMENTSERVICE
+
+# @@protoc_insertion_point(module_scope)
diff --git a/py-modules/common/proto/BluePrintManagement_pb2_grpc.py b/py-modules/common/proto/BluePrintManagement_pb2_grpc.py
new file mode 100644
index 000000000..0e92c7eca
--- /dev/null
+++ b/py-modules/common/proto/BluePrintManagement_pb2_grpc.py
@@ -0,0 +1,165 @@
+# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
+"""Client and server classes corresponding to protobuf-defined services."""
+import grpc
+
+import proto.BluePrintManagement_pb2 as BluePrintManagement__pb2
+
+
+class BluePrintManagementServiceStub(object):
+  """Missing associated documentation comment in .proto file."""
+
+  def __init__(self, channel):
+    """Constructor.
+
+    Args:
+        channel: A grpc.Channel.
+    """
+    self.downloadBlueprint = channel.unary_unary(
+        '/org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintManagementService/downloadBlueprint',
+        request_serializer=BluePrintManagement__pb2.BluePrintDownloadInput.SerializeToString,
+        response_deserializer=BluePrintManagement__pb2.BluePrintManagementOutput.FromString,
+    )
+    self.uploadBlueprint = channel.unary_unary(
+        '/org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintManagementService/uploadBlueprint',
+        request_serializer=BluePrintManagement__pb2.BluePrintUploadInput.SerializeToString,
+        response_deserializer=BluePrintManagement__pb2.BluePrintManagementOutput.FromString,
+    )
+    self.removeBlueprint = channel.unary_unary(
+        '/org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintManagementService/removeBlueprint',
+        request_serializer=BluePrintManagement__pb2.BluePrintRemoveInput.SerializeToString,
+        response_deserializer=BluePrintManagement__pb2.BluePrintManagementOutput.FromString,
+    )
+    self.bootstrapBlueprint = channel.unary_unary(
+        '/org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintManagementService/bootstrapBlueprint',
+        request_serializer=BluePrintManagement__pb2.BluePrintBootstrapInput.SerializeToString,
+        response_deserializer=BluePrintManagement__pb2.BluePrintManagementOutput.FromString,
+    )
+
+
+class BluePrintManagementServiceServicer(object):
+  """Missing associated documentation comment in .proto file."""
+
+  def downloadBlueprint(self, request, context):
+    """Missing associated documentation comment in .proto file."""
+    context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+    context.set_details('Method not implemented!')
+    raise NotImplementedError('Method not implemented!')
+
+  def uploadBlueprint(self, request, context):
+    """Missing associated documentation comment in .proto file."""
+    context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+    context.set_details('Method not implemented!')
+    raise NotImplementedError('Method not implemented!')
+
+  def removeBlueprint(self, request, context):
+    """Missing associated documentation comment in .proto file."""
+    context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+    context.set_details('Method not implemented!')
+    raise NotImplementedError('Method not implemented!')
+
+  def bootstrapBlueprint(self, request, context):
+    """Missing associated documentation comment in .proto file."""
+    context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+    context.set_details('Method not implemented!')
+    raise NotImplementedError('Method not implemented!')
+
+
+def add_BluePrintManagementServiceServicer_to_server(servicer, server):
+  rpc_method_handlers = {
+    'downloadBlueprint': grpc.unary_unary_rpc_method_handler(
+        servicer.downloadBlueprint,
+        request_deserializer=BluePrintManagement__pb2.BluePrintDownloadInput.FromString,
+        response_serializer=BluePrintManagement__pb2.BluePrintManagementOutput.SerializeToString,
+    ),
+    'uploadBlueprint': grpc.unary_unary_rpc_method_handler(
+        servicer.uploadBlueprint,
+        request_deserializer=BluePrintManagement__pb2.BluePrintUploadInput.FromString,
+        response_serializer=BluePrintManagement__pb2.BluePrintManagementOutput.SerializeToString,
+    ),
+    'removeBlueprint': grpc.unary_unary_rpc_method_handler(
+        servicer.removeBlueprint,
+        request_deserializer=BluePrintManagement__pb2.BluePrintRemoveInput.FromString,
+        response_serializer=BluePrintManagement__pb2.BluePrintManagementOutput.SerializeToString,
+    ),
+    'bootstrapBlueprint': grpc.unary_unary_rpc_method_handler(
+        servicer.bootstrapBlueprint,
+        request_deserializer=BluePrintManagement__pb2.BluePrintBootstrapInput.FromString,
+        response_serializer=BluePrintManagement__pb2.BluePrintManagementOutput.SerializeToString,
+    ),
+  }
+  generic_handler = grpc.method_handlers_generic_handler(
+      'org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintManagementService', rpc_method_handlers)
+  server.add_generic_rpc_handlers((generic_handler,))
+
+
+# This class is part of an EXPERIMENTAL API.
+class BluePrintManagementService(object):
+  """Missing associated documentation comment in .proto file."""
+
+  @staticmethod
+  def downloadBlueprint(request,
+      target,
+      options=(),
+      channel_credentials=None,
+      call_credentials=None,
+      insecure=False,
+      compression=None,
+      wait_for_ready=None,
+      timeout=None,
+      metadata=None):
+    return grpc.experimental.unary_unary(request, target, '/org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintManagementService/downloadBlueprint',
+                                         BluePrintManagement__pb2.BluePrintDownloadInput.SerializeToString,
+                                         BluePrintManagement__pb2.BluePrintManagementOutput.FromString,
+                                         options, channel_credentials,
+                                         insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
+
+  @staticmethod
+  def uploadBlueprint(request,
+      target,
+      options=(),
+      channel_credentials=None,
+      call_credentials=None,
+      insecure=False,
+      compression=None,
+      wait_for_ready=None,
+      timeout=None,
+      metadata=None):
+    return grpc.experimental.unary_unary(request, target, '/org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintManagementService/uploadBlueprint',
+                                         BluePrintManagement__pb2.BluePrintUploadInput.SerializeToString,
+                                         BluePrintManagement__pb2.BluePrintManagementOutput.FromString,
+                                         options, channel_credentials,
+                                         insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
+
+  @staticmethod
+  def removeBlueprint(request,
+      target,
+      options=(),
+      channel_credentials=None,
+      call_credentials=None,
+      insecure=False,
+      compression=None,
+      wait_for_ready=None,
+      timeout=None,
+      metadata=None):
+    return grpc.experimental.unary_unary(request, target, '/org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintManagementService/removeBlueprint',
+                                         BluePrintManagement__pb2.BluePrintRemoveInput.SerializeToString,
+                                         BluePrintManagement__pb2.BluePrintManagementOutput.FromString,
+                                         options, channel_credentials,
+                                         insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
+
+  @staticmethod
+  def bootstrapBlueprint(request,
+      target,
+      options=(),
+      channel_credentials=None,
+      call_credentials=None,
+      insecure=False,
+      compression=None,
+      wait_for_ready=None,
+      timeout=None,
+      metadata=None):
+    return grpc.experimental.unary_unary(request, target, '/org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintManagementService/bootstrapBlueprint',
+                                         BluePrintManagement__pb2.BluePrintBootstrapInput.SerializeToString,
+                                         BluePrintManagement__pb2.BluePrintManagementOutput.FromString,
+                                         options, channel_credentials,
+                                         insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
diff --git a/py-modules/common/proto/BluePrintProcessing_pb2.py b/py-modules/common/proto/BluePrintProcessing_pb2.py
new file mode 100644
index 000000000..06f808101
--- /dev/null
+++ b/py-modules/common/proto/BluePrintProcessing_pb2.py
@@ -0,0 +1,182 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: BluePrintProcessing.proto
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from google.protobuf import reflection as _reflection
+from google.protobuf import symbol_database as _symbol_database
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from google.protobuf import struct_pb2 as google_dot_protobuf_dot_struct__pb2
+import proto.BluePrintCommon_pb2 as BluePrintCommon__pb2
+
+
+DESCRIPTOR = _descriptor.FileDescriptor(
+    name='BluePrintProcessing.proto',
+    package='org.onap.ccsdk.cds.controllerblueprints.processing.api',
+    syntax='proto3',
+    serialized_options=b'P\001',
+    create_key=_descriptor._internal_create_key,
+    serialized_pb=b'\n\x19\x42luePrintProcessing.proto\x12\x36org.onap.ccsdk.cds.controllerblueprints.processing.api\x1a\x1cgoogle/protobuf/struct.proto\x1a\x15\x42luePrintCommon.proto\"\xfb\x01\n\x15\x45xecutionServiceInput\x12V\n\x0c\x63ommonHeader\x18\x01 \x01(\x0b\x32@.org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader\x12`\n\x11\x61\x63tionIdentifiers\x18\x02 \x01(\x0b\x32\x45.org.onap.ccsdk.cds.controllerblueprints.common.api.ActionIdentifiers\x12(\n\x07payload\x18\x03 \x01(\x0b\x32\x17.google.protobuf.Struct\"\xc8\x02\n\x16\x45xecutionServiceOutput\x12V\n\x0c\x63ommonHeader\x18\x01 \x01(\x0b\x32@.org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader\x12`\n\x11\x61\x63tionIdentifiers\x18\x02 \x01(\x0b\x32\x45.org.onap.ccsdk.cds.controllerblueprints.common.api.ActionIdentifiers\x12J\n\x06status\x18\x03 \x01(\x0b\x32:.org.onap.ccsdk.cds.controllerblueprints.common.api.Status\x12(\n\x07payload\x18\x04 \x01(\x0b\x32\x17.google.protobuf.Struct2\xcb\x01\n\x1a\x42luePrintProcessingService\x12\xac\x01\n\x07process\x12M.org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceInput\x1aN.org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceOutput(\x01\x30\x01\x42\x02P\x01\x62\x06proto3'
+    ,
+    dependencies=[google_dot_protobuf_dot_struct__pb2.DESCRIPTOR,BluePrintCommon__pb2.DESCRIPTOR,])
+
+
+
+
+_EXECUTIONSERVICEINPUT = _descriptor.Descriptor(
+    name='ExecutionServiceInput',
+    full_name='org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceInput',
+    filename=None,
+    file=DESCRIPTOR,
+    containing_type=None,
+    create_key=_descriptor._internal_create_key,
+    fields=[
+      _descriptor.FieldDescriptor(
+          name='commonHeader', full_name='org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceInput.commonHeader', index=0,
+          number=1, type=11, cpp_type=10, label=1,
+          has_default_value=False, default_value=None,
+          message_type=None, enum_type=None, containing_type=None,
+          is_extension=False, extension_scope=None,
+          serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+      _descriptor.FieldDescriptor(
+          name='actionIdentifiers', full_name='org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceInput.actionIdentifiers', index=1,
+          number=2, type=11, cpp_type=10, label=1,
+          has_default_value=False, default_value=None,
+          message_type=None, enum_type=None, containing_type=None,
+          is_extension=False, extension_scope=None,
+          serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+      _descriptor.FieldDescriptor(
+          name='payload', full_name='org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceInput.payload', index=2,
+          number=3, type=11, cpp_type=10, label=1,
+          has_default_value=False, default_value=None,
+          message_type=None, enum_type=None, containing_type=None,
+          is_extension=False, extension_scope=None,
+          serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    ],
+    extensions=[
+    ],
+    nested_types=[],
+    enum_types=[
+    ],
+    serialized_options=None,
+    is_extendable=False,
+    syntax='proto3',
+    extension_ranges=[],
+    oneofs=[
+    ],
+    serialized_start=139,
+    serialized_end=390,
+)
+
+
+_EXECUTIONSERVICEOUTPUT = _descriptor.Descriptor(
+    name='ExecutionServiceOutput',
+    full_name='org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceOutput',
+    filename=None,
+    file=DESCRIPTOR,
+    containing_type=None,
+    create_key=_descriptor._internal_create_key,
+    fields=[
+      _descriptor.FieldDescriptor(
+          name='commonHeader', full_name='org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceOutput.commonHeader', index=0,
+          number=1, type=11, cpp_type=10, label=1,
+          has_default_value=False, default_value=None,
+          message_type=None, enum_type=None, containing_type=None,
+          is_extension=False, extension_scope=None,
+          serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+      _descriptor.FieldDescriptor(
+          name='actionIdentifiers', full_name='org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceOutput.actionIdentifiers', index=1,
+          number=2, type=11, cpp_type=10, label=1,
+          has_default_value=False, default_value=None,
+          message_type=None, enum_type=None, containing_type=None,
+          is_extension=False, extension_scope=None,
+          serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+      _descriptor.FieldDescriptor(
+          name='status', full_name='org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceOutput.status', index=2,
+          number=3, type=11, cpp_type=10, label=1,
+          has_default_value=False, default_value=None,
+          message_type=None, enum_type=None, containing_type=None,
+          is_extension=False, extension_scope=None,
+          serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+      _descriptor.FieldDescriptor(
+          name='payload', full_name='org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceOutput.payload', index=3,
+          number=4, type=11, cpp_type=10, label=1,
+          has_default_value=False, default_value=None,
+          message_type=None, enum_type=None, containing_type=None,
+          is_extension=False, extension_scope=None,
+          serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    ],
+    extensions=[
+    ],
+    nested_types=[],
+    enum_types=[
+    ],
+    serialized_options=None,
+    is_extendable=False,
+    syntax='proto3',
+    extension_ranges=[],
+    oneofs=[
+    ],
+    serialized_start=393,
+    serialized_end=721,
+)
+
+_EXECUTIONSERVICEINPUT.fields_by_name['commonHeader'].message_type = BluePrintCommon__pb2._COMMONHEADER
+_EXECUTIONSERVICEINPUT.fields_by_name['actionIdentifiers'].message_type = BluePrintCommon__pb2._ACTIONIDENTIFIERS
+_EXECUTIONSERVICEINPUT.fields_by_name['payload'].message_type = google_dot_protobuf_dot_struct__pb2._STRUCT
+_EXECUTIONSERVICEOUTPUT.fields_by_name['commonHeader'].message_type = BluePrintCommon__pb2._COMMONHEADER
+_EXECUTIONSERVICEOUTPUT.fields_by_name['actionIdentifiers'].message_type = BluePrintCommon__pb2._ACTIONIDENTIFIERS
+_EXECUTIONSERVICEOUTPUT.fields_by_name['status'].message_type = BluePrintCommon__pb2._STATUS
+_EXECUTIONSERVICEOUTPUT.fields_by_name['payload'].message_type = google_dot_protobuf_dot_struct__pb2._STRUCT
+DESCRIPTOR.message_types_by_name['ExecutionServiceInput'] = _EXECUTIONSERVICEINPUT
+DESCRIPTOR.message_types_by_name['ExecutionServiceOutput'] = _EXECUTIONSERVICEOUTPUT
+_sym_db.RegisterFileDescriptor(DESCRIPTOR)
+
+ExecutionServiceInput = _reflection.GeneratedProtocolMessageType('ExecutionServiceInput', (_message.Message,), {
+  'DESCRIPTOR' : _EXECUTIONSERVICEINPUT,
+  '__module__' : 'BluePrintProcessing_pb2'
+  # @@protoc_insertion_point(class_scope:org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceInput)
+})
+_sym_db.RegisterMessage(ExecutionServiceInput)
+
+ExecutionServiceOutput = _reflection.GeneratedProtocolMessageType('ExecutionServiceOutput', (_message.Message,), {
+  'DESCRIPTOR' : _EXECUTIONSERVICEOUTPUT,
+  '__module__' : 'BluePrintProcessing_pb2'
+  # @@protoc_insertion_point(class_scope:org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceOutput)
+})
+_sym_db.RegisterMessage(ExecutionServiceOutput)
+
+
+DESCRIPTOR._options = None
+
+_BLUEPRINTPROCESSINGSERVICE = _descriptor.ServiceDescriptor(
+    name='BluePrintProcessingService',
+    full_name='org.onap.ccsdk.cds.controllerblueprints.processing.api.BluePrintProcessingService',
+    file=DESCRIPTOR,
+    index=0,
+    serialized_options=None,
+    create_key=_descriptor._internal_create_key,
+    serialized_start=724,
+    serialized_end=927,
+    methods=[
+      _descriptor.MethodDescriptor(
+          name='process',
+          full_name='org.onap.ccsdk.cds.controllerblueprints.processing.api.BluePrintProcessingService.process',
+          index=0,
+          containing_service=None,
+          input_type=_EXECUTIONSERVICEINPUT,
+          output_type=_EXECUTIONSERVICEOUTPUT,
+          serialized_options=None,
+          create_key=_descriptor._internal_create_key,
+      ),
+    ])
+_sym_db.RegisterServiceDescriptor(_BLUEPRINTPROCESSINGSERVICE)
+
+DESCRIPTOR.services_by_name['BluePrintProcessingService'] = _BLUEPRINTPROCESSINGSERVICE
+
+# @@protoc_insertion_point(module_scope)
diff --git a/py-modules/common/proto/BluePrintProcessing_pb2_grpc.py b/py-modules/common/proto/BluePrintProcessing_pb2_grpc.py
new file mode 100644
index 000000000..cb40ae213
--- /dev/null
+++ b/py-modules/common/proto/BluePrintProcessing_pb2_grpc.py
@@ -0,0 +1,66 @@
+# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
+"""Client and server classes corresponding to protobuf-defined services."""
+import grpc
+
+import proto.BluePrintProcessing_pb2 as BluePrintProcessing__pb2
+
+
+class BluePrintProcessingServiceStub(object):
+  """Missing associated documentation comment in .proto file."""
+
+  def __init__(self, channel):
+    """Constructor.
+
+    Args:
+        channel: A grpc.Channel.
+    """
+    self.process = channel.stream_stream(
+        '/org.onap.ccsdk.cds.controllerblueprints.processing.api.BluePrintProcessingService/process',
+        request_serializer=BluePrintProcessing__pb2.ExecutionServiceInput.SerializeToString,
+        response_deserializer=BluePrintProcessing__pb2.ExecutionServiceOutput.FromString,
+    )
+
+
+class BluePrintProcessingServiceServicer(object):
+  """Missing associated documentation comment in .proto file."""
+
+  def process(self, request_iterator, context):
+    """Missing associated documentation comment in .proto file."""
+    context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+    context.set_details('Method not implemented!')
+    raise NotImplementedError('Method not implemented!')
+
+
+def add_BluePrintProcessingServiceServicer_to_server(servicer, server):
+  rpc_method_handlers = {
+    'process': grpc.stream_stream_rpc_method_handler(
+        servicer.process,
+        request_deserializer=BluePrintProcessing__pb2.ExecutionServiceInput.FromString,
+        response_serializer=BluePrintProcessing__pb2.ExecutionServiceOutput.SerializeToString,
+    ),
+  }
+  generic_handler = grpc.method_handlers_generic_handler(
+      'org.onap.ccsdk.cds.controllerblueprints.processing.api.BluePrintProcessingService', rpc_method_handlers)
+  server.add_generic_rpc_handlers((generic_handler,))
+
+
+# This class is part of an EXPERIMENTAL API.
+class BluePrintProcessingService(object):
+  """Missing associated documentation comment in .proto file."""
+
+  @staticmethod
+  def process(request_iterator,
+      target,
+      options=(),
+      channel_credentials=None,
+      call_credentials=None,
+      insecure=False,
+      compression=None,
+      wait_for_ready=None,
+      timeout=None,
+      metadata=None):
+    return grpc.experimental.stream_stream(request_iterator, target, '/org.onap.ccsdk.cds.controllerblueprints.processing.api.BluePrintProcessingService/process',
+                                           BluePrintProcessing__pb2.ExecutionServiceInput.SerializeToString,
+                                           BluePrintProcessing__pb2.ExecutionServiceOutput.FromString,
+                                           options, channel_credentials,
+                                           insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
diff --git a/py-modules/common/proto/BlueprintCommon_pb2.py b/py-modules/common/proto/BlueprintCommon_pb2.py
deleted file mode 100644
index c3eddf862..000000000
--- a/py-modules/common/proto/BlueprintCommon_pb2.py
+++ /dev/null
@@ -1,316 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: BlueprintCommon.proto
-
-import sys
-_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
-from google.protobuf.internal import enum_type_wrapper
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import message as _message
-from google.protobuf import reflection as _reflection
-from google.protobuf import symbol_database as _symbol_database
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-
-
-DESCRIPTOR = _descriptor.FileDescriptor(
-  name='BlueprintCommon.proto',
-  package='org.onap.ccsdk.cds.controllerblueprints.common.api',
-  syntax='proto3',
-  serialized_options=_b('P\001'),
-  serialized_pb=_b('\n\x15\x42lueprintCommon.proto\x12\x32org.onap.ccsdk.cds.controllerblueprints.common.api\"\xa8\x01\n\x0c\x43ommonHeader\x12\x11\n\ttimestamp\x18\x01 \x01(\t\x12\x14\n\x0coriginatorId\x18\x17 \x01(\t\x12\x11\n\trequestId\x18\x03 \x01(\t\x12\x14\n\x0csubRequestId\x18\x04 \x01(\t\x12\x46\n\x04\x66lag\x18\x05 \x01(\x0b\x32\x38.org.onap.ccsdk.cds.controllerblueprints.common.api.Flag\"$\n\x04\x46lag\x12\x0f\n\x07isForce\x18\x01 \x01(\x08\x12\x0b\n\x03ttl\x18\x02 \x01(\x05\"f\n\x11\x41\x63tionIdentifiers\x12\x15\n\rblueprintName\x18\x01 \x01(\t\x12\x18\n\x10\x62lueprintVersion\x18\x02 \x01(\t\x12\x12\n\nactionName\x18\x03 \x01(\t\x12\x0c\n\x04mode\x18\x04 \x01(\t\"\xa2\x01\n\x06Status\x12\x0c\n\x04\x63ode\x18\x01 \x01(\x05\x12\x14\n\x0c\x65rrorMessage\x18\x02 \x01(\t\x12\x0f\n\x07message\x18\x03 \x01(\t\x12P\n\teventType\x18\x04 \x01(\x0e\x32=.org.onap.ccsdk.cds.controllerblueprints.common.api.EventType\x12\x11\n\ttimestamp\x18\x05 \x01(\t*\xa3\x01\n\tEventType\x12\x1b\n\x17\x45VENT_COMPONENT_FAILURE\x10\x00\x12\x1e\n\x1a\x45VENT_COMPONENT_PROCESSING\x10\x01\x12 \n\x1c\x45VENT_COMPONENT_NOTIFICATION\x10\x02\x12\x1c\n\x18\x45VENT_COMPONENT_EXECUTED\x10\x03\x12\x19\n\x15\x45VENT_COMPONENT_TRACE\x10\x04\x42\x02P\x01\x62\x06proto3')
-)
-
-_EVENTTYPE = _descriptor.EnumDescriptor(
-  name='EventType',
-  full_name='org.onap.ccsdk.cds.controllerblueprints.common.api.EventType',
-  filename=None,
-  file=DESCRIPTOR,
-  values=[
-    _descriptor.EnumValueDescriptor(
-      name='EVENT_COMPONENT_FAILURE', index=0, number=0,
-      serialized_options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='EVENT_COMPONENT_PROCESSING', index=1, number=1,
-      serialized_options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='EVENT_COMPONENT_NOTIFICATION', index=2, number=2,
-      serialized_options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='EVENT_COMPONENT_EXECUTED', index=3, number=3,
-      serialized_options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='EVENT_COMPONENT_TRACE', index=4, number=4,
-      serialized_options=None,
-      type=None),
-  ],
-  containing_type=None,
-  serialized_options=None,
-  serialized_start=556,
-  serialized_end=719,
-)
-_sym_db.RegisterEnumDescriptor(_EVENTTYPE)
-
-EventType = enum_type_wrapper.EnumTypeWrapper(_EVENTTYPE)
-EVENT_COMPONENT_FAILURE = 0
-EVENT_COMPONENT_PROCESSING = 1
-EVENT_COMPONENT_NOTIFICATION = 2
-EVENT_COMPONENT_EXECUTED = 3
-EVENT_COMPONENT_TRACE = 4
-
-
-
-_COMMONHEADER = _descriptor.Descriptor(
-  name='CommonHeader',
-  full_name='org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='timestamp', full_name='org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader.timestamp', index=0,
-      number=1, type=9, cpp_type=9, label=1,
-      has_default_value=False, default_value=_b("").decode('utf-8'),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='originatorId', full_name='org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader.originatorId', index=1,
-      number=23, type=9, cpp_type=9, label=1,
-      has_default_value=False, default_value=_b("").decode('utf-8'),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='requestId', full_name='org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader.requestId', index=2,
-      number=3, type=9, cpp_type=9, label=1,
-      has_default_value=False, default_value=_b("").decode('utf-8'),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='subRequestId', full_name='org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader.subRequestId', index=3,
-      number=4, type=9, cpp_type=9, label=1,
-      has_default_value=False, default_value=_b("").decode('utf-8'),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='flag', full_name='org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader.flag', index=4,
-      number=5, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  serialized_options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=78,
-  serialized_end=246,
-)
-
-
-_FLAG = _descriptor.Descriptor(
-  name='Flag',
-  full_name='org.onap.ccsdk.cds.controllerblueprints.common.api.Flag',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='isForce', full_name='org.onap.ccsdk.cds.controllerblueprints.common.api.Flag.isForce', index=0,
-      number=1, type=8, cpp_type=7, label=1,
-      has_default_value=False, default_value=False,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='ttl', full_name='org.onap.ccsdk.cds.controllerblueprints.common.api.Flag.ttl', index=1,
-      number=2, type=5, cpp_type=1, label=1,
-      has_default_value=False, default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  serialized_options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=248,
-  serialized_end=284,
-)
-
-
-_ACTIONIDENTIFIERS = _descriptor.Descriptor(
-  name='ActionIdentifiers',
-  full_name='org.onap.ccsdk.cds.controllerblueprints.common.api.ActionIdentifiers',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='blueprintName', full_name='org.onap.ccsdk.cds.controllerblueprints.common.api.ActionIdentifiers.blueprintName', index=0,
-      number=1, type=9, cpp_type=9, label=1,
-      has_default_value=False, default_value=_b("").decode('utf-8'),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='blueprintVersion', full_name='org.onap.ccsdk.cds.controllerblueprints.common.api.ActionIdentifiers.blueprintVersion', index=1,
-      number=2, type=9, cpp_type=9, label=1,
-      has_default_value=False, default_value=_b("").decode('utf-8'),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='actionName', full_name='org.onap.ccsdk.cds.controllerblueprints.common.api.ActionIdentifiers.actionName', index=2,
-      number=3, type=9, cpp_type=9, label=1,
-      has_default_value=False, default_value=_b("").decode('utf-8'),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='mode', full_name='org.onap.ccsdk.cds.controllerblueprints.common.api.ActionIdentifiers.mode', index=3,
-      number=4, type=9, cpp_type=9, label=1,
-      has_default_value=False, default_value=_b("").decode('utf-8'),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  serialized_options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=286,
-  serialized_end=388,
-)
-
-
-_STATUS = _descriptor.Descriptor(
-  name='Status',
-  full_name='org.onap.ccsdk.cds.controllerblueprints.common.api.Status',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='code', full_name='org.onap.ccsdk.cds.controllerblueprints.common.api.Status.code', index=0,
-      number=1, type=5, cpp_type=1, label=1,
-      has_default_value=False, default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='errorMessage', full_name='org.onap.ccsdk.cds.controllerblueprints.common.api.Status.errorMessage', index=1,
-      number=2, type=9, cpp_type=9, label=1,
-      has_default_value=False, default_value=_b("").decode('utf-8'),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='message', full_name='org.onap.ccsdk.cds.controllerblueprints.common.api.Status.message', index=2,
-      number=3, type=9, cpp_type=9, label=1,
-      has_default_value=False, default_value=_b("").decode('utf-8'),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='eventType', full_name='org.onap.ccsdk.cds.controllerblueprints.common.api.Status.eventType', index=3,
-      number=4, type=14, cpp_type=8, label=1,
-      has_default_value=False, default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='timestamp', full_name='org.onap.ccsdk.cds.controllerblueprints.common.api.Status.timestamp', index=4,
-      number=5, type=9, cpp_type=9, label=1,
-      has_default_value=False, default_value=_b("").decode('utf-8'),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  serialized_options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=391,
-  serialized_end=553,
-)
-
-_COMMONHEADER.fields_by_name['flag'].message_type = _FLAG
-_STATUS.fields_by_name['eventType'].enum_type = _EVENTTYPE
-DESCRIPTOR.message_types_by_name['CommonHeader'] = _COMMONHEADER
-DESCRIPTOR.message_types_by_name['Flag'] = _FLAG
-DESCRIPTOR.message_types_by_name['ActionIdentifiers'] = _ACTIONIDENTIFIERS
-DESCRIPTOR.message_types_by_name['Status'] = _STATUS
-DESCRIPTOR.enum_types_by_name['EventType'] = _EVENTTYPE
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
-
-CommonHeader = _reflection.GeneratedProtocolMessageType('CommonHeader', (_message.Message,), dict(
-  DESCRIPTOR = _COMMONHEADER,
-  __module__ = 'BlueprintCommon_pb2'
-  # @@protoc_insertion_point(class_scope:org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader)
-  ))
-_sym_db.RegisterMessage(CommonHeader)
-
-Flag = _reflection.GeneratedProtocolMessageType('Flag', (_message.Message,), dict(
-  DESCRIPTOR = _FLAG,
-  __module__ = 'BlueprintCommon_pb2'
-  # @@protoc_insertion_point(class_scope:org.onap.ccsdk.cds.controllerblueprints.common.api.Flag)
-  ))
-_sym_db.RegisterMessage(Flag)
-
-ActionIdentifiers = _reflection.GeneratedProtocolMessageType('ActionIdentifiers', (_message.Message,), dict(
-  DESCRIPTOR = _ACTIONIDENTIFIERS,
-  __module__ = 'BlueprintCommon_pb2'
-  # @@protoc_insertion_point(class_scope:org.onap.ccsdk.cds.controllerblueprints.common.api.ActionIdentifiers)
-  ))
-_sym_db.RegisterMessage(ActionIdentifiers)
-
-Status = _reflection.GeneratedProtocolMessageType('Status', (_message.Message,), dict(
-  DESCRIPTOR = _STATUS,
-  __module__ = 'BlueprintCommon_pb2'
-  # @@protoc_insertion_point(class_scope:org.onap.ccsdk.cds.controllerblueprints.common.api.Status)
-  ))
-_sym_db.RegisterMessage(Status)
-
-
-DESCRIPTOR._options = None
-# @@protoc_insertion_point(module_scope)
diff --git a/py-modules/common/proto/BlueprintManagement_pb2.py b/py-modules/common/proto/BlueprintManagement_pb2.py
deleted file mode 100644
index 183d8dd24..000000000
--- a/py-modules/common/proto/BlueprintManagement_pb2.py
+++ /dev/null
@@ -1,515 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: BlueprintManagement.proto
-
-import sys
-_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
-from google.protobuf.internal import enum_type_wrapper
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import message as _message
-from google.protobuf import reflection as _reflection
-from google.protobuf import symbol_database as _symbol_database
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-from google.protobuf import struct_pb2 as google_dot_protobuf_dot_struct__pb2
-import proto.BlueprintCommon_pb2 as BlueprintCommon__pb2
-
-
-DESCRIPTOR = _descriptor.FileDescriptor(
-  name='BlueprintManagement.proto',
-  package='org.onap.ccsdk.cds.controllerblueprints.management.api',
-  syntax='proto3',
-  serialized_options=_b('P\001'),
-  serialized_pb=_b('\n\x19\x42lueprintManagement.proto\x12\x36org.onap.ccsdk.cds.controllerblueprints.management.api\x1a\x1cgoogle/protobuf/struct.proto\x1a\x15\x42lueprintCommon.proto\"\xd3\x02\n\x14\x42lueprintUploadInput\x12V\n\x0c\x63ommonHeader\x18\x01 \x01(\x0b\x32@.org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader\x12T\n\tfileChunk\x18\x02 \x01(\x0b\x32\x41.org.onap.ccsdk.cds.controllerblueprints.management.api.FileChunk\x12`\n\x11\x61\x63tionIdentifiers\x18\x03 \x01(\x0b\x32\x45.org.onap.ccsdk.cds.controllerblueprints.common.api.ActionIdentifiers\x12+\n\nproperties\x18\x04 \x01(\x0b\x32\x17.google.protobuf.Struct\"\xff\x01\n\x16\x42lueprintDownloadInput\x12V\n\x0c\x63ommonHeader\x18\x01 \x01(\x0b\x32@.org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader\x12`\n\x11\x61\x63tionIdentifiers\x18\x02 \x01(\x0b\x32\x45.org.onap.ccsdk.cds.controllerblueprints.common.api.ActionIdentifiers\x12+\n\nproperties\x18\x03 \x01(\x0b\x32\x17.google.protobuf.Struct\"\xfd\x01\n\x14\x42lueprintRemoveInput\x12V\n\x0c\x63ommonHeader\x18\x01 \x01(\x0b\x32@.org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader\x12`\n\x11\x61\x63tionIdentifiers\x18\x02 \x01(\x0b\x32\x45.org.onap.ccsdk.cds.controllerblueprints.common.api.ActionIdentifiers\x12+\n\nproperties\x18\x03 \x01(\x0b\x32\x17.google.protobuf.Struct\"\xb9\x01\n\x17\x42lueprintBootstrapInput\x12V\n\x0c\x63ommonHeader\x18\x01 \x01(\x0b\x32@.org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader\x12\x0f\n\x07loadCBA\x18\x02 \x01(\x08\x12\x15\n\rloadModelType\x18\x03 \x01(\x08\x12\x1e\n\x16loadResourceDictionary\x18\x04 \x01(\x08\"\xc2\x02\n\x19\x42lueprintManagementOutput\x12V\n\x0c\x63ommonHeader\x18\x01 \x01(\x0b\x32@.org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader\x12T\n\tfileChunk\x18\x02 \x01(\x0b\x32\x41.org.onap.ccsdk.cds.controllerblueprints.management.api.FileChunk\x12J\n\x06status\x18\x03 \x01(\x0b\x32:.org.onap.ccsdk.cds.controllerblueprints.common.api.Status\x12+\n\nproperties\x18\x04 \x01(\x0b\x32\x17.google.protobuf.Struct\"\x1a\n\tFileChunk\x12\r\n\x05\x63hunk\x18\x01 \x01(\x0c*4\n\x0e\x44ownloadAction\x12\n\n\x06SEARCH\x10\x00\x12\x0b\n\x07STARTER\x10\x01\x12\t\n\x05\x43LONE\x10\x02*@\n\x0cUploadAction\x12\t\n\x05\x44RAFT\x10\x00\x12\n\n\x06\x45NRICH\x10\x01\x12\x0c\n\x08VALIDATE\x10\x02\x12\x0b\n\x07PUBLISH\x10\x03*\x1b\n\x0cRemoveAction\x12\x0b\n\x07\x44\x45\x46\x41ULT\x10\x00\x32\xfa\x05\n\x1a\x42lueprintManagementService\x12\xb6\x01\n\x11\x64ownloadBlueprint\x12N.org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintDownloadInput\x1aQ.org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintManagementOutput\x12\xb2\x01\n\x0fuploadBlueprint\x12L.org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintUploadInput\x1aQ.org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintManagementOutput\x12\xb2\x01\n\x0fremoveBlueprint\x12L.org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintRemoveInput\x1aQ.org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintManagementOutput\x12\xb8\x01\n\x12\x62ootstrapBlueprint\x12O.org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintBootstrapInput\x1aQ.org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintManagementOutputB\x02P\x01\x62\x06proto3')
-  ,
-  dependencies=[google_dot_protobuf_dot_struct__pb2.DESCRIPTOR,BlueprintCommon__pb2.DESCRIPTOR,])
-
-_DOWNLOADACTION = _descriptor.EnumDescriptor(
-  name='DownloadAction',
-  full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.DownloadAction',
-  filename=None,
-  file=DESCRIPTOR,
-  values=[
-    _descriptor.EnumValueDescriptor(
-      name='SEARCH', index=0, number=0,
-      serialized_options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='STARTER', index=1, number=1,
-      serialized_options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='CLONE', index=2, number=2,
-      serialized_options=None,
-      type=None),
-  ],
-  containing_type=None,
-  serialized_options=None,
-  serialized_start=1535,
-  serialized_end=1587,
-)
-_sym_db.RegisterEnumDescriptor(_DOWNLOADACTION)
-
-DownloadAction = enum_type_wrapper.EnumTypeWrapper(_DOWNLOADACTION)
-_UPLOADACTION = _descriptor.EnumDescriptor(
-  name='UploadAction',
-  full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.UploadAction',
-  filename=None,
-  file=DESCRIPTOR,
-  values=[
-    _descriptor.EnumValueDescriptor(
-      name='DRAFT', index=0, number=0,
-      serialized_options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='ENRICH', index=1, number=1,
-      serialized_options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='VALIDATE', index=2, number=2,
-      serialized_options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='PUBLISH', index=3, number=3,
-      serialized_options=None,
-      type=None),
-  ],
-  containing_type=None,
-  serialized_options=None,
-  serialized_start=1589,
-  serialized_end=1653,
-)
-_sym_db.RegisterEnumDescriptor(_UPLOADACTION)
-
-UploadAction = enum_type_wrapper.EnumTypeWrapper(_UPLOADACTION)
-_REMOVEACTION = _descriptor.EnumDescriptor(
-  name='RemoveAction',
-  full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.RemoveAction',
-  filename=None,
-  file=DESCRIPTOR,
-  values=[
-    _descriptor.EnumValueDescriptor(
-      name='DEFAULT', index=0, number=0,
-      serialized_options=None,
-      type=None),
-  ],
-  containing_type=None,
-  serialized_options=None,
-  serialized_start=1655,
-  serialized_end=1682,
-)
-_sym_db.RegisterEnumDescriptor(_REMOVEACTION)
-
-RemoveAction = enum_type_wrapper.EnumTypeWrapper(_REMOVEACTION)
-SEARCH = 0
-STARTER = 1
-CLONE = 2
-DRAFT = 0
-ENRICH = 1
-VALIDATE = 2
-PUBLISH = 3
-DEFAULT = 0
-
-
-
-_BLUEPRINTUPLOADINPUT = _descriptor.Descriptor(
-  name='BlueprintUploadInput',
-  full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintUploadInput',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='commonHeader', full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintUploadInput.commonHeader', index=0,
-      number=1, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='fileChunk', full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintUploadInput.fileChunk', index=1,
-      number=2, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='actionIdentifiers', full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintUploadInput.actionIdentifiers', index=2,
-      number=3, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='properties', full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintUploadInput.properties', index=3,
-      number=4, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  serialized_options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=139,
-  serialized_end=478,
-)
-
-
-_BLUEPRINTDOWNLOADINPUT = _descriptor.Descriptor(
-  name='BlueprintDownloadInput',
-  full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintDownloadInput',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='commonHeader', full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintDownloadInput.commonHeader', index=0,
-      number=1, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='actionIdentifiers', full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintDownloadInput.actionIdentifiers', index=1,
-      number=2, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='properties', full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintDownloadInput.properties', index=2,
-      number=3, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  serialized_options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=481,
-  serialized_end=736,
-)
-
-
-_BLUEPRINTREMOVEINPUT = _descriptor.Descriptor(
-  name='BlueprintRemoveInput',
-  full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintRemoveInput',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='commonHeader', full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintRemoveInput.commonHeader', index=0,
-      number=1, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='actionIdentifiers', full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintRemoveInput.actionIdentifiers', index=1,
-      number=2, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='properties', full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintRemoveInput.properties', index=2,
-      number=3, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  serialized_options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=739,
-  serialized_end=992,
-)
-
-
-_BLUEPRINTBOOTSTRAPINPUT = _descriptor.Descriptor(
-  name='BlueprintBootstrapInput',
-  full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintBootstrapInput',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='commonHeader', full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintBootstrapInput.commonHeader', index=0,
-      number=1, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='loadCBA', full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintBootstrapInput.loadCBA', index=1,
-      number=2, type=8, cpp_type=7, label=1,
-      has_default_value=False, default_value=False,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='loadModelType', full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintBootstrapInput.loadModelType', index=2,
-      number=3, type=8, cpp_type=7, label=1,
-      has_default_value=False, default_value=False,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='loadResourceDictionary', full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintBootstrapInput.loadResourceDictionary', index=3,
-      number=4, type=8, cpp_type=7, label=1,
-      has_default_value=False, default_value=False,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  serialized_options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=995,
-  serialized_end=1180,
-)
-
-
-_BLUEPRINTMANAGEMENTOUTPUT = _descriptor.Descriptor(
-  name='BlueprintManagementOutput',
-  full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintManagementOutput',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='commonHeader', full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintManagementOutput.commonHeader', index=0,
-      number=1, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='fileChunk', full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintManagementOutput.fileChunk', index=1,
-      number=2, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='status', full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintManagementOutput.status', index=2,
-      number=3, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='properties', full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintManagementOutput.properties', index=3,
-      number=4, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  serialized_options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=1183,
-  serialized_end=1505,
-)
-
-
-_FILECHUNK = _descriptor.Descriptor(
-  name='FileChunk',
-  full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.FileChunk',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='chunk', full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.FileChunk.chunk', index=0,
-      number=1, type=12, cpp_type=9, label=1,
-      has_default_value=False, default_value=_b(""),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  serialized_options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=1507,
-  serialized_end=1533,
-)
-
-_BLUEPRINTUPLOADINPUT.fields_by_name['commonHeader'].message_type = BlueprintCommon__pb2._COMMONHEADER
-_BLUEPRINTUPLOADINPUT.fields_by_name['fileChunk'].message_type = _FILECHUNK
-_BLUEPRINTUPLOADINPUT.fields_by_name['actionIdentifiers'].message_type = BlueprintCommon__pb2._ACTIONIDENTIFIERS
-_BLUEPRINTUPLOADINPUT.fields_by_name['properties'].message_type = google_dot_protobuf_dot_struct__pb2._STRUCT
-_BLUEPRINTDOWNLOADINPUT.fields_by_name['commonHeader'].message_type = BlueprintCommon__pb2._COMMONHEADER
-_BLUEPRINTDOWNLOADINPUT.fields_by_name['actionIdentifiers'].message_type = BlueprintCommon__pb2._ACTIONIDENTIFIERS
-_BLUEPRINTDOWNLOADINPUT.fields_by_name['properties'].message_type = google_dot_protobuf_dot_struct__pb2._STRUCT
-_BLUEPRINTREMOVEINPUT.fields_by_name['commonHeader'].message_type = BlueprintCommon__pb2._COMMONHEADER
-_BLUEPRINTREMOVEINPUT.fields_by_name['actionIdentifiers'].message_type = BlueprintCommon__pb2._ACTIONIDENTIFIERS
-_BLUEPRINTREMOVEINPUT.fields_by_name['properties'].message_type = google_dot_protobuf_dot_struct__pb2._STRUCT
-_BLUEPRINTBOOTSTRAPINPUT.fields_by_name['commonHeader'].message_type = BlueprintCommon__pb2._COMMONHEADER
-_BLUEPRINTMANAGEMENTOUTPUT.fields_by_name['commonHeader'].message_type = BlueprintCommon__pb2._COMMONHEADER
-_BLUEPRINTMANAGEMENTOUTPUT.fields_by_name['fileChunk'].message_type = _FILECHUNK
-_BLUEPRINTMANAGEMENTOUTPUT.fields_by_name['status'].message_type = BlueprintCommon__pb2._STATUS
-_BLUEPRINTMANAGEMENTOUTPUT.fields_by_name['properties'].message_type = google_dot_protobuf_dot_struct__pb2._STRUCT
-DESCRIPTOR.message_types_by_name['BlueprintUploadInput'] = _BLUEPRINTUPLOADINPUT
-DESCRIPTOR.message_types_by_name['BlueprintDownloadInput'] = _BLUEPRINTDOWNLOADINPUT
-DESCRIPTOR.message_types_by_name['BlueprintRemoveInput'] = _BLUEPRINTREMOVEINPUT
-DESCRIPTOR.message_types_by_name['BlueprintBootstrapInput'] = _BLUEPRINTBOOTSTRAPINPUT
-DESCRIPTOR.message_types_by_name['BlueprintManagementOutput'] = _BLUEPRINTMANAGEMENTOUTPUT
-DESCRIPTOR.message_types_by_name['FileChunk'] = _FILECHUNK
-DESCRIPTOR.enum_types_by_name['DownloadAction'] = _DOWNLOADACTION
-DESCRIPTOR.enum_types_by_name['UploadAction'] = _UPLOADACTION
-DESCRIPTOR.enum_types_by_name['RemoveAction'] = _REMOVEACTION
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
-
-BlueprintUploadInput = _reflection.GeneratedProtocolMessageType('BlueprintUploadInput', (_message.Message,), dict(
-  DESCRIPTOR = _BLUEPRINTUPLOADINPUT,
-  __module__ = 'BlueprintManagement_pb2'
-  # @@protoc_insertion_point(class_scope:org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintUploadInput)
-  ))
-_sym_db.RegisterMessage(BlueprintUploadInput)
-
-BlueprintDownloadInput = _reflection.GeneratedProtocolMessageType('BlueprintDownloadInput', (_message.Message,), dict(
-  DESCRIPTOR = _BLUEPRINTDOWNLOADINPUT,
-  __module__ = 'BlueprintManagement_pb2'
-  # @@protoc_insertion_point(class_scope:org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintDownloadInput)
-  ))
-_sym_db.RegisterMessage(BlueprintDownloadInput)
-
-BlueprintRemoveInput = _reflection.GeneratedProtocolMessageType('BlueprintRemoveInput', (_message.Message,), dict(
-  DESCRIPTOR = _BLUEPRINTREMOVEINPUT,
-  __module__ = 'BlueprintManagement_pb2'
-  # @@protoc_insertion_point(class_scope:org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintRemoveInput)
-  ))
-_sym_db.RegisterMessage(BlueprintRemoveInput)
-
-BlueprintBootstrapInput = _reflection.GeneratedProtocolMessageType('BlueprintBootstrapInput', (_message.Message,), dict(
-  DESCRIPTOR = _BLUEPRINTBOOTSTRAPINPUT,
-  __module__ = 'BlueprintManagement_pb2'
-  # @@protoc_insertion_point(class_scope:org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintBootstrapInput)
-  ))
-_sym_db.RegisterMessage(BlueprintBootstrapInput)
-
-BlueprintManagementOutput = _reflection.GeneratedProtocolMessageType('BlueprintManagementOutput', (_message.Message,), dict(
-  DESCRIPTOR = _BLUEPRINTMANAGEMENTOUTPUT,
-  __module__ = 'BlueprintManagement_pb2'
-  # @@protoc_insertion_point(class_scope:org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintManagementOutput)
-  ))
-_sym_db.RegisterMessage(BlueprintManagementOutput)
-
-FileChunk = _reflection.GeneratedProtocolMessageType('FileChunk', (_message.Message,), dict(
-  DESCRIPTOR = _FILECHUNK,
-  __module__ = 'BlueprintManagement_pb2'
-  # @@protoc_insertion_point(class_scope:org.onap.ccsdk.cds.controllerblueprints.management.api.FileChunk)
-  ))
-_sym_db.RegisterMessage(FileChunk)
-
-
-DESCRIPTOR._options = None
-
-_BLUEPRINTMANAGEMENTSERVICE = _descriptor.ServiceDescriptor(
-  name='BlueprintManagementService',
-  full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintManagementService',
-  file=DESCRIPTOR,
-  index=0,
-  serialized_options=None,
-  serialized_start=1685,
-  serialized_end=2447,
-  methods=[
-  _descriptor.MethodDescriptor(
-    name='downloadBlueprint',
-    full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintManagementService.downloadBlueprint',
-    index=0,
-    containing_service=None,
-    input_type=_BLUEPRINTDOWNLOADINPUT,
-    output_type=_BLUEPRINTMANAGEMENTOUTPUT,
-    serialized_options=None,
-  ),
-  _descriptor.MethodDescriptor(
-    name='uploadBlueprint',
-    full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintManagementService.uploadBlueprint',
-    index=1,
-    containing_service=None,
-    input_type=_BLUEPRINTUPLOADINPUT,
-    output_type=_BLUEPRINTMANAGEMENTOUTPUT,
-    serialized_options=None,
-  ),
-  _descriptor.MethodDescriptor(
-    name='removeBlueprint',
-    full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintManagementService.removeBlueprint',
-    index=2,
-    containing_service=None,
-    input_type=_BLUEPRINTREMOVEINPUT,
-    output_type=_BLUEPRINTMANAGEMENTOUTPUT,
-    serialized_options=None,
-  ),
-  _descriptor.MethodDescriptor(
-    name='bootstrapBlueprint',
-    full_name='org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintManagementService.bootstrapBlueprint',
-    index=3,
-    containing_service=None,
-    input_type=_BLUEPRINTBOOTSTRAPINPUT,
-    output_type=_BLUEPRINTMANAGEMENTOUTPUT,
-    serialized_options=None,
-  ),
-])
-_sym_db.RegisterServiceDescriptor(_BLUEPRINTMANAGEMENTSERVICE)
-
-DESCRIPTOR.services_by_name['BlueprintManagementService'] = _BLUEPRINTMANAGEMENTSERVICE
-
-# @@protoc_insertion_point(module_scope)
diff --git a/py-modules/common/proto/BlueprintManagement_pb2_grpc.py b/py-modules/common/proto/BlueprintManagement_pb2_grpc.py
deleted file mode 100644
index 09db2d10a..000000000
--- a/py-modules/common/proto/BlueprintManagement_pb2_grpc.py
+++ /dev/null
@@ -1,97 +0,0 @@
-# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
-import grpc
-
-import proto.BlueprintManagement_pb2 as BlueprintManagement__pb2
-
-
-class BlueprintManagementServiceStub(object):
-  # missing associated documentation comment in .proto file
-  pass
-
-  def __init__(self, channel):
-    """Constructor.
-
-    Args:
-      channel: A grpc.Channel.
-    """
-    self.downloadBlueprint = channel.unary_unary(
-        '/org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintManagementService/downloadBlueprint',
-        request_serializer=BlueprintManagement__pb2.BlueprintDownloadInput.SerializeToString,
-        response_deserializer=BlueprintManagement__pb2.BlueprintManagementOutput.FromString,
-        )
-    self.uploadBlueprint = channel.unary_unary(
-        '/org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintManagementService/uploadBlueprint',
-        request_serializer=BlueprintManagement__pb2.BlueprintUploadInput.SerializeToString,
-        response_deserializer=BlueprintManagement__pb2.BlueprintManagementOutput.FromString,
-        )
-    self.removeBlueprint = channel.unary_unary(
-        '/org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintManagementService/removeBlueprint',
-        request_serializer=BlueprintManagement__pb2.BlueprintRemoveInput.SerializeToString,
-        response_deserializer=BlueprintManagement__pb2.BlueprintManagementOutput.FromString,
-        )
-    self.bootstrapBlueprint = channel.unary_unary(
-        '/org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintManagementService/bootstrapBlueprint',
-        request_serializer=BlueprintManagement__pb2.BlueprintBootstrapInput.SerializeToString,
-        response_deserializer=BlueprintManagement__pb2.BlueprintManagementOutput.FromString,
-        )
-
-
-class BlueprintManagementServiceServicer(object):
-  # missing associated documentation comment in .proto file
-  pass
-
-  def downloadBlueprint(self, request, context):
-    # missing associated documentation comment in .proto file
-    pass
-    context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-    context.set_details('Method not implemented!')
-    raise NotImplementedError('Method not implemented!')
-
-  def uploadBlueprint(self, request, context):
-    # missing associated documentation comment in .proto file
-    pass
-    context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-    context.set_details('Method not implemented!')
-    raise NotImplementedError('Method not implemented!')
-
-  def removeBlueprint(self, request, context):
-    # missing associated documentation comment in .proto file
-    pass
-    context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-    context.set_details('Method not implemented!')
-    raise NotImplementedError('Method not implemented!')
-
-  def bootstrapBlueprint(self, request, context):
-    # missing associated documentation comment in .proto file
-    pass
-    context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-    context.set_details('Method not implemented!')
-    raise NotImplementedError('Method not implemented!')
-
-
-def add_BlueprintManagementServiceServicer_to_server(servicer, server):
-  rpc_method_handlers = {
-      'downloadBlueprint': grpc.unary_unary_rpc_method_handler(
-          servicer.downloadBlueprint,
-          request_deserializer=BlueprintManagement__pb2.BlueprintDownloadInput.FromString,
-          response_serializer=BlueprintManagement__pb2.BlueprintManagementOutput.SerializeToString,
-      ),
-      'uploadBlueprint': grpc.unary_unary_rpc_method_handler(
-          servicer.uploadBlueprint,
-          request_deserializer=BlueprintManagement__pb2.BlueprintUploadInput.FromString,
-          response_serializer=BlueprintManagement__pb2.BlueprintManagementOutput.SerializeToString,
-      ),
-      'removeBlueprint': grpc.unary_unary_rpc_method_handler(
-          servicer.removeBlueprint,
-          request_deserializer=BlueprintManagement__pb2.BlueprintRemoveInput.FromString,
-          response_serializer=BlueprintManagement__pb2.BlueprintManagementOutput.SerializeToString,
-      ),
-      'bootstrapBlueprint': grpc.unary_unary_rpc_method_handler(
-          servicer.bootstrapBlueprint,
-          request_deserializer=BlueprintManagement__pb2.BlueprintBootstrapInput.FromString,
-          response_serializer=BlueprintManagement__pb2.BlueprintManagementOutput.SerializeToString,
-      ),
-  }
-  generic_handler = grpc.method_handlers_generic_handler(
-      'org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintManagementService', rpc_method_handlers)
-  server.add_generic_rpc_handlers((generic_handler,))
diff --git a/py-modules/common/proto/BlueprintProcessing_pb2.py b/py-modules/common/proto/BlueprintProcessing_pb2.py
deleted file mode 100644
index dc5ca4ffe..000000000
--- a/py-modules/common/proto/BlueprintProcessing_pb2.py
+++ /dev/null
@@ -1,179 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: BlueprintProcessing.proto
-
-import sys
-_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import message as _message
-from google.protobuf import reflection as _reflection
-from google.protobuf import symbol_database as _symbol_database
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-from google.protobuf import struct_pb2 as google_dot_protobuf_dot_struct__pb2
-import proto.BlueprintCommon_pb2 as BlueprintCommon__pb2
-
-
-DESCRIPTOR = _descriptor.FileDescriptor(
-  name='BlueprintProcessing.proto',
-  package='org.onap.ccsdk.cds.controllerblueprints.processing.api',
-  syntax='proto3',
-  serialized_options=_b('P\001'),
-  serialized_pb=_b('\n\x19\x42lueprintProcessing.proto\x12\x36org.onap.ccsdk.cds.controllerblueprints.processing.api\x1a\x1cgoogle/protobuf/struct.proto\x1a\x15\x42lueprintCommon.proto\"\xfb\x01\n\x15\x45xecutionServiceInput\x12V\n\x0c\x63ommonHeader\x18\x01 \x01(\x0b\x32@.org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader\x12`\n\x11\x61\x63tionIdentifiers\x18\x02 \x01(\x0b\x32\x45.org.onap.ccsdk.cds.controllerblueprints.common.api.ActionIdentifiers\x12(\n\x07payload\x18\x03 \x01(\x0b\x32\x17.google.protobuf.Struct\"\xc8\x02\n\x16\x45xecutionServiceOutput\x12V\n\x0c\x63ommonHeader\x18\x01 \x01(\x0b\x32@.org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader\x12`\n\x11\x61\x63tionIdentifiers\x18\x02 \x01(\x0b\x32\x45.org.onap.ccsdk.cds.controllerblueprints.common.api.ActionIdentifiers\x12J\n\x06status\x18\x03 \x01(\x0b\x32:.org.onap.ccsdk.cds.controllerblueprints.common.api.Status\x12(\n\x07payload\x18\x04 \x01(\x0b\x32\x17.google.protobuf.Struct2\xcb\x01\n\x1a\x42lueprintProcessingService\x12\xac\x01\n\x07process\x12M.org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceInput\x1aN.org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceOutput(\x01\x30\x01\x42\x02P\x01\x62\x06proto3')
-  ,
-  dependencies=[google_dot_protobuf_dot_struct__pb2.DESCRIPTOR,BlueprintCommon__pb2.DESCRIPTOR,])
-
-
-
-
-_EXECUTIONSERVICEINPUT = _descriptor.Descriptor(
-  name='ExecutionServiceInput',
-  full_name='org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceInput',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='commonHeader', full_name='org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceInput.commonHeader', index=0,
-      number=1, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='actionIdentifiers', full_name='org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceInput.actionIdentifiers', index=1,
-      number=2, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='payload', full_name='org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceInput.payload', index=2,
-      number=3, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  serialized_options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=139,
-  serialized_end=390,
-)
-
-
-_EXECUTIONSERVICEOUTPUT = _descriptor.Descriptor(
-  name='ExecutionServiceOutput',
-  full_name='org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceOutput',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='commonHeader', full_name='org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceOutput.commonHeader', index=0,
-      number=1, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='actionIdentifiers', full_name='org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceOutput.actionIdentifiers', index=1,
-      number=2, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='status', full_name='org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceOutput.status', index=2,
-      number=3, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='payload', full_name='org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceOutput.payload', index=3,
-      number=4, type=11, cpp_type=10, label=1,
-      has_default_value=False, default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  serialized_options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=393,
-  serialized_end=721,
-)
-
-_EXECUTIONSERVICEINPUT.fields_by_name['commonHeader'].message_type = BlueprintCommon__pb2._COMMONHEADER
-_EXECUTIONSERVICEINPUT.fields_by_name['actionIdentifiers'].message_type = BlueprintCommon__pb2._ACTIONIDENTIFIERS
-_EXECUTIONSERVICEINPUT.fields_by_name['payload'].message_type = google_dot_protobuf_dot_struct__pb2._STRUCT
-_EXECUTIONSERVICEOUTPUT.fields_by_name['commonHeader'].message_type = BlueprintCommon__pb2._COMMONHEADER
-_EXECUTIONSERVICEOUTPUT.fields_by_name['actionIdentifiers'].message_type = BlueprintCommon__pb2._ACTIONIDENTIFIERS
-_EXECUTIONSERVICEOUTPUT.fields_by_name['status'].message_type = BlueprintCommon__pb2._STATUS
-_EXECUTIONSERVICEOUTPUT.fields_by_name['payload'].message_type = google_dot_protobuf_dot_struct__pb2._STRUCT
-DESCRIPTOR.message_types_by_name['ExecutionServiceInput'] = _EXECUTIONSERVICEINPUT
-DESCRIPTOR.message_types_by_name['ExecutionServiceOutput'] = _EXECUTIONSERVICEOUTPUT
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
-
-ExecutionServiceInput = _reflection.GeneratedProtocolMessageType('ExecutionServiceInput', (_message.Message,), dict(
-  DESCRIPTOR = _EXECUTIONSERVICEINPUT,
-  __module__ = 'BlueprintProcessing_pb2'
-  # @@protoc_insertion_point(class_scope:org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceInput)
-  ))
-_sym_db.RegisterMessage(ExecutionServiceInput)
-
-ExecutionServiceOutput = _reflection.GeneratedProtocolMessageType('ExecutionServiceOutput', (_message.Message,), dict(
-  DESCRIPTOR = _EXECUTIONSERVICEOUTPUT,
-  __module__ = 'BlueprintProcessing_pb2'
-  # @@protoc_insertion_point(class_scope:org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceOutput)
-  ))
-_sym_db.RegisterMessage(ExecutionServiceOutput)
-
-
-DESCRIPTOR._options = None
-
-_BLUEPRINTPROCESSINGSERVICE = _descriptor.ServiceDescriptor(
-  name='BlueprintProcessingService',
-  full_name='org.onap.ccsdk.cds.controllerblueprints.processing.api.BlueprintProcessingService',
-  file=DESCRIPTOR,
-  index=0,
-  serialized_options=None,
-  serialized_start=724,
-  serialized_end=927,
-  methods=[
-  _descriptor.MethodDescriptor(
-    name='process',
-    full_name='org.onap.ccsdk.cds.controllerblueprints.processing.api.BlueprintProcessingService.process',
-    index=0,
-    containing_service=None,
-    input_type=_EXECUTIONSERVICEINPUT,
-    output_type=_EXECUTIONSERVICEOUTPUT,
-    serialized_options=None,
-  ),
-])
-_sym_db.RegisterServiceDescriptor(_BLUEPRINTPROCESSINGSERVICE)
-
-DESCRIPTOR.services_by_name['BlueprintProcessingService'] = _BLUEPRINTPROCESSINGSERVICE
-
-# @@protoc_insertion_point(module_scope)
diff --git a/py-modules/common/proto/BlueprintProcessing_pb2_grpc.py b/py-modules/common/proto/BlueprintProcessing_pb2_grpc.py
deleted file mode 100644
index f1f14ca74..000000000
--- a/py-modules/common/proto/BlueprintProcessing_pb2_grpc.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
-import grpc
-
-import proto.BlueprintProcessing_pb2 as BlueprintProcessing__pb2
-
-
-class BlueprintProcessingServiceStub(object):
-  # missing associated documentation comment in .proto file
-  pass
-
-  def __init__(self, channel):
-    """Constructor.
-
-    Args:
-      channel: A grpc.Channel.
-    """
-    self.process = channel.stream_stream(
-        '/org.onap.ccsdk.cds.controllerblueprints.processing.api.BlueprintProcessingService/process',
-        request_serializer=BlueprintProcessing__pb2.ExecutionServiceInput.SerializeToString,
-        response_deserializer=BlueprintProcessing__pb2.ExecutionServiceOutput.FromString,
-        )
-
-
-class BlueprintProcessingServiceServicer(object):
-  # missing associated documentation comment in .proto file
-  pass
-
-  def process(self, request_iterator, context):
-    # missing associated documentation comment in .proto file
-    pass
-    context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-    context.set_details('Method not implemented!')
-    raise NotImplementedError('Method not implemented!')
-
-
-def add_BlueprintProcessingServiceServicer_to_server(servicer, server):
-  rpc_method_handlers = {
-      'process': grpc.stream_stream_rpc_method_handler(
-          servicer.process,
-          request_deserializer=BlueprintProcessing__pb2.ExecutionServiceInput.FromString,
-          response_serializer=BlueprintProcessing__pb2.ExecutionServiceOutput.SerializeToString,
-      ),
-  }
-  generic_handler = grpc.method_handlers_generic_handler(
-      'org.onap.ccsdk.cds.controllerblueprints.processing.api.BlueprintProcessingService', rpc_method_handlers)
-  server.add_generic_rpc_handlers((generic_handler,))