1079

pending completion

Build # 1079

Build Type

Pull #60

travis-ci-com

Committed by

web-flow

Commit Message

<a href="https://github.com/ICRAR/daliuge/commit/<a class=hub.com/ICRAR/daliuge/commit/f180683c9ff0ec49aa6d66a1b730ec3957302f25">f180683c9<a href="https://github.com/ICRAR/daliuge/commit/f180683c9ff0ec49aa6d66a1b730ec3957302f25">">Merge </a><a class="double-link" href="https://github.com/ICRAR/daliuge/commit/<a class="double-link" href="https://github.com/ICRAR/daliuge/commit/6f3ac04edceee1bbf1f6eaa27d3587116f2b7fa3">6f3ac04ed</a>">6f3ac04ed</a><a href="https://github.com/ICRAR/daliuge/commit/f180683c9ff0ec49aa6d66a1b730ec3957302f25"> into 1dca4098b">1dca4098b</a>

Pull Request Pull Request #60: Draft: LIU-165 Service Drops

Run Details

122 of 122 new or added lines in 10 files covered. (100.0%)

7681 of 9984 relevant lines covered (76.93%)

1.54 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

79.59

/daliuge-engine/dlg/graph_loader.py

#
#    ICRAR - International Centre for Radio Astronomy Research
#    (c) UWA - The University of Western Australia, 2015
#    Copyright by UWA (in the framework of the ICRAR)
#    All rights reserved
#
#    This library is free software; you can redistribute it and/or
#    modify it under the terms of the GNU Lesser General Public
#    License as published by the Free Software Foundation; either
#    version 2.1 of the License, or (at your option) any later version.
#
#    This library is distributed in the hope that it will be useful,
#    but WITHOUT ANY WARRANTY; without even the implied warranty of
#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
#    Lesser General Public License for more details.
#
#    You should have received a copy of the GNU Lesser General Public
#    License along with this library; if not, write to the Free Software
#    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
#    MA 02111-1307  USA
#
"""
Module containing functions to load a fully-functional DROP graph from its
full JSON representation.
"""

import collections
import importlib
import logging

from . import droputils
from .apps.socket_listener import SocketListenerApp
from .ddap_protocol import DROPRel, DROPLinkType
from .drop import ContainerDROP, InMemoryDROP, \
    FileDROP, NgasDROP, LINKTYPE_NTO1_PROPERTY, \
    LINKTYPE_1TON_APPEND_METHOD, NullDROP, PlasmaDROP, PlasmaFlightDROP
from .exceptions import InvalidGraphException
from .json_drop import JsonDROP
from .common import Categories, DropType


STORAGE_TYPES = {
    Categories.MEMORY: InMemoryDROP,
    Categories.FILE: FileDROP,
    Categories.NGAS: NgasDROP,
    Categories.NULL: NullDROP,
    Categories.JSON: JsonDROP,
    Categories.PLASMA: PlasmaDROP,
    Categories.PLASMAFLIGHT: PlasmaFlightDROP
}

try:
    from .s3_drop import S3DROP
    STORAGE_TYPES[Categories.S3] = S3DROP
except ImportError:
    pass

    # Dictionary for the key used to store 1-to-N relationships between DROPs
# in the the DROP specification format
__TOMANY = {
    DROPLinkType.CONSUMER:           'consumers',
    DROPLinkType.STREAMING_CONSUMER: 'streamingConsumers',
    DROPLinkType.INPUT:              'inputs',
    DROPLinkType.STREAMING_INPUT:    'streamingInputs',
    DROPLinkType.OUTPUT:             'outputs',
    DROPLinkType.CHILD:              'children',
    DROPLinkType.PRODUCER:           'producers',
}

# Same for above, but for n-to-1 relationships
__TOONE = {
    DROPLinkType.PARENT: 'parent'
}

# Both also contain the reverse mapping
__TOMANY.update({v:k for k,v in __TOMANY.items()})
__TOONE.update({v:k for k,v in __TOONE.items()})

logger = logging.getLogger(__name__)

def addLink(linkType, lhDropSpec, rhOID, force=False):
    """
    Adds a link from `lhDropSpec` to point to `rhOID`. The link type (e.g., a
    consumer) is signaled by `linkType`.
    """

    lhOID = lhDropSpec['oid']

    # 1-N relationship
    if linkType in __TOMANY:
        rel = __TOMANY[linkType]
        if not rel in lhDropSpec:
            relList = []
            lhDropSpec[rel] = relList
        else:
            relList = lhDropSpec[rel]
        if rhOID not in relList:
            relList.append(rhOID)
        else:
            raise Exception("DROP %s is already part of %s's %s" % (rhOID, lhOID, rel))
    # N-1 relationship, overwrite existing relationship only if `force` is specified
    elif linkType in __TOONE:
        rel = __TOONE[linkType]
        if rel and not force:
            raise Exception("DROP %s already has a '%s', use 'force' to override" % (lhOID, rel))
        lhDropSpec[rel] = rhOID
    else:
        raise ValueError("Cannot handle link type %d" % (linkType))

    logger.debug("Successfully linked %s and %s via '%s'", lhOID, rhOID, rel)


def removeUnmetRelationships(dropSpecList):
    unmetRelationships = []

    # Step #1: Get all OIDs
    oids = {dropSpec['oid'] for dropSpec in dropSpecList}

    # Step #2: find unmet relationships and remove them from the original
    # DROP spec, keeping track of them
    for dropSpec in dropSpecList:

        this_oid = dropSpec['oid']
        to_delete = []

        for rel in dropSpec:

            # 1-N relationships
            if rel in __TOMANY:

                link = __TOMANY[rel]

                # Find missing OIDs in this relationship and keep track of them,
                # removing them from the current DROP spec
                missingOids = [oid for oid in dropSpec[rel] if oid not in oids]
                for oid in missingOids:
                    unmetRelationships.append(DROPRel(oid, link, this_oid))
                    dropSpec[rel].remove(oid)

                # Remove the relationship list entirely if it has no elements
                if not dropSpec[rel]:
                    to_delete.append(rel)

            # N-1 relationships
            elif rel in __TOONE:

                link = __TOONE[rel]

                # Check if OID is missing
                oid = dropSpec[rel]
                if oid in oids:
                    continue

                # Keep track of missing relationship
                unmetRelationships.append(DROPRel(oid, link, this_oid))

                # Remove relationship from current DROP spec
                to_delete.append(rel)

        for rel in to_delete:
            del dropSpec[rel]

    return unmetRelationships

def check_dropspec(n, dropSpec):
    if 'oid' not in dropSpec:
        raise InvalidGraphException("Drop #%d is missing its 'oid' argument: %r" % (n, dropSpec))
    if "type" not in dropSpec:
        raise InvalidGraphException("Drop %s is missing its 'type' argument" % (dropSpec['oid']))

def loadDropSpecs(dropSpecList):
    """
    Loads the DROP definitions from `dropSpectList`, checks that
    the DROPs are correctly specified, and return a dictionary containing
    all DROP specifications (i.e., a dictionary of dictionaries) keyed on
    the OID of each DROP. Unlike `readObjectGraph` and `readObjectGraphS`,
    this method doesn't actually create the DROPs themselves.
    """

    # Step #1: Check the DROP specs and collect them
    dropSpecs = {}
    for n,dropSpec in enumerate(dropSpecList):

        # "type" and 'oit' are mandatory
        check_dropspec(n, dropSpec)
        dropType = dropSpec["type"]

        cf = __CREATION_FUNCTIONS[dropType]
        cf(dropSpec, dryRun=True)
        dropSpecs[dropSpec['oid']] = dropSpec

    logger.debug("Found %d DROP definitions", len(dropSpecs))

    # Step #2: check relationships
    for dropSpec in dropSpecList:

        # 1-N relationships
        for rel in dropSpec:
            if rel in __TOMANY:

                # A KeyError will be raised if a oid has been specified in the
                # relationship list but doesn't exist in the list of DROPs
                for oid in dropSpec[rel]: dropSpecs[oid]

        # N-1 relationships
            elif rel in __TOONE:
                # See comment above
                dropSpecs[dropSpec[rel]]

    # Done!
    return dropSpecs

def createGraphFromDropSpecList(dropSpecList, session=None):

    logger.debug("Found %d DROP definitions", len(dropSpecList))

    # Step #1: create the actual DROPs
    drops = collections.OrderedDict()
    logger.info("Creating %d drops", len(dropSpecList))
    for n,dropSpec in enumerate(dropSpecList):

        check_dropspec(n, dropSpec)
#        dropType = dropSpec.pop("type")
        dropType = dropSpec["type"]

        cf = __CREATION_FUNCTIONS[dropType]
        drop = cf(dropSpec, session=session)
        drops[drop.oid] = drop

    # Step #2: establish relationships
    logger.info("Establishing relationships between drops")
    for dropSpec in dropSpecList:

        # 'oid' is mandatory
        oid = dropSpec['oid']
        drop = drops[oid]

        for rel in dropSpec:
            # 1-N relationships
            if rel in __TOMANY:
                link = __TOMANY[rel]
                for oid in dropSpec[rel]:
                    lhDrop = drops[oid]
                    relFuncName = LINKTYPE_1TON_APPEND_METHOD[link]
                    try:
                        relFunc = getattr(drop, relFuncName)
                    except AttributeError:
                        logger.error('%r cannot be linked to %r due to missing method "%s"', drop, lhDrop, relFuncName)
                        raise
                    relFunc(lhDrop)

            # N-1 relationships
            elif rel in __TOONE:
                link = __TOONE[rel]
                lhDrop = drops[dropSpec[rel]]
                propName = LINKTYPE_NTO1_PROPERTY[link]
                setattr(drop, propName, lhDrop)

    # We're done! Return the roots of the graph to the caller
    logger.info("Calculating graph roots")
    roots = []
    for drop in drops.values():
        if not droputils.getUpstreamObjects(drop):
            roots.append(drop)
    logger.info("%d graph roots found, bye-bye!", len(roots))

    return roots

def _createPlain(dropSpec, dryRun=False, session=None):
    oid, uid = _getIds(dropSpec)
    kwargs   = _getKwargs(dropSpec)

    # 'storage' is mandatory
    storageType = STORAGE_TYPES[dropSpec['storage']]
    if dryRun:
        return
    return storageType(oid, uid, dlg_session=session, **kwargs)

def _createContainer(dropSpec, dryRun=False, session=None):
    oid, uid = _getIds(dropSpec)
    kwargs   = _getKwargs(dropSpec)

    # if no 'container' is specified, we default to ContainerDROP
    if DropType.CONTAINER in dropSpec:
        containerTypeName = dropSpec[DropType.CONTAINER]
        parts = containerTypeName.split('.')

        # Support old "dfms..." package names (pre-Oct2017)
        if parts[0] == 'dfms':
            parts[0] = 'dlg'

        module  = importlib.import_module('.'.join(parts[:-1]))
        containerType = getattr(module, parts[-1])
    else:
        containerType = ContainerDROP

    if dryRun:
        return

    return containerType(oid, uid, dlg_session=session, **kwargs)

def _createSocket(dropSpec, dryRun=False, session=None):
    oid, uid = _getIds(dropSpec)
    kwargs   = _getKwargs(dropSpec)

    if dryRun:
        return
    return SocketListenerApp(oid, uid, dlg_session=session, **kwargs)

def _createApp(dropSpec, dryRun=False, session=None):
    oid, uid = _getIds(dropSpec)
    kwargs   = _getKwargs(dropSpec)
    del kwargs['app']

    appName = dropSpec[DropType.APP]
    parts   = appName.split('.')

    # Support old "dfms..." package names (pre-Oct2017)
    if parts[0] == 'dfms':
        parts[0] = 'dlg'

    try:
        module  = importlib.import_module('.'.join(parts[:-1]))
        appType = getattr(module, parts[-1])
    except (ImportError, AttributeError):
        raise InvalidGraphException("drop %s specifies non-existent application: %s" % (oid, appName,))

    if dryRun:
        return
    return appType(oid, uid, dlg_session=session, **kwargs)

def _createServiceApp(dropSpec, dryRun=False, session=None):
    oid, uid = _getIds(dropSpec)
    kwargs   = _getKwargs(dropSpec)
    del kwargs['app']

    appName = dropSpec['app']
    parts   = appName.split('.')

    # Support old "dfms..." package names (pre-Oct2017)
    if parts[0] == 'dfms':
        parts[0] = 'dlg'

    try:
        module  = importlib.import_module('.'.join(parts[:-1]))
        appType = getattr(module, parts[-1])
    except (ImportError, AttributeError):
        raise InvalidGraphException("drop %s specifies non-existent application: %s" % (oid, appName,))

    if dryRun:
        return
    return appType(oid, uid, dlg_session=session, **kwargs)

def _getIds(dropSpec):
    # uid is copied from oid if not explicitly given
    oid = dropSpec['oid']
    uid = oid
    if 'uid' in dropSpec:
        uid = dropSpec['uid']
    return oid, uid

def _getKwargs(dropSpec):
    kwargs = dict(dropSpec)
    del kwargs['oid']
    if 'uid' in kwargs:
        del kwargs['uid']
    return kwargs


__CREATION_FUNCTIONS = {
    DropType.PLAIN: _createPlain,
    DropType.CONTAINER: _createContainer,
    DropType.APP: _createApp,
    DropType.SERVICE_APP: _createServiceApp,
    DropType.SOCKET: _createSocket
}

1	#
2	# ICRAR - International Centre for Radio Astronomy Research
3	# (c) UWA - The University of Western Australia, 2015
4	# Copyright by UWA (in the framework of the ICRAR)
5	# All rights reserved
6	#
7	# This library is free software; you can redistribute it and/or
8	# modify it under the terms of the GNU Lesser General Public
9	# License as published by the Free Software Foundation; either
10	# version 2.1 of the License, or (at your option) any later version.
11	#
12	# This library is distributed in the hope that it will be useful,
13	# but WITHOUT ANY WARRANTY; without even the implied warranty of
14	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15	# Lesser General Public License for more details.
16	#
17	# You should have received a copy of the GNU Lesser General Public
18	# License along with this library; if not, write to the Free Software
19	# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
20	# MA 02111-1307 USA
21	#
22	"""	2✔
23	Module containing functions to load a fully-functional DROP graph from its
24	full JSON representation.
25	"""
26
27	import collections	2✔
28	import importlib	2✔
29	import logging	2✔
30
31	from . import droputils	2✔
32	from .apps.socket_listener import SocketListenerApp	2✔
33	from .ddap_protocol import DROPRel, DROPLinkType	2✔
34	from .drop import ContainerDROP, InMemoryDROP, \	2✔
35	FileDROP, NgasDROP, LINKTYPE_NTO1_PROPERTY, \
36	LINKTYPE_1TON_APPEND_METHOD, NullDROP, PlasmaDROP, PlasmaFlightDROP
37	from .exceptions import InvalidGraphException	2✔
38	from .json_drop import JsonDROP	2✔
39	from .common import Categories, DropType	2✔
40
41
42	STORAGE_TYPES = {	2✔
43	Categories.MEMORY: InMemoryDROP,
44	Categories.FILE: FileDROP,
45	Categories.NGAS: NgasDROP,
46	Categories.NULL: NullDROP,
47	Categories.JSON: JsonDROP,
48	Categories.PLASMA: PlasmaDROP,
49	Categories.PLASMAFLIGHT: PlasmaFlightDROP
50	}
51
52	try:	2✔
53	from .s3_drop import S3DROP	2✔
54	STORAGE_TYPES[Categories.S3] = S3DROP	×
55	except ImportError:	2✔
56	pass	2✔
57
58	# Dictionary for the key used to store 1-to-N relationships between DROPs
59	# in the the DROP specification format
60	__TOMANY = {	2✔
61	DROPLinkType.CONSUMER: 'consumers',
62	DROPLinkType.STREAMING_CONSUMER: 'streamingConsumers',
63	DROPLinkType.INPUT: 'inputs',
64	DROPLinkType.STREAMING_INPUT: 'streamingInputs',
65	DROPLinkType.OUTPUT: 'outputs',
66	DROPLinkType.CHILD: 'children',
67	DROPLinkType.PRODUCER: 'producers',
68	}
69
70	# Same for above, but for n-to-1 relationships
71	__TOONE = {	2✔
72	DROPLinkType.PARENT: 'parent'
73	}
74
75	# Both also contain the reverse mapping
76	__TOMANY.update({v:k for k,v in __TOMANY.items()})	2✔
77	__TOONE.update({v:k for k,v in __TOONE.items()})	2✔
78
79	logger = logging.getLogger(__name__)	2✔
80
81	def addLink(linkType, lhDropSpec, rhOID, force=False):	2✔
82	"""
83	Adds a link from `lhDropSpec` to point to `rhOID`. The link type (e.g., a
84	consumer) is signaled by `linkType`.
85	"""
86
87	lhOID = lhDropSpec['oid']	2✔
88
89	# 1-N relationship
90	if linkType in __TOMANY:	2✔
91	rel = __TOMANY[linkType]	2✔
92	if not rel in lhDropSpec:	2✔
93	relList = []	2✔
94	lhDropSpec[rel] = relList	2✔
95	else:
96	relList = lhDropSpec[rel]	×
97	if rhOID not in relList:	2✔
98	relList.append(rhOID)	2✔
99	else:
100	raise Exception("DROP %s is already part of %s's %s" % (rhOID, lhOID, rel))	×
101	# N-1 relationship, overwrite existing relationship only if `force` is specified
102	elif linkType in __TOONE:	×
103	rel = __TOONE[linkType]	×
104	if rel and not force:	×
105	raise Exception("DROP %s already has a '%s', use 'force' to override" % (lhOID, rel))	×
106	lhDropSpec[rel] = rhOID	×
107	else:
108	raise ValueError("Cannot handle link type %d" % (linkType))	×
109
110	logger.debug("Successfully linked %s and %s via '%s'", lhOID, rhOID, rel)	2✔
111
112
113	def removeUnmetRelationships(dropSpecList):	2✔
114	unmetRelationships = []	2✔
115
116	# Step #1: Get all OIDs
117	oids = {dropSpec['oid'] for dropSpec in dropSpecList}	2✔
118
119	# Step #2: find unmet relationships and remove them from the original
120	# DROP spec, keeping track of them
121	for dropSpec in dropSpecList:	2✔
122
123	this_oid = dropSpec['oid']	2✔
124	to_delete = []	2✔
125
126	for rel in dropSpec:	2✔
127
128	# 1-N relationships
129	if rel in __TOMANY:	2✔
130
131	link = __TOMANY[rel]	2✔
132
133	# Find missing OIDs in this relationship and keep track of them,
134	# removing them from the current DROP spec
135	missingOids = [oid for oid in dropSpec[rel] if oid not in oids]	2✔
136	for oid in missingOids:	2✔
137	unmetRelationships.append(DROPRel(oid, link, this_oid))	2✔
138	dropSpec[rel].remove(oid)	2✔
139
140	# Remove the relationship list entirely if it has no elements
141	if not dropSpec[rel]:	2✔
142	to_delete.append(rel)	2✔
143
144	# N-1 relationships
145	elif rel in __TOONE:	2✔
146
147	link = __TOONE[rel]	×
148
149	# Check if OID is missing
150	oid = dropSpec[rel]	×
151	if oid in oids:	×
152	continue	×
153
154	# Keep track of missing relationship
155	unmetRelationships.append(DROPRel(oid, link, this_oid))	×
156
157	# Remove relationship from current DROP spec
158	to_delete.append(rel)	×
159
160	for rel in to_delete:	2✔
161	del dropSpec[rel]	2✔
162
163	return unmetRelationships	2✔
164
165	def check_dropspec(n, dropSpec):	2✔
166	if 'oid' not in dropSpec:	2✔
167	raise InvalidGraphException("Drop #%d is missing its 'oid' argument: %r" % (n, dropSpec))	2✔
168	if "type" not in dropSpec:	2✔
169	raise InvalidGraphException("Drop %s is missing its 'type' argument" % (dropSpec['oid']))	×
170
171	def loadDropSpecs(dropSpecList):	2✔
172	"""
173	Loads the DROP definitions from `dropSpectList`, checks that
174	the DROPs are correctly specified, and return a dictionary containing
175	all DROP specifications (i.e., a dictionary of dictionaries) keyed on
176	the OID of each DROP. Unlike `readObjectGraph` and `readObjectGraphS`,
177	this method doesn't actually create the DROPs themselves.
178	"""
179
180	# Step #1: Check the DROP specs and collect them
181	dropSpecs = {}	2✔
182	for n,dropSpec in enumerate(dropSpecList):	2✔
183
184	# "type" and 'oit' are mandatory
185	check_dropspec(n, dropSpec)	2✔
186	dropType = dropSpec["type"]	2✔
187
188	cf = __CREATION_FUNCTIONS[dropType]	2✔
189	cf(dropSpec, dryRun=True)	2✔
190	dropSpecs[dropSpec['oid']] = dropSpec	2✔
191
192	logger.debug("Found %d DROP definitions", len(dropSpecs))	2✔
193
194	# Step #2: check relationships
195	for dropSpec in dropSpecList:	2✔
196
197	# 1-N relationships
198	for rel in dropSpec:	2✔
199	if rel in __TOMANY:	2✔
200
201	# A KeyError will be raised if a oid has been specified in the
202	# relationship list but doesn't exist in the list of DROPs
203	for oid in dropSpec[rel]: dropSpecs[oid]	2✔
204
205	# N-1 relationships
206	elif rel in __TOONE:	2✔
207	# See comment above
208	dropSpecs[dropSpec[rel]]	×
209
210	# Done!
211	return dropSpecs	2✔
212
213	def createGraphFromDropSpecList(dropSpecList, session=None):	2✔
214
215	logger.debug("Found %d DROP definitions", len(dropSpecList))	2✔
216
217	# Step #1: create the actual DROPs
218	drops = collections.OrderedDict()	2✔
219	logger.info("Creating %d drops", len(dropSpecList))	2✔
220	for n,dropSpec in enumerate(dropSpecList):	2✔
221
222	check_dropspec(n, dropSpec)	2✔
223	# dropType = dropSpec.pop("type")
224	dropType = dropSpec["type"]	2✔
225
226	cf = __CREATION_FUNCTIONS[dropType]	2✔
227	drop = cf(dropSpec, session=session)	2✔
228	drops[drop.oid] = drop	2✔
229
230	# Step #2: establish relationships
231	logger.info("Establishing relationships between drops")	2✔
232	for dropSpec in dropSpecList:	2✔
233
234	# 'oid' is mandatory
235	oid = dropSpec['oid']	2✔
236	drop = drops[oid]	2✔
237
238	for rel in dropSpec:	2✔
239	# 1-N relationships
240	if rel in __TOMANY:	2✔
241	link = __TOMANY[rel]	2✔
242	for oid in dropSpec[rel]:	2✔
243	lhDrop = drops[oid]	2✔
244	relFuncName = LINKTYPE_1TON_APPEND_METHOD[link]	2✔
245	try:	2✔
246	relFunc = getattr(drop, relFuncName)	2✔
247	except AttributeError:	×
248	logger.error('%r cannot be linked to %r due to missing method "%s"', drop, lhDrop, relFuncName)	×
249	raise	×
250	relFunc(lhDrop)	2✔
251
252	# N-1 relationships
253	elif rel in __TOONE:	2✔
254	link = __TOONE[rel]	×
255	lhDrop = drops[dropSpec[rel]]	×
256	propName = LINKTYPE_NTO1_PROPERTY[link]	×
257	setattr(drop, propName, lhDrop)	×
258
259	# We're done! Return the roots of the graph to the caller
260	logger.info("Calculating graph roots")	2✔
261	roots = []	2✔
262	for drop in drops.values():	2✔
263	if not droputils.getUpstreamObjects(drop):	2✔
264	roots.append(drop)	2✔
265	logger.info("%d graph roots found, bye-bye!", len(roots))	2✔
266
267	return roots	2✔
268
269	def _createPlain(dropSpec, dryRun=False, session=None):	2✔
270	oid, uid = _getIds(dropSpec)	2✔
271	kwargs = _getKwargs(dropSpec)	2✔
272
273	# 'storage' is mandatory
274	storageType = STORAGE_TYPES[dropSpec['storage']]	2✔
275	if dryRun:	2✔
276	return	2✔
277	return storageType(oid, uid, dlg_session=session, **kwargs)	2✔
278
279	def _createContainer(dropSpec, dryRun=False, session=None):	2✔
280	oid, uid = _getIds(dropSpec)	2✔
281	kwargs = _getKwargs(dropSpec)	2✔
282
283	# if no 'container' is specified, we default to ContainerDROP
284	if DropType.CONTAINER in dropSpec:	2✔
285	containerTypeName = dropSpec[DropType.CONTAINER]	2✔
286	parts = containerTypeName.split('.')	2✔
287
288	# Support old "dfms..." package names (pre-Oct2017)
289	if parts[0] == 'dfms':	2✔
290	parts[0] = 'dlg'	×
291
292	module = importlib.import_module('.'.join(parts[:-1]))	2✔
293	containerType = getattr(module, parts[-1])	2✔
294	else:
295	containerType = ContainerDROP	2✔
296
297	if dryRun:	2✔
298	return	2✔
299
300	return containerType(oid, uid, dlg_session=session, **kwargs)	2✔
301
302	def _createSocket(dropSpec, dryRun=False, session=None):	2✔
303	oid, uid = _getIds(dropSpec)	2✔
304	kwargs = _getKwargs(dropSpec)	2✔
305
306	if dryRun:	2✔
307	return	2✔
308	return SocketListenerApp(oid, uid, dlg_session=session, **kwargs)	2✔
309
310	def _createApp(dropSpec, dryRun=False, session=None):	2✔
311	oid, uid = _getIds(dropSpec)	2✔
312	kwargs = _getKwargs(dropSpec)	2✔
313	del kwargs['app']	2✔
314
315	appName = dropSpec[DropType.APP]	2✔
316	parts = appName.split('.')	2✔
317
318	# Support old "dfms..." package names (pre-Oct2017)
319	if parts[0] == 'dfms':	2✔
320	parts[0] = 'dlg'	2✔
321
322	try:	2✔
323	module = importlib.import_module('.'.join(parts[:-1]))	2✔
324	appType = getattr(module, parts[-1])	2✔
325	except (ImportError, AttributeError):	2✔
326	raise InvalidGraphException("drop %s specifies non-existent application: %s" % (oid, appName,))	2✔
327
328	if dryRun:	2✔
329	return	2✔
330	return appType(oid, uid, dlg_session=session, **kwargs)	2✔
331
332	def _createServiceApp(dropSpec, dryRun=False, session=None):	2✔
333	oid, uid = _getIds(dropSpec)	×
334	kwargs = _getKwargs(dropSpec)	×
335	del kwargs['app']	×
336
337	appName = dropSpec['app']	×
338	parts = appName.split('.')	×
339
340	# Support old "dfms..." package names (pre-Oct2017)
341	if parts[0] == 'dfms':	×
342	parts[0] = 'dlg'	×
343
344	try:	×
345	module = importlib.import_module('.'.join(parts[:-1]))	×
346	appType = getattr(module, parts[-1])	×
347	except (ImportError, AttributeError):	×
348	raise InvalidGraphException("drop %s specifies non-existent application: %s" % (oid, appName,))	×
349
350	if dryRun:	×
351	return	×
352	return appType(oid, uid, dlg_session=session, **kwargs)	×
353
354	def _getIds(dropSpec):	2✔
355	# uid is copied from oid if not explicitly given
356	oid = dropSpec['oid']	2✔
357	uid = oid	2✔
358	if 'uid' in dropSpec:	2✔
359	uid = dropSpec['uid']	2✔
360	return oid, uid	2✔
361
362	def _getKwargs(dropSpec):	2✔
363	kwargs = dict(dropSpec)	2✔
364	del kwargs['oid']	2✔
365	if 'uid' in kwargs:	2✔
366	del kwargs['uid']	2✔
367	return kwargs	2✔
368
369
370	__CREATION_FUNCTIONS = {	2✔
371	DropType.PLAIN: _createPlain,
372	DropType.CONTAINER: _createContainer,
373	DropType.APP: _createApp,
374	DropType.SERVICE_APP: _createServiceApp,
375	DropType.SOCKET: _createSocket
376	}

ICRAR / daliuge / 1079

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous