Skip to content
Snippets Groups Projects
Commit f37d3357 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Context component:

- corrected imports of Method Wrappers API
parent af0ad67a
No related branches found
No related tags found
2 merge requests!54Release 2.0.0,!34Context Scalability extensions using CockroachDB + Removal of Stateful database inside Device + other
Showing
with 18 additions and 18 deletions
...@@ -54,7 +54,7 @@ rm -f $COVERAGEFILE ...@@ -54,7 +54,7 @@ rm -f $COVERAGEFILE
coverage run --rcfile=$RCFILE --append -m pytest --log-level=INFO --verbose \ coverage run --rcfile=$RCFILE --append -m pytest --log-level=INFO --verbose \
common/orm/tests/test_unitary.py \ common/orm/tests/test_unitary.py \
common/message_broker/tests/test_unitary.py \ common/message_broker/tests/test_unitary.py \
common/rpc_method_wrapper/tests/test_unitary.py common/method_wrappers/tests/test_unitary.py
coverage run --rcfile=$RCFILE --append -m pytest --log-level=INFO --verbose \ coverage run --rcfile=$RCFILE --append -m pytest --log-level=INFO --verbose \
context/tests/test_unitary.py context/tests/test_unitary.py
......
...@@ -20,7 +20,7 @@ from sqlalchemy.orm import Session, sessionmaker ...@@ -20,7 +20,7 @@ from sqlalchemy.orm import Session, sessionmaker
from sqlalchemy_cockroachdb import run_transaction from sqlalchemy_cockroachdb import run_transaction
from typing import Dict, List, Optional, Tuple from typing import Dict, List, Optional, Tuple
from common.proto.context_pb2 import Connection, ConnectionId, ConnectionIdList, ConnectionList, ServiceId from common.proto.context_pb2 import Connection, ConnectionId, ConnectionIdList, ConnectionList, ServiceId
from common.rpc_method_wrapper.ServiceExceptions import NotFoundException from common.method_wrappers.ServiceExceptions import NotFoundException
from common.tools.grpc.Tools import grpc_message_to_json_string from common.tools.grpc.Tools import grpc_message_to_json_string
from common.tools.object_factory.Connection import json_connection_id from common.tools.object_factory.Connection import json_connection_id
from .models.ConnectionModel import ConnectionEndPointModel, ConnectionModel, ConnectionSubServiceModel from .models.ConnectionModel import ConnectionEndPointModel, ConnectionModel, ConnectionSubServiceModel
......
...@@ -19,7 +19,7 @@ from sqlalchemy.orm import Session, sessionmaker ...@@ -19,7 +19,7 @@ from sqlalchemy.orm import Session, sessionmaker
from sqlalchemy_cockroachdb import run_transaction from sqlalchemy_cockroachdb import run_transaction
from typing import Dict, List, Optional, Tuple from typing import Dict, List, Optional, Tuple
from common.proto.context_pb2 import Context, ContextId, ContextIdList, ContextList from common.proto.context_pb2 import Context, ContextId, ContextIdList, ContextList
from common.rpc_method_wrapper.ServiceExceptions import NotFoundException from common.method_wrappers.ServiceExceptions import NotFoundException
from common.tools.object_factory.Context import json_context_id from common.tools.object_factory.Context import json_context_id
from .models.ContextModel import ContextModel from .models.ContextModel import ContextModel
from .uuids.Context import context_get_uuid from .uuids.Context import context_get_uuid
......
...@@ -18,7 +18,7 @@ from sqlalchemy.orm import Session, sessionmaker ...@@ -18,7 +18,7 @@ from sqlalchemy.orm import Session, sessionmaker
from sqlalchemy_cockroachdb import run_transaction from sqlalchemy_cockroachdb import run_transaction
from typing import Dict, List, Optional, Set, Tuple from typing import Dict, List, Optional, Set, Tuple
from common.proto.context_pb2 import Device, DeviceId, DeviceIdList, DeviceList from common.proto.context_pb2 import Device, DeviceId, DeviceIdList, DeviceList
from common.rpc_method_wrapper.ServiceExceptions import InvalidArgumentException, NotFoundException from common.method_wrappers.ServiceExceptions import InvalidArgumentException, NotFoundException
from common.tools.object_factory.Device import json_device_id from common.tools.object_factory.Device import json_device_id
from context.service.database.ConfigRule import compose_config_rules_data, upsert_config_rules from context.service.database.ConfigRule import compose_config_rules_data, upsert_config_rules
from .models.DeviceModel import DeviceModel from .models.DeviceModel import DeviceModel
......
...@@ -18,7 +18,7 @@ from sqlalchemy.orm import Session, sessionmaker ...@@ -18,7 +18,7 @@ from sqlalchemy.orm import Session, sessionmaker
from sqlalchemy_cockroachdb import run_transaction from sqlalchemy_cockroachdb import run_transaction
from typing import Dict, List, Optional, Set, Tuple from typing import Dict, List, Optional, Set, Tuple
from common.proto.context_pb2 import Link, LinkId, LinkIdList, LinkList from common.proto.context_pb2 import Link, LinkId, LinkIdList, LinkList
from common.rpc_method_wrapper.ServiceExceptions import NotFoundException from common.method_wrappers.ServiceExceptions import NotFoundException
from common.tools.object_factory.Link import json_link_id from common.tools.object_factory.Link import json_link_id
from .models.LinkModel import LinkModel, LinkEndPointModel from .models.LinkModel import LinkModel, LinkEndPointModel
from .models.TopologyModel import TopologyLinkModel from .models.TopologyModel import TopologyLinkModel
......
...@@ -19,7 +19,7 @@ from sqlalchemy.orm import Session, sessionmaker ...@@ -19,7 +19,7 @@ from sqlalchemy.orm import Session, sessionmaker
from sqlalchemy_cockroachdb import run_transaction from sqlalchemy_cockroachdb import run_transaction
from typing import Dict, List, Optional, Set, Tuple from typing import Dict, List, Optional, Set, Tuple
from common.proto.policy_pb2 import PolicyRule, PolicyRuleId, PolicyRuleIdList, PolicyRuleList from common.proto.policy_pb2 import PolicyRule, PolicyRuleId, PolicyRuleIdList, PolicyRuleList
from common.rpc_method_wrapper.ServiceExceptions import NotFoundException from common.method_wrappers.ServiceExceptions import NotFoundException
from common.tools.grpc.Tools import grpc_message_to_json from common.tools.grpc.Tools import grpc_message_to_json
from common.tools.object_factory.PolicyRule import json_policyrule_id from common.tools.object_factory.PolicyRule import json_policyrule_id
from context.service.database.uuids.Device import device_get_uuid from context.service.database.uuids.Device import device_get_uuid
......
...@@ -18,7 +18,7 @@ from sqlalchemy.orm import Session, sessionmaker ...@@ -18,7 +18,7 @@ from sqlalchemy.orm import Session, sessionmaker
from sqlalchemy_cockroachdb import run_transaction from sqlalchemy_cockroachdb import run_transaction
from typing import Dict, List, Optional, Tuple from typing import Dict, List, Optional, Tuple
from common.proto.context_pb2 import ContextId, Service, ServiceId, ServiceIdList, ServiceList from common.proto.context_pb2 import ContextId, Service, ServiceId, ServiceIdList, ServiceList
from common.rpc_method_wrapper.ServiceExceptions import InvalidArgumentException, NotFoundException from common.method_wrappers.ServiceExceptions import InvalidArgumentException, NotFoundException
from common.tools.object_factory.Context import json_context_id from common.tools.object_factory.Context import json_context_id
from common.tools.object_factory.Service import json_service_id from common.tools.object_factory.Service import json_service_id
from context.service.database.ConfigRule import compose_config_rules_data, upsert_config_rules from context.service.database.ConfigRule import compose_config_rules_data, upsert_config_rules
......
...@@ -19,7 +19,7 @@ from sqlalchemy.orm import Session, sessionmaker ...@@ -19,7 +19,7 @@ from sqlalchemy.orm import Session, sessionmaker
from sqlalchemy_cockroachdb import run_transaction from sqlalchemy_cockroachdb import run_transaction
from typing import Dict, List, Optional, Set, Tuple from typing import Dict, List, Optional, Set, Tuple
from common.proto.context_pb2 import ContextId, Slice, SliceId, SliceIdList, SliceList from common.proto.context_pb2 import ContextId, Slice, SliceId, SliceIdList, SliceList
from common.rpc_method_wrapper.ServiceExceptions import InvalidArgumentException, NotFoundException from common.method_wrappers.ServiceExceptions import InvalidArgumentException, NotFoundException
from common.tools.object_factory.Context import json_context_id from common.tools.object_factory.Context import json_context_id
from common.tools.object_factory.Slice import json_slice_id from common.tools.object_factory.Slice import json_slice_id
from context.service.database.ConfigRule import compose_config_rules_data, upsert_config_rules from context.service.database.ConfigRule import compose_config_rules_data, upsert_config_rules
......
...@@ -19,7 +19,7 @@ from sqlalchemy.orm import Session, sessionmaker ...@@ -19,7 +19,7 @@ from sqlalchemy.orm import Session, sessionmaker
from sqlalchemy_cockroachdb import run_transaction from sqlalchemy_cockroachdb import run_transaction
from typing import Dict, List, Optional, Tuple from typing import Dict, List, Optional, Tuple
from common.proto.context_pb2 import ContextId, Topology, TopologyId, TopologyIdList, TopologyList from common.proto.context_pb2 import ContextId, Topology, TopologyId, TopologyIdList, TopologyList
from common.rpc_method_wrapper.ServiceExceptions import NotFoundException from common.method_wrappers.ServiceExceptions import NotFoundException
from common.tools.object_factory.Context import json_context_id from common.tools.object_factory.Context import json_context_id
from common.tools.object_factory.Topology import json_topology_id from common.tools.object_factory.Topology import json_topology_id
from .models.TopologyModel import TopologyModel from .models.TopologyModel import TopologyModel
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
# limitations under the License. # limitations under the License.
from common.proto.context_pb2 import ConnectionId from common.proto.context_pb2 import ConnectionId
from common.rpc_method_wrapper.ServiceExceptions import InvalidArgumentsException from common.method_wrappers.ServiceExceptions import InvalidArgumentsException
from ._Builder import get_uuid_from_string, get_uuid_random from ._Builder import get_uuid_from_string, get_uuid_random
def connection_get_uuid( def connection_get_uuid(
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
# limitations under the License. # limitations under the License.
from common.proto.context_pb2 import ContextId from common.proto.context_pb2 import ContextId
from common.rpc_method_wrapper.ServiceExceptions import InvalidArgumentsException from common.method_wrappers.ServiceExceptions import InvalidArgumentsException
from ._Builder import get_uuid_from_string, get_uuid_random from ._Builder import get_uuid_from_string, get_uuid_random
def context_get_uuid( def context_get_uuid(
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
# limitations under the License. # limitations under the License.
from common.proto.context_pb2 import DeviceId from common.proto.context_pb2 import DeviceId
from common.rpc_method_wrapper.ServiceExceptions import InvalidArgumentsException from common.method_wrappers.ServiceExceptions import InvalidArgumentsException
from ._Builder import get_uuid_from_string, get_uuid_random from ._Builder import get_uuid_from_string, get_uuid_random
def device_get_uuid( def device_get_uuid(
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
from typing import Tuple from typing import Tuple
from common.proto.context_pb2 import EndPointId from common.proto.context_pb2 import EndPointId
from common.rpc_method_wrapper.ServiceExceptions import InvalidArgumentsException from common.method_wrappers.ServiceExceptions import InvalidArgumentsException
from ._Builder import get_uuid_from_string, get_uuid_random from ._Builder import get_uuid_from_string, get_uuid_random
from .Device import device_get_uuid from .Device import device_get_uuid
from .Topology import topology_get_uuid from .Topology import topology_get_uuid
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
# limitations under the License. # limitations under the License.
from common.proto.context_pb2 import LinkId from common.proto.context_pb2 import LinkId
from common.rpc_method_wrapper.ServiceExceptions import InvalidArgumentsException from common.method_wrappers.ServiceExceptions import InvalidArgumentsException
from ._Builder import get_uuid_from_string, get_uuid_random from ._Builder import get_uuid_from_string, get_uuid_random
def link_get_uuid( def link_get_uuid(
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
# limitations under the License. # limitations under the License.
from common.proto.policy_pb2 import PolicyRuleId from common.proto.policy_pb2 import PolicyRuleId
from common.rpc_method_wrapper.ServiceExceptions import InvalidArgumentException from common.method_wrappers.ServiceExceptions import InvalidArgumentException
from ._Builder import get_uuid_from_string, get_uuid_random from ._Builder import get_uuid_from_string, get_uuid_random
def policyrule_get_uuid( def policyrule_get_uuid(
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
from typing import Tuple from typing import Tuple
from common.proto.context_pb2 import ServiceId from common.proto.context_pb2 import ServiceId
from common.rpc_method_wrapper.ServiceExceptions import InvalidArgumentsException from common.method_wrappers.ServiceExceptions import InvalidArgumentsException
from ._Builder import get_uuid_from_string, get_uuid_random from ._Builder import get_uuid_from_string, get_uuid_random
from .Context import context_get_uuid from .Context import context_get_uuid
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
from typing import Tuple from typing import Tuple
from common.proto.context_pb2 import SliceId from common.proto.context_pb2 import SliceId
from common.rpc_method_wrapper.ServiceExceptions import InvalidArgumentsException from common.method_wrappers.ServiceExceptions import InvalidArgumentsException
from ._Builder import get_uuid_from_string, get_uuid_random from ._Builder import get_uuid_from_string, get_uuid_random
from .Context import context_get_uuid from .Context import context_get_uuid
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
from typing import Tuple from typing import Tuple
from common.proto.context_pb2 import TopologyId from common.proto.context_pb2 import TopologyId
from common.rpc_method_wrapper.ServiceExceptions import InvalidArgumentsException from common.method_wrappers.ServiceExceptions import InvalidArgumentsException
from ._Builder import get_uuid_from_string, get_uuid_random from ._Builder import get_uuid_from_string, get_uuid_random
from .Context import context_get_uuid from .Context import context_get_uuid
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment