Fix paths

.gitignore

@@ -13,7 +13,7 @@
 /.vagrant
 
 /build
-/test/nosetests.xml
+nosetests.xml
 lock
 
 .idea

nailgun/api/handlers.py

@@ -1,15 +1,12 @@
 # -*- coding: utf-8 -*-
 
 import json
-import logging
 
 import web
 import ipaddr
-
-import settings
+from models import Release, Cluster, Node, Role, Network
+from settings import settings
 from helpers.vlan import VlanManager
-from api.models import Release, Cluster, Node, Role, Network
-
 
 def check_client_content_type(handler):
     content_type = web.ctx.env.get("CONTENT_TYPE", "application/json")

nailgun/api/models.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-import json
-
 import web
 import ipaddr
 from sqlalchemy import Column, UniqueConstraint, Table
@@ -10,9 +8,10 @@ from sqlalchemy import create_engine
 from sqlalchemy.orm import relationship
 from sqlalchemy.ext.declarative import declarative_base
 
-import settings
-from api.fields import JSON
-from api.validators import BasicValidator
+from fields import JSON
+from settings import settings
+from validators import BasicValidator
+
 
 engine = create_engine(settings.DATABASE_ENGINE)
 Base = declarative_base()

nailgun/db.py

@@ -2,7 +2,7 @@
 
 import web
 from sqlalchemy.orm import scoped_session, sessionmaker
-from api.models import engine, Release
+from api.models import engine
 
 
 def load_db_driver(handler):

nailgun/manage.py

@@ -8,16 +8,19 @@ import logging
 import code
 
 import web
-
-import db
+from sqlalchemy.orm import scoped_session, sessionmaker
 from api.handlers import check_client_content_type
 from api.models import engine
-from sqlalchemy.orm import scoped_session, sessionmaker
+from db import load_db_driver, syncdb
 from unit_test import TestRunner
 from urls import urls
 
 logging.basicConfig(level="DEBUG")
 
+app = web.application(urls, locals())
+app.add_processor(load_db_driver)
+app.add_processor(check_client_content_type)
+
 if __name__ == "__main__":
     parser = argparse.ArgumentParser()
     subparsers = parser.add_subparsers(
@@ -49,7 +52,7 @@ if __name__ == "__main__":
 
     if params.action == "syncdb":
         logging.info("Syncing database...")
-        db.syncdb()
+        syncdb()
         logging.info("Done")
     elif params.action == "test":
         logging.info("Running tests...")

nailgun/run_tests.sh

@@ -68,7 +68,7 @@ fi
 function run_tests {
   clean
   [ -z "$noseargs" ] && test_args=nailgun || test_args="$noseargs"
-  python nailgun.py test $noseopts $test_args
+  python manage.py test $noseopts $test_args
 }
 
 run_tests || exit 1

nailgun/settings/__init__.py

@@ -0,0 +1 @@
+__author__ = 'vic'

nailgun/test/base.py

@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
+import logging
 
 import re
 import urllib2
-
 from api.urls import urls
 
+logger = logging.getLogger('helpers')
 
 class HTTPClient(object):
     def __init__(self):

nailgun/test/nosetests.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><testsuite name="nosetests" tests="23" errors="0" failures="0" skip="7"><testcase classname="test.test_handlers.TestHandlers" name="test_all_api_urls_404" time="0.699" /><testcase classname="test.test_handlers.TestHandlers" name="test_cluster_creation" time="0.997" /><testcase classname="test.test_handlers.TestHandlers" name="test_cluster_creation_pass" time="0.702" /><testcase classname="test.test_handlers.TestHandlers" name="test_cluster_node_list_update" time="1.344" /><testcase classname="test.test_handlers.TestHandlers" name="test_cluster_update" time="1.051" /><testcase classname="test.test_handlers.TestHandlers" name="test_network_create" time="0.000"><skipped type="unittest.case.SkipTest" message="obsolete"><![CDATA[SkipTest: obsolete
-]]></skipped></testcase><testcase classname="test.test_handlers.TestHandlers" name="test_node_creation" time="0.790" /><testcase classname="test.test_handlers.TestHandlers" name="test_node_creation_using_put" time="0.000"><skipped type="unittest.case.SkipTest" message="wth?"><![CDATA[SkipTest: wth?
-]]></skipped></testcase><testcase classname="test.test_handlers.TestHandlers" name="test_node_creation_with_id" time="0.697" /><testcase classname="test.test_handlers.TestHandlers" name="test_node_deletion" time="0.882" /><testcase classname="test.test_handlers.TestHandlers" name="test_node_valid_list_of_new_roles_gets_updated" time="0.883" /><testcase classname="test.test_handlers.TestHandlers" name="test_node_valid_metadata_gets_updated" time="0.958" /><testcase classname="test.test_handlers.TestHandlers" name="test_node_valid_status_gets_updated" time="0.980" /><testcase classname="test.test_handlers.TestHandlers" name="test_put_returns_400_if_interfaces_empty" time="0.000"><skipped type="unittest.case.SkipTest" message="no validation of metadata"><![CDATA[SkipTest: no validation of metadata
-]]></skipped></testcase><testcase classname="test.test_handlers.TestHandlers" name="test_put_returns_400_if_no_block_device_attr" time="0.000"><skipped type="unittest.case.SkipTest" message="no validation of metadata"><![CDATA[SkipTest: no validation of metadata
-]]></skipped></testcase><testcase classname="test.test_handlers.TestHandlers" name="test_put_returns_400_if_no_body" time="0.786" /><testcase classname="test.test_handlers.TestHandlers" name="test_put_returns_400_if_no_cpu_attr" time="0.000"><skipped type="unittest.case.SkipTest" message="no validation of metadata"><![CDATA[SkipTest: no validation of metadata
-]]></skipped></testcase><testcase classname="test.test_handlers.TestHandlers" name="test_put_returns_400_if_no_interfaces_attr" time="0.000"><skipped type="unittest.case.SkipTest" message="no validation of metadata"><![CDATA[SkipTest: no validation of metadata
-]]></skipped></testcase><testcase classname="test.test_handlers.TestHandlers" name="test_put_returns_400_if_no_memory_attr" time="0.000"><skipped type="unittest.case.SkipTest" message="no validation of metadata"><![CDATA[SkipTest: no validation of metadata
-]]></skipped></testcase><testcase classname="test.test_handlers.TestHandlers" name="test_put_returns_400_if_wrong_status" time="0.790" /><testcase classname="test.test_handlers.TestHandlers" name="test_put_returns_415_if_wrong_content_type" time="0.778" /><testcase classname="test.test_handlers.TestHandlers" name="test_release_create" time="0.823" /><testcase classname="test.test_handlers.TestHandlers" name="test_release_creation" time="0.873" /></testsuite>

nailgun/test/test_handlers.py

@@ -3,15 +3,11 @@ import unittest
 import json
 from unittest import TestCase
 from paste.fixture import TestApp
-from web import utils
-from api.urls import urls
-
 from db import syncdb, flush, dropdb
-
-from nailgun import app
 from sqlalchemy import orm
 from api.models import Cluster, Node, Release, engine
-from test.helpers import reverse
+from base import reverse
+from manage import app
 
 
 class TestHandlers(TestCase):

nailgun/unit_test.py

@@ -18,5 +18,5 @@ class TestRunner(object):
         nose.main(module=test, config=nc, argv=[
             __file__,
             "--with-xunit",
-            "--xunit-file=test/nosetests.xml"
+            "--xunit-file=nosetests.xml"
         ])