Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 2.1.0.dev1
current_version = 2.1.0.dev2
commit = False
tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<dev>\d+))?
Expand Down
2 changes: 1 addition & 1 deletion common/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
PYTHON_SRC = 'src/main/python'

install_requires = [
"dvp-api == 1.1.0",
"dvp-api == 1.2.0.dev3",
]

with open(os.path.join(PYTHON_SRC, 'dlpx/virtualization/common/VERSION')) as version_file:
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.1.0.dev1
2.1.0.dev2
2 changes: 1 addition & 1 deletion dvp/src/main/python/dlpx/virtualization/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.1.0.dev1
2.1.0.dev2
2 changes: 1 addition & 1 deletion libs/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
version = version_file.read().strip()

install_requires = [
"dvp-api == 1.1.0",
"dvp-api == 1.2.0.dev3",
"dvp-common == {}".format(version)
]

Expand Down
2 changes: 1 addition & 1 deletion libs/src/main/python/dlpx/virtualization/libs/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.1.0.dev1
2.1.0.dev2
2 changes: 1 addition & 1 deletion platform/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
version = version_file.read().strip()

install_requires = [
"dvp-api == 1.1.0",
"dvp-api == 1.2.0.dev3",
"dvp-common == {}".format(version),
"enum34;python_version < '3.4'",
]
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.1.0.dev1
2.1.0.dev2
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@

__path__ = __import__('pkgutil').extend_path(__path__, __name__)


from dlpx.virtualization.platform.migration_id_set import *
from dlpx.virtualization.platform.validation_util import *
from dlpx.virtualization.platform.migration_helper import *
from dlpx.virtualization.platform._plugin_classes import *
from dlpx.virtualization.platform._discovery import *
from dlpx.virtualization.platform._linked import *
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,23 @@
#

# -*- coding: utf-8 -*-

"""DiscoveryOperations for the Virtualization Platform

"""
import json

from dlpx.virtualization.api import common_pb2, platform_pb2
from dlpx.virtualization.common import RemoteConnection
from dlpx.virtualization.api import common_pb2
from dlpx.virtualization.api import platform_pb2
from dlpx.virtualization.platform import validation_util as v
from dlpx.virtualization.platform.operation import Operation as Op
from dlpx.virtualization.platform.exceptions import (
IncorrectReturnTypeError, OperationNotDefinedError,
OperationAlreadyDefinedError)

IncorrectReturnTypeError, OperationAlreadyDefinedError,
OperationNotDefinedError)
from dlpx.virtualization.platform.operation import Operation as Op

__all__ = ['DiscoveryOperations']


class DiscoveryOperations(object):

def __init__(self):
self.repository_impl = None
self.source_config_impl = None
Expand All @@ -35,6 +32,7 @@ def repository_decorator(repository_impl):
self.repository_impl = v.check_function(repository_impl,
Op.DISCOVERY_REPOSITORY)
return repository_impl

return repository_decorator

def source_config(self):
Expand All @@ -44,6 +42,7 @@ def source_config_decorator(source_config_impl):
self.source_config_impl = v.check_function(
source_config_impl, Op.DISCOVERY_SOURCE_CONFIG)
return source_config_impl

return source_config_decorator

def _internal_repository(self, request):
Expand Down Expand Up @@ -76,20 +75,20 @@ def to_protobuf(repository):
raise OperationNotDefinedError(Op.DISCOVERY_REPOSITORY)

repositories = self.repository_impl(
source_connection=RemoteConnection.from_proto(request.source_connection))
source_connection=RemoteConnection.from_proto(
request.source_connection))

# Validate that this is a list of Repository objects
if not isinstance(repositories, list):
raise IncorrectReturnTypeError(
Op.DISCOVERY_REPOSITORY,
type(repositories),
[RepositoryDefinition])
raise IncorrectReturnTypeError(Op.DISCOVERY_REPOSITORY,
type(repositories),
[RepositoryDefinition])

if not all(isinstance(repo, RepositoryDefinition)
for repo in repositories):
if not all(
isinstance(repo, RepositoryDefinition)
for repo in repositories):
raise IncorrectReturnTypeError(
Op.DISCOVERY_REPOSITORY,
[type(repo) for repo in repositories],
Op.DISCOVERY_REPOSITORY, [type(repo) for repo in repositories],
[RepositoryDefinition])

repository_discovery_response = (
Expand Down Expand Up @@ -137,27 +136,29 @@ def to_protobuf(source_config):
json.loads(request.repository.parameters.json))

source_configs = self.source_config_impl(
source_connection=RemoteConnection.from_proto(request.source_connection),
source_connection=RemoteConnection.from_proto(
request.source_connection),
repository=repository_definition)

# Validate that this is a list of SourceConfigDefinition objects
if not isinstance(source_configs, list):
raise IncorrectReturnTypeError(
Op.DISCOVERY_SOURCE_CONFIG,
type(source_configs),
[SourceConfigDefinition])
raise IncorrectReturnTypeError(Op.DISCOVERY_SOURCE_CONFIG,
type(source_configs),
[SourceConfigDefinition])

if not all(isinstance(config, SourceConfigDefinition)
for config in source_configs):
if not all(
isinstance(config, SourceConfigDefinition)
for config in source_configs):
raise IncorrectReturnTypeError(
Op.DISCOVERY_SOURCE_CONFIG,
[type(config) for config in source_configs],
[SourceConfigDefinition])
[type(config)
for config in source_configs], [SourceConfigDefinition])

source_config_discovery_response = (
platform_pb2.SourceConfigDiscoveryResponse())
source_config_protobuf_list = [to_protobuf(config)
for config in source_configs]
source_config_protobuf_list = [
to_protobuf(config) for config in source_configs
]
source_config_discovery_response.return_value.source_configs.extend(
source_config_protobuf_list)
return source_config_discovery_response
Loading