From 462146cec663543140feef3cbf45c9919b925aa3 Mon Sep 17 00:00:00 2001 From: yatuhashi kei Date: Sat, 10 Jun 2017 02:35:53 +0900 Subject: [PATCH 1/2] change app dir --- src/{mike => app}/controller/__init__.py | 0 src/{mike => app}/controller/openflow.py | 0 src/{mike => app}/lib/__init__.py | 0 src/{mike => app}/lib/mike_object.py | 0 src/{mike => app}/lib/objects/__init__.py | 0 src/{mike => app}/lib/objects/interface.py | 0 src/{mike => app}/lib/objects/link.py | 0 src/{mike => app}/lib/objects/port.py | 0 src/{mike => app}/lib/objects/switch.py | 0 src/{mike => app}/services/__init__.py | 0 src/{mike => app}/services/hub.py | 0 src/{mike => app}/services/l2sw.py | 0 src/{mike => app}/services/service.py | 0 13 files changed, 0 insertions(+), 0 deletions(-) rename src/{mike => app}/controller/__init__.py (100%) rename src/{mike => app}/controller/openflow.py (100%) rename src/{mike => app}/lib/__init__.py (100%) rename src/{mike => app}/lib/mike_object.py (100%) rename src/{mike => app}/lib/objects/__init__.py (100%) rename src/{mike => app}/lib/objects/interface.py (100%) rename src/{mike => app}/lib/objects/link.py (100%) rename src/{mike => app}/lib/objects/port.py (100%) rename src/{mike => app}/lib/objects/switch.py (100%) rename src/{mike => app}/services/__init__.py (100%) rename src/{mike => app}/services/hub.py (100%) rename src/{mike => app}/services/l2sw.py (100%) rename src/{mike => app}/services/service.py (100%) diff --git a/src/mike/controller/__init__.py b/src/app/controller/__init__.py similarity index 100% rename from src/mike/controller/__init__.py rename to src/app/controller/__init__.py diff --git a/src/mike/controller/openflow.py b/src/app/controller/openflow.py similarity index 100% rename from src/mike/controller/openflow.py rename to src/app/controller/openflow.py diff --git a/src/mike/lib/__init__.py b/src/app/lib/__init__.py similarity index 100% rename from src/mike/lib/__init__.py rename to src/app/lib/__init__.py diff --git a/src/mike/lib/mike_object.py b/src/app/lib/mike_object.py similarity index 100% rename from src/mike/lib/mike_object.py rename to src/app/lib/mike_object.py diff --git a/src/mike/lib/objects/__init__.py b/src/app/lib/objects/__init__.py similarity index 100% rename from src/mike/lib/objects/__init__.py rename to src/app/lib/objects/__init__.py diff --git a/src/mike/lib/objects/interface.py b/src/app/lib/objects/interface.py similarity index 100% rename from src/mike/lib/objects/interface.py rename to src/app/lib/objects/interface.py diff --git a/src/mike/lib/objects/link.py b/src/app/lib/objects/link.py similarity index 100% rename from src/mike/lib/objects/link.py rename to src/app/lib/objects/link.py diff --git a/src/mike/lib/objects/port.py b/src/app/lib/objects/port.py similarity index 100% rename from src/mike/lib/objects/port.py rename to src/app/lib/objects/port.py diff --git a/src/mike/lib/objects/switch.py b/src/app/lib/objects/switch.py similarity index 100% rename from src/mike/lib/objects/switch.py rename to src/app/lib/objects/switch.py diff --git a/src/mike/services/__init__.py b/src/app/services/__init__.py similarity index 100% rename from src/mike/services/__init__.py rename to src/app/services/__init__.py diff --git a/src/mike/services/hub.py b/src/app/services/hub.py similarity index 100% rename from src/mike/services/hub.py rename to src/app/services/hub.py diff --git a/src/mike/services/l2sw.py b/src/app/services/l2sw.py similarity index 100% rename from src/mike/services/l2sw.py rename to src/app/services/l2sw.py diff --git a/src/mike/services/service.py b/src/app/services/service.py similarity index 100% rename from src/mike/services/service.py rename to src/app/services/service.py From b6c194112f94a9e36f6b6f18e41ac9b875f15fa8 Mon Sep 17 00:00:00 2001 From: yatuhashi kei Date: Sat, 10 Jun 2017 02:42:51 +0900 Subject: [PATCH 2/2] change dir --- src/manage.py | 2 +- src/mike/models.py | 11 ----------- src/mike/{settings.py => setting/develop_setting.py} | 0 3 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 src/mike/models.py rename src/mike/{settings.py => setting/develop_setting.py} (100%) diff --git a/src/manage.py b/src/manage.py index d1f399e..309e6d0 100755 --- a/src/manage.py +++ b/src/manage.py @@ -3,7 +3,7 @@ import sys if __name__ == "__main__": - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "mike.settings") + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "mike.setting.develop_setting") try: from django.core.management import execute_from_command_line except ImportError: diff --git a/src/mike/models.py b/src/mike/models.py deleted file mode 100644 index 2a19f55..0000000 --- a/src/mike/models.py +++ /dev/null @@ -1,11 +0,0 @@ -# base system -from mike.lib.mike_object import UUIDObject, UUIDObjectType, MikeObject - -# n0stack objects -from mike.lib.objects.switch import Switch -from mike.lib.objects.interface import Interface -from mike.lib.objects.port import Port -from mike.lib.objects.link import Link - -# service -from mike.services.hub import ServiceHubTable diff --git a/src/mike/settings.py b/src/mike/setting/develop_setting.py similarity index 100% rename from src/mike/settings.py rename to src/mike/setting/develop_setting.py