From 9524ad314883db5445b27dfd2c61084a7e7329a2 Mon Sep 17 00:00:00 2001 From: cgeoffroy Date: Thu, 3 Mar 2016 18:24:15 +0100 Subject: [PATCH] Using absolute import path --- src/emuvim/__init__.py | 0 src/emuvim/cli/son_emu_cli.py | 8 ++++---- src/emuvim/dcemulator/net.py | 4 ++-- src/emuvim/example_topology.py | 2 +- src/emuvim/test/test_emulator.py | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 src/emuvim/__init__.py diff --git a/src/emuvim/__init__.py b/src/emuvim/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/emuvim/cli/son_emu_cli.py b/src/emuvim/cli/son_emu_cli.py index 61cbd43..195fe06 100755 --- a/src/emuvim/cli/son_emu_cli.py +++ b/src/emuvim/cli/son_emu_cli.py @@ -13,10 +13,10 @@ """ import sys -import compute -import network -import datacenter -import monitor +from emuvim.cli import compute +from emuvim.cli import network +from emuvim.cli import datacenter +from emuvim.cli import monitor def main(): if len(sys.argv) < 2: diff --git a/src/emuvim/dcemulator/net.py b/src/emuvim/dcemulator/net.py index 20ab33a..e01e950 100755 --- a/src/emuvim/dcemulator/net.py +++ b/src/emuvim/dcemulator/net.py @@ -14,9 +14,9 @@ from mininet.cli import CLI from mininet.log import setLogLevel, info, debug from mininet.link import TCLink, Link import networkx as nx -from monitoring import DCNetworkMonitor +from emuvim.dcemulator.monitoring import DCNetworkMonitor -from node import Datacenter, EmulatorCompute +from emuvim.dcemulator.node import Datacenter, EmulatorCompute class DCNetwork(Dockernet): diff --git a/src/emuvim/example_topology.py b/src/emuvim/example_topology.py index eba751c..a63bd7f 100755 --- a/src/emuvim/example_topology.py +++ b/src/emuvim/example_topology.py @@ -18,7 +18,7 @@ script. """ import logging from mininet.log import setLogLevel -from dcemulator.net import DCNetwork +from emuvim.dcemulator.net import DCNetwork from api.zerorpcapi import ZeroRpcApiEndpoint from api.zerorpcapi_DCNetwork import ZeroRpcApiEndpointDCNetwork diff --git a/src/emuvim/test/test_emulator.py b/src/emuvim/test/test_emulator.py index ef22a22..06e2da3 100755 --- a/src/emuvim/test/test_emulator.py +++ b/src/emuvim/test/test_emulator.py @@ -11,8 +11,8 @@ import os import time import subprocess import docker -from dcemulator.net import DCNetwork -from dcemulator.node import EmulatorCompute +from emuvim.dcemulator.net import DCNetwork +from emuvim.dcemulator.node import EmulatorCompute from mininet.node import Host, Controller, OVSSwitch, Docker from mininet.link import TCLink from mininet.topo import SingleSwitchTopo, LinearTopo -- 2.25.1