diff options
Diffstat (limited to 'ms/py-executor')
25 files changed, 120 insertions, 1325 deletions
diff --git a/ms/py-executor/blueprints_grpc/__init__.py b/ms/py-executor/blueprints_grpc/__init__.py index 726849f2d..8a2db9e1e 100644 --- a/ms/py-executor/blueprints_grpc/__init__.py +++ b/ms/py-executor/blueprints_grpc/__init__.py @@ -12,8 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -from .proto.BluePrintCommon_pb2 import * -from .proto.BluePrintProcessing_pb2 import * +from proto.BluePrintCommon_pb2 import * +from proto.BluePrintProcessing_pb2 import * from .script_executor_configuration import * from .executor_utils import * from .blueprint_processing_server import *
\ No newline at end of file diff --git a/ms/py-executor/blueprints_grpc/blueprint_processing_server.py b/ms/py-executor/blueprints_grpc/blueprint_processing_server.py index f1f29a035..322d34b0b 100644 --- a/ms/py-executor/blueprints_grpc/blueprint_processing_server.py +++ b/ms/py-executor/blueprints_grpc/blueprint_processing_server.py @@ -16,7 +16,7 @@ import logging from google.protobuf.json_format import MessageToJson -from .proto import BluePrintProcessing_pb2_grpc as BluePrintProcessing_pb2_grpc +from proto import BluePrintProcessing_pb2_grpc as BluePrintProcessing_pb2_grpc from .script_executor_configuration import ScriptExecutorConfiguration from .executor_utils import instance_for_input diff --git a/ms/py-executor/blueprints_grpc/executor_utils.py b/ms/py-executor/blueprints_grpc/executor_utils.py index 44b6d8e87..701958fff 100644 --- a/ms/py-executor/blueprints_grpc/executor_utils.py +++ b/ms/py-executor/blueprints_grpc/executor_utils.py @@ -14,14 +14,28 @@ # See the License for the specific language governing permissions and # limitations under the License. -from google.protobuf.timestamp_pb2 import Timestamp -from google.protobuf import struct_pb2 -from google.protobuf import json_format -import sys, importlib, importlib.util, json, time, datetime +import datetime +import importlib +import importlib.util +import json import logging -from .proto.BluePrintProcessing_pb2 import ExecutionServiceInput, ExecutionServiceOutput -from .proto.BluePrintCommon_pb2 import Status, EVENT_COMPONENT_TRACE, EVENT_COMPONENT_PROCESSING, \ - EVENT_COMPONENT_EXECUTED, EVENT_COMPONENT_NOTIFICATION +import sys +import time + +from google.protobuf import json_format, struct_pb2 +from google.protobuf.timestamp_pb2 import Timestamp +from proto.BluePrintCommon_pb2 import ( + EVENT_COMPONENT_EXECUTED, + EVENT_COMPONENT_NOTIFICATION, + EVENT_COMPONENT_PROCESSING, + EVENT_COMPONENT_TRACE, + Status +) +from proto.BluePrintProcessing_pb2 import ( + ExecutionServiceInput, + ExecutionServiceOutput, +) + from .script_executor_configuration import ScriptExecutorConfiguration logger = logging.getLogger("Utils") diff --git a/ms/py-executor/blueprints_grpc/proto/BluePrintCommon_pb2.py b/ms/py-executor/blueprints_grpc/proto/BluePrintCommon_pb2.py deleted file mode 100644 index db78b2b48..000000000 --- a/ms/py-executor/blueprints_grpc/proto/BluePrintCommon_pb2.py +++ /dev/null @@ -1,331 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright © 2018-2019 AT&T Intellectual Property. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# 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,), { - '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/ms/py-executor/blueprints_grpc/proto/BluePrintCommon_pb2_grpc.py b/ms/py-executor/blueprints_grpc/proto/BluePrintCommon_pb2_grpc.py deleted file mode 100644 index 0129ff944..000000000 --- a/ms/py-executor/blueprints_grpc/proto/BluePrintCommon_pb2_grpc.py +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright © 2018-2019 AT&T Intellectual Property. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! -import grpc - diff --git a/ms/py-executor/blueprints_grpc/proto/BluePrintManagement_pb2.py b/ms/py-executor/blueprints_grpc/proto/BluePrintManagement_pb2.py deleted file mode 100644 index a2e0ec227..000000000 --- a/ms/py-executor/blueprints_grpc/proto/BluePrintManagement_pb2.py +++ /dev/null @@ -1,528 +0,0 @@ -# Copyright © 2018-2019 AT&T Intellectual Property. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -*- 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 -from blueprints_grpc.proto import 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,), { - '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, - 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/ms/py-executor/blueprints_grpc/proto/BluePrintManagement_pb2_grpc.py b/ms/py-executor/blueprints_grpc/proto/BluePrintManagement_pb2_grpc.py deleted file mode 100644 index 423a46003..000000000 --- a/ms/py-executor/blueprints_grpc/proto/BluePrintManagement_pb2_grpc.py +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright © 2018-2019 AT&T Intellectual Property. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! -import grpc - -from blueprints_grpc.proto import 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/ms/py-executor/blueprints_grpc/proto/BluePrintProcessing_pb2.py b/ms/py-executor/blueprints_grpc/proto/BluePrintProcessing_pb2.py deleted file mode 100644 index 36f8c4155..000000000 --- a/ms/py-executor/blueprints_grpc/proto/BluePrintProcessing_pb2.py +++ /dev/null @@ -1,193 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright © 2018-2019 AT&T Intellectual Property. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# 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 -from blueprints_grpc.proto import 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,), { - '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, - 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/ms/py-executor/blueprints_grpc/proto/BluePrintProcessing_pb2_grpc.py b/ms/py-executor/blueprints_grpc/proto/BluePrintProcessing_pb2_grpc.py deleted file mode 100644 index a482f5652..000000000 --- a/ms/py-executor/blueprints_grpc/proto/BluePrintProcessing_pb2_grpc.py +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright © 2018-2019 AT&T Intellectual Property. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! -import grpc - -from blueprints_grpc.proto import 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,)) diff --git a/ms/py-executor/blueprints_grpc/proto/__init__.py b/ms/py-executor/blueprints_grpc/proto/__init__.py deleted file mode 100644 index b63c94c9c..000000000 --- a/ms/py-executor/blueprints_grpc/proto/__init__.py +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright © 2018-2019 AT&T Intellectual Property. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - diff --git a/ms/py-executor/blueprints_grpc/script_executor_configuration.py b/ms/py-executor/blueprints_grpc/script_executor_configuration.py index 2f0553b62..9f7460748 100644 --- a/ms/py-executor/blueprints_grpc/script_executor_configuration.py +++ b/ms/py-executor/blueprints_grpc/script_executor_configuration.py @@ -42,7 +42,9 @@ class ScriptExecutorConfiguration: if __name__ == '__main__': - config_file = str(PurePath(Path().absolute())) + '/../configuration.ini' + default_configuration_file = str(PurePath(Path().absolute(), "../../configuration.ini")) + supplied_configuration_file = os.environ.get('CONFIGURATION') + config_file = str(os.path.expanduser(Path(supplied_configuration_file or default_configuration_file))) scriptExecutorConfiguration = ScriptExecutorConfiguration(config_file) blueprintDeployPath = scriptExecutorConfiguration.get_property('blueprintsprocessor', 'blueprintDeployPath') print(blueprintDeployPath) diff --git a/ms/py-executor/client.py b/ms/py-executor/client.py index c5bdc43c8..482bcbdd3 100644 --- a/ms/py-executor/client.py +++ b/ms/py-executor/client.py @@ -25,9 +25,9 @@ # limitations under the License. import grpc -from blueprints_grpc.proto.BluePrintProcessing_pb2_grpc import BluePrintProcessingServiceStub -from blueprints_grpc.proto.BluePrintProcessing_pb2 import ExecutionServiceInput -from blueprints_grpc.proto.BluePrintCommon_pb2 import CommonHeader, ActionIdentifiers +from proto.BluePrintCommon_pb2 import ActionIdentifiers, CommonHeader +from proto.BluePrintProcessing_pb2 import ExecutionServiceInput +from proto.BluePrintProcessing_pb2_grpc import BluePrintProcessingServiceStub def generate_messages(): diff --git a/ms/py-executor/configuration-local.ini b/ms/py-executor/configuration-local.ini deleted file mode 100644 index c98746afe..000000000 --- a/ms/py-executor/configuration-local.ini +++ /dev/null @@ -1,13 +0,0 @@ -[scriptExecutor] -port=50052 -authType=tls-auth -# For TLS Auth -certChain=certs/py-executor/py-executor-chain.pem -privateKey=certs/py-executor/py-executor-key.pem -logFile=application.log -maxWorkers=20 - -[blueprintsprocessor] -blueprintDeployPath=test/resources -blueprintArchivePath=target/blueprints/archive -blueprintWorkingPath=target/blueprints/work diff --git a/ms/py-executor/configuration.ini b/ms/py-executor/configuration.ini deleted file mode 100644 index 612c62899..000000000 --- a/ms/py-executor/configuration.ini +++ /dev/null @@ -1,16 +0,0 @@ -[scriptExecutor] -port=%(APP_PORT)s -authType=%(AUTH_TYPE)s -# For Token Auth -token=%(AUTH_TOKEN)s -# For TLS Auth -certChain=/opt/app/onap/python/certs/py-executor/py-executor-chain.pem -privateKey=/opt/app/onap/python/certs/py-executor/py-executor-key.pem -logFile=%(LOG_FILE)s -maxWorkers=20 - -[blueprintsprocessor] -#blueprintDeployPath=test/resources -blueprintDeployPath=/opt/app/onap/blueprints/deploy -blueprintArchivePath=/opt/app/onap/blueprints/archive -blueprintWorkingPath=/opt/app/onap/blueprints/work diff --git a/ms/py-executor/docker/Dockerfile b/ms/py-executor/docker/Dockerfile index 9e86cc87e..043e15d53 100644 --- a/ms/py-executor/docker/Dockerfile +++ b/ms/py-executor/docker/Dockerfile @@ -8,7 +8,7 @@ RUN tar -xzf /source.tar.gz -C /tmp \ && rm -rf /source.tar.gz \ && rm -rf /tmp/@project.build.finalName@ -RUN pip install --no-cache-dir -r /opt/app/onap/python/requirements.txt +RUN pip install --no-cache-dir -r /opt/app/onap/python/requirements/docker.txt VOLUME /opt/app/onap/blueprints/deploy/ diff --git a/ms/py-executor/docker/distribution.xml b/ms/py-executor/docker/distribution.xml index 6d09be8b2..558ce2f17 100755 --- a/ms/py-executor/docker/distribution.xml +++ b/ms/py-executor/docker/distribution.xml @@ -27,17 +27,42 @@ <directory>${project.basedir}</directory> <outputDirectory>opt/app/onap/python</outputDirectory> <includes> - <include>blueprints_grpc/**/*.py</include> + <include>blueprints_grpc/*.py</include> <include>*.py</include> </includes> <useDefaultExcludes>true</useDefaultExcludes> </fileSet> <fileSet> + <directory>${project.basedir}/../../py-modules</directory> + <outputDirectory>opt/app/onap/dependencies/</outputDirectory> + <includes> + <include>common/**/*.py</include> + </includes> + <useDefaultExcludes>true</useDefaultExcludes> + </fileSet> + <fileSet> + <directory>${project.basedir}/..</directory> + <outputDirectory>opt/app/onap/dependencies</outputDirectory> + <includes> + <include>artifact-manager/**/*.*</include> + </includes> + <useDefaultExcludes>true</useDefaultExcludes> + </fileSet> + <fileSet> + <directory>${project.basedir}/..</directory> + <outputDirectory>opt/app/onap</outputDirectory> + <includes> + <include>logging.yaml</include> + <include>configuration.ini</include> + </includes> + <useDefaultExcludes>true</useDefaultExcludes> + <fileMode>0666</fileMode> + </fileSet> + <fileSet> <directory>${project.basedir}</directory> <outputDirectory>opt/app/onap/python</outputDirectory> <includes> - <include>requirements.txt</include> - <include>configuration.ini</include> + <include>requirements/*.txt</include> </includes> <useDefaultExcludes>true</useDefaultExcludes> <fileMode>0666</fileMode> @@ -58,4 +83,4 @@ <fileMode>0755</fileMode> </fileSet> </fileSets> -</assembly>
\ No newline at end of file +</assembly> diff --git a/ms/py-executor/docker/start.sh b/ms/py-executor/docker/start.sh index 3a3a9cb70..6868ba0e7 100755 --- a/ms/py-executor/docker/start.sh +++ b/ms/py-executor/docker/start.sh @@ -22,12 +22,24 @@ then export APP_PORT=50052 fi +if [ -z "${ARTIFACT_MANAGER_PORT}" ] +then + echo "ARTIFACT_MANAGER_PORT environment variable is not set, using default." + export ARTIFACT_MANAGER_PORT=50053 +fi + if [ -z "${LOG_FILE}" ] then echo "LOG_FILE environment variable is not set, using default." export LOG_FILE="application.log" fi +if [ -z "${ARTIFACT_MANAGER_SERVER_LOG_FILE}" ] +then + echo "ARTIFACT_MANAGER_SERVER_LOG_FILE environment variable is not set, using default." + export ARTIFACT_MANAGER_SERVER_LOG_FILE="artifacts.log" +fi + if [ "${http_proxy}" ] then echo "Setting http_proxy: ${http_proxy}" @@ -38,5 +50,12 @@ then echo "Setting https_proxy: ${https_proxy}" fi +if [ -z "${CONFIGURATION}" ] +then + echo "CONFIGURATION environment variable is not set, using default." + export CONFIGURATION="/opt/app/onap/configuration.ini" +fi + + cd /opt/app/onap/python/ python server.py
\ No newline at end of file diff --git a/ms/py-executor/requirements/docker.txt b/ms/py-executor/requirements/docker.txt new file mode 100644 index 000000000..58469c9d7 --- /dev/null +++ b/ms/py-executor/requirements/docker.txt @@ -0,0 +1,4 @@ +-r shared.txt +/opt/app/onap/dependencies/common +-r /opt/app/onap/dependencies/artifact-manager/requirements/docker.txt +/opt/app/onap/dependencies/artifact-manager
\ No newline at end of file diff --git a/ms/py-executor/requirements/local.txt b/ms/py-executor/requirements/local.txt new file mode 100644 index 000000000..74cc76efa --- /dev/null +++ b/ms/py-executor/requirements/local.txt @@ -0,0 +1,4 @@ +-r shared.txt +../../py-modules/common +-r ../../artifact-manager/requirements/local.txt +../artifact-manager
\ No newline at end of file diff --git a/ms/py-executor/requirements.txt b/ms/py-executor/requirements/shared.txt index 14b4c29a0..228320120 100644 --- a/ms/py-executor/requirements.txt +++ b/ms/py-executor/requirements/shared.txt @@ -3,4 +3,4 @@ grpcio-tools==1.25.0 configparser==4.0.2 requests==2.22.0 ncclient==0.6.6 -ansible==2.8.5
\ No newline at end of file +ansible==2.8.5 diff --git a/ms/py-executor/test-requirements.txt b/ms/py-executor/requirements/test.txt index 79ed6ee95..5304eac63 100644 --- a/ms/py-executor/test-requirements.txt +++ b/ms/py-executor/requirements/test.txt @@ -1,3 +1,3 @@ pytest==5.3.1 pytest-grpc==0.7.0 --r requirements.txt
\ No newline at end of file +-r local.txt
\ No newline at end of file diff --git a/ms/py-executor/resource_resolution/README b/ms/py-executor/resource_resolution/README index a2d1542ab..222dae499 100644 --- a/ms/py-executor/resource_resolution/README +++ b/ms/py-executor/resource_resolution/README @@ -5,8 +5,8 @@ ### Insecure channel ``` -from blueprints_grpc.proto.BluePrintCommon_pb2_grpc import ActionIdentifiers, CommonHeader -from blueprints_grpc.proto.BluePrintProcessing_pb2_grpc import ExecutionServiceInput +from proto.BluePrintCommon_pb2_grpc import ActionIdentifiers, CommonHeader +from proto.BluePrintProcessing_pb2_grpc import ExecutionServiceInput from resource_resolution.client import Client as ResourceResolutionClient @@ -43,8 +43,8 @@ if __name__ == "__main__": ### Secure channel ``` -from blueprints_grpc.proto.BluePrintCommon_pb2_grpc import ActionIdentifiers, CommonHeader -from blueprints_grpc.proto.BluePrintProcessing_pb2_grpc import ExecutionServiceInput +from proto.BluePrintCommon_pb2_grpc import ActionIdentifiers, CommonHeader +from proto.BluePrintProcessing_pb2_grpc import ExecutionServiceInput from resource_resolution.client import Client as ResourceResolutionClient diff --git a/ms/py-executor/resource_resolution/client.py b/ms/py-executor/resource_resolution/client.py index 913b0ed66..89087745c 100644 --- a/ms/py-executor/resource_resolution/client.py +++ b/ms/py-executor/resource_resolution/client.py @@ -12,14 +12,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. """ -from logging import getLogger, Logger +from logging import Logger, getLogger from types import TracebackType from typing import Iterable, List, Optional, Type from grpc import Channel, insecure_channel, secure_channel, ssl_channel_credentials - -from blueprints_grpc.proto.BluePrintProcessing_pb2 import ExecutionServiceInput, ExecutionServiceOutput -from blueprints_grpc.proto.BluePrintProcessing_pb2_grpc import BluePrintProcessingServiceStub +from proto.BluePrintProcessing_pb2 import ExecutionServiceInput, ExecutionServiceOutput +from proto.BluePrintProcessing_pb2_grpc import BluePrintProcessingServiceStub class Client: diff --git a/ms/py-executor/server.py b/ms/py-executor/server.py index f506e9446..7f6537011 100644 --- a/ms/py-executor/server.py +++ b/ms/py-executor/server.py @@ -15,16 +15,20 @@ # See the License for the specific language governing permissions and # limitations under the License. -from builtins import KeyboardInterrupt -from concurrent import futures import logging +import os import time -import grpc +from builtins import KeyboardInterrupt +from concurrent import futures from pathlib import Path, PurePath -from blueprints_grpc import BluePrintProcessing_pb2_grpc -from blueprints_grpc.request_header_validator_interceptor import RequestHeaderValidatorInterceptor + +import grpc +from manager.servicer import ArtifactManagerServicer +from proto.BluePrintManagement_pb2_grpc import add_BluePrintManagementServiceServicer_to_server + +from blueprints_grpc import BluePrintProcessing_pb2_grpc, ScriptExecutorConfiguration from blueprints_grpc.blueprint_processing_server import BluePrintProcessingServer -from blueprints_grpc import ScriptExecutorConfiguration +from blueprints_grpc.request_header_validator_interceptor import RequestHeaderValidatorInterceptor logger = logging.getLogger("Server") @@ -53,7 +57,9 @@ def serve(configuration: ScriptExecutorConfiguration): # create server server = grpc.server(futures.ThreadPoolExecutor(max_workers=int(maxWorkers))) BluePrintProcessing_pb2_grpc.add_BluePrintProcessingServiceServicer_to_server( - BluePrintProcessingServer(configuration), server) + BluePrintProcessingServer(configuration), server + ) + add_BluePrintManagementServiceServicer_to_server(ArtifactManagerServicer(), server) # add secure port using credentials server.add_secure_port('[::]:' + port, server_credentials) @@ -68,7 +74,9 @@ def serve(configuration: ScriptExecutorConfiguration): server = grpc.server(futures.ThreadPoolExecutor(max_workers=int(maxWorkers)), interceptors=(header_validator,)) BluePrintProcessing_pb2_grpc.add_BluePrintProcessingServiceServicer_to_server( - BluePrintProcessingServer(configuration), server) + BluePrintProcessingServer(configuration), server + ) + add_BluePrintManagementServiceServicer_to_server(ArtifactManagerServicer(), server) server.add_insecure_port('[::]:' + port) server.start() @@ -83,7 +91,10 @@ def serve(configuration: ScriptExecutorConfiguration): if __name__ == '__main__': - config_file = str(PurePath(Path().absolute())) + '/configuration.ini' + default_configuration_file = str(PurePath(Path().absolute(), "../../configuration.ini")) + supplied_configuration_file = os.environ.get("CONFIGURATION") + config_file = str(os.path.expanduser(Path(supplied_configuration_file or default_configuration_file))) + configuration = ScriptExecutorConfiguration(config_file) logging_formater = '%(asctime)s - %(name)s - %(threadName)s - %(levelname)s - %(message)s' logging.basicConfig(filename=configuration.script_executor_property('logFile'), diff --git a/ms/py-executor/tox.ini b/ms/py-executor/tox.ini index 8cf1776ba..d722ed45d 100644 --- a/ms/py-executor/tox.ini +++ b/ms/py-executor/tox.ini @@ -3,9 +3,9 @@ envlist=py37,py38 skipsdist=True [testenv] setenv = - CONFIGURATION = configuration-local.ini + CONFIGURATION = {toxinidir}/../configuration-local.ini deps = - -rtest-requirements.txt + -rrequirements/test.txt commands = pytest resource_resolution/ [testenv:codelint] deps = @@ -18,8 +18,8 @@ commands = flake8 --doctest --docstring-convention google --max-line-length 120 [testenv:coverage] basepython = python3.7 setenv = - CONFIGURATION = configuration-local.ini + CONFIGURATION = {toxinidir}/../configuration-local.ini deps = - -rtest-requirements.txt + -rrequirements/test.txt pytest-cov commands = pytest --cov=manager --cov=resource_resolution --cov-fail-under=60 --cov-config={toxinidir}/.coveragerc resource_resolution/ |