From 3eef9fde234a4379d80e0435bac9ce650407a895 Mon Sep 17 00:00:00 2001 From: cgeoffroy Date: Thu, 3 Mar 2016 18:18:13 +0100 Subject: [PATCH] Moving emuvim into the src directory --- README.md | 8 ++++---- {emuvim => src/emuvim}/api/__init__.py | 0 {emuvim => src/emuvim}/api/zerorpcapi.py | 0 {emuvim => src/emuvim}/api/zerorpcapi_DCNetwork.py | 0 {emuvim => src/emuvim}/cli/__init__.py | 0 {emuvim => src/emuvim}/cli/compute.py | 0 {emuvim => src/emuvim}/cli/datacenter.py | 0 {emuvim => src/emuvim}/cli/monitor.py | 0 {emuvim => src/emuvim}/cli/network.py | 0 {emuvim => src/emuvim}/cli/son-emu-cli | 0 {emuvim => src/emuvim}/dcemulator/__init__.py | 0 {emuvim => src/emuvim}/dcemulator/link.py | 0 {emuvim => src/emuvim}/dcemulator/monitoring.py | 0 {emuvim => src/emuvim}/dcemulator/net.py | 0 {emuvim => src/emuvim}/dcemulator/node.py | 0 {emuvim => src/emuvim}/example_topology.py | 0 {emuvim => src/emuvim}/test/__main__.py | 0 {emuvim => src/emuvim}/test/runner.py | 0 {emuvim => src/emuvim}/test/test_api_zerorpc.py | 0 {emuvim => src/emuvim}/test/test_emulator.py | 0 20 files changed, 4 insertions(+), 4 deletions(-) rename {emuvim => src/emuvim}/api/__init__.py (100%) rename {emuvim => src/emuvim}/api/zerorpcapi.py (100%) rename {emuvim => src/emuvim}/api/zerorpcapi_DCNetwork.py (100%) rename {emuvim => src/emuvim}/cli/__init__.py (100%) rename {emuvim => src/emuvim}/cli/compute.py (100%) rename {emuvim => src/emuvim}/cli/datacenter.py (100%) rename {emuvim => src/emuvim}/cli/monitor.py (100%) rename {emuvim => src/emuvim}/cli/network.py (100%) rename {emuvim => src/emuvim}/cli/son-emu-cli (100%) rename {emuvim => src/emuvim}/dcemulator/__init__.py (100%) rename {emuvim => src/emuvim}/dcemulator/link.py (100%) rename {emuvim => src/emuvim}/dcemulator/monitoring.py (100%) rename {emuvim => src/emuvim}/dcemulator/net.py (100%) rename {emuvim => src/emuvim}/dcemulator/node.py (100%) rename {emuvim => src/emuvim}/example_topology.py (100%) rename {emuvim => src/emuvim}/test/__main__.py (100%) rename {emuvim => src/emuvim}/test/runner.py (100%) rename {emuvim => src/emuvim}/test/test_api_zerorpc.py (100%) rename {emuvim => src/emuvim}/test/test_emulator.py (100%) diff --git a/README.md b/README.md index c3fa61f..e2b6658 100755 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Contributors: * (This will be replaced / extended by a REST API later) ### Project structure -* **emuvim/** all emulator code +* **src/emuvim/** all emulator code * **api/** Data center API endpoint implementations (zerorpc, OpenStack REST, ...) * **cli/** CLI client to interact with a running emulator * **dcemulator/** Dockernet wrapper that introduces the notion of data centers and API endpoints @@ -44,10 +44,10 @@ Automatic installation is provide through Ansible playbooks. ### Run * First terminal: - * `cd ~/son-emu/emuvim` + * `cd ~/son-emu/src/emuvim` * `sudo python example_topology.py` * Second terminal: - * `cd ~/son-emu/emuvim/cli` + * `cd ~/son-emu/src/emuvim/cli` * `./son-emu-cli compute start -d datacenter1 -n vnf1` * `./son-emu-cli compute start -d datacenter1 -n vnf2` * `./son-emu-cli compute list` @@ -61,7 +61,7 @@ Automatic installation is provide through Ansible playbooks. * `./start_example_chain` sets up an example service chain, using the example docker container from `package_samples` https://github.com/sonata-nfv/packaging_samples/tree/master/VNFs ### Run Unit Tests -* `cd ~/son-emu/emuvim` +* `cd ~/son-emu/src/emuvim` * `sudo python test` or `sudo python test -v` for more outputs ### CLI diff --git a/emuvim/api/__init__.py b/src/emuvim/api/__init__.py similarity index 100% rename from emuvim/api/__init__.py rename to src/emuvim/api/__init__.py diff --git a/emuvim/api/zerorpcapi.py b/src/emuvim/api/zerorpcapi.py similarity index 100% rename from emuvim/api/zerorpcapi.py rename to src/emuvim/api/zerorpcapi.py diff --git a/emuvim/api/zerorpcapi_DCNetwork.py b/src/emuvim/api/zerorpcapi_DCNetwork.py similarity index 100% rename from emuvim/api/zerorpcapi_DCNetwork.py rename to src/emuvim/api/zerorpcapi_DCNetwork.py diff --git a/emuvim/cli/__init__.py b/src/emuvim/cli/__init__.py similarity index 100% rename from emuvim/cli/__init__.py rename to src/emuvim/cli/__init__.py diff --git a/emuvim/cli/compute.py b/src/emuvim/cli/compute.py similarity index 100% rename from emuvim/cli/compute.py rename to src/emuvim/cli/compute.py diff --git a/emuvim/cli/datacenter.py b/src/emuvim/cli/datacenter.py similarity index 100% rename from emuvim/cli/datacenter.py rename to src/emuvim/cli/datacenter.py diff --git a/emuvim/cli/monitor.py b/src/emuvim/cli/monitor.py similarity index 100% rename from emuvim/cli/monitor.py rename to src/emuvim/cli/monitor.py diff --git a/emuvim/cli/network.py b/src/emuvim/cli/network.py similarity index 100% rename from emuvim/cli/network.py rename to src/emuvim/cli/network.py diff --git a/emuvim/cli/son-emu-cli b/src/emuvim/cli/son-emu-cli similarity index 100% rename from emuvim/cli/son-emu-cli rename to src/emuvim/cli/son-emu-cli diff --git a/emuvim/dcemulator/__init__.py b/src/emuvim/dcemulator/__init__.py similarity index 100% rename from emuvim/dcemulator/__init__.py rename to src/emuvim/dcemulator/__init__.py diff --git a/emuvim/dcemulator/link.py b/src/emuvim/dcemulator/link.py similarity index 100% rename from emuvim/dcemulator/link.py rename to src/emuvim/dcemulator/link.py diff --git a/emuvim/dcemulator/monitoring.py b/src/emuvim/dcemulator/monitoring.py similarity index 100% rename from emuvim/dcemulator/monitoring.py rename to src/emuvim/dcemulator/monitoring.py diff --git a/emuvim/dcemulator/net.py b/src/emuvim/dcemulator/net.py similarity index 100% rename from emuvim/dcemulator/net.py rename to src/emuvim/dcemulator/net.py diff --git a/emuvim/dcemulator/node.py b/src/emuvim/dcemulator/node.py similarity index 100% rename from emuvim/dcemulator/node.py rename to src/emuvim/dcemulator/node.py diff --git a/emuvim/example_topology.py b/src/emuvim/example_topology.py similarity index 100% rename from emuvim/example_topology.py rename to src/emuvim/example_topology.py diff --git a/emuvim/test/__main__.py b/src/emuvim/test/__main__.py similarity index 100% rename from emuvim/test/__main__.py rename to src/emuvim/test/__main__.py diff --git a/emuvim/test/runner.py b/src/emuvim/test/runner.py similarity index 100% rename from emuvim/test/runner.py rename to src/emuvim/test/runner.py diff --git a/emuvim/test/test_api_zerorpc.py b/src/emuvim/test/test_api_zerorpc.py similarity index 100% rename from emuvim/test/test_api_zerorpc.py rename to src/emuvim/test/test_api_zerorpc.py diff --git a/emuvim/test/test_emulator.py b/src/emuvim/test/test_emulator.py similarity index 100% rename from emuvim/test/test_emulator.py rename to src/emuvim/test/test_emulator.py -- 2.25.1