naming fix

occi_os_api/__init__.py

@@ -37,7 +37,7 @@ which point to this function call (<module name>:function).
 # W0613:unused args
 # pylint: disable=W0613
 
-from occiosapi import wsgi
+from occi_os_api import wsgi
 
 
 #noinspection PyUnusedLocal

occi_os_api/backends/compute.py

@@ -24,9 +24,10 @@ The compute resource backend for OpenStack.
 
 import logging
 
-from occiosapi.extensions import os_mixins, os_addon
-
-from occiosapi.nova_glue import vm, storage
+from occi_os_api.extensions import os_mixins
+from occi_os_api.extensions import os_addon
+from occi_os_api.nova_glue import vm
+from occi_os_api.nova_glue import storage
 
 from occi.backend import KindBackend, ActionBackend
 from occi.extensions import infrastructure

occi_os_api/backends/network.py

@@ -26,7 +26,7 @@ Network resource backend.
 
 
 from occi import backend
-from occiosapi.nova_glue import net
+from occi_os_api.nova_glue import net
 
 
 class NetworkBackend(backend.KindBackend, backend.ActionBackend):

occi_os_api/backends/openstack.py

@@ -25,10 +25,9 @@ import random
 from occi import backend
 from occi import exceptions
 
-from occiosapi.extensions import os_addon
-
-from occiosapi.nova_glue import vm
-from occiosapi.nova_glue import security
+from occi_os_api.extensions import os_addon
+from occi_os_api.nova_glue import vm
+from occi_os_api.nova_glue import security
 
 class OsComputeBackend(backend.MixinBackend, backend.ActionBackend):
     """

occi_os_api/backends/storage.py

@@ -26,7 +26,9 @@ import uuid
 from occi import backend
 from occi import exceptions
 from occi.extensions import infrastructure
-from occiosapi.nova_glue import storage, vm
+
+from occi_os_api.nova_glue import storage
+from occi_os_api.nova_glue import vm
 
 
 class StorageBackend(backend.KindBackend, backend.ActionBackend):

occi_os_api/nova_glue/__init__.py

@@ -1,3 +1,4 @@
+# coding=utf-8
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 #

occi_os_api/nova_glue/net.py

@@ -1,3 +1,4 @@
+# coding=utf-8
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 #
@@ -25,7 +26,8 @@ from nova import network
 from nova import exception
 from nova import compute
 from nova.compute import utils
-from occiosapi.nova_glue import vm
+
+from occi_os_api.nova_glue import vm
 
 # Connect to nova :-)
 

occi_os_api/nova_glue/security.py

@@ -1,3 +1,4 @@
+# coding=utf-8
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 #

occi_os_api/nova_glue/storage.py

@@ -1,3 +1,4 @@
+# coding=utf-8
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 #
@@ -28,7 +29,7 @@ from nova.image import glance
 from occi import exceptions
 
 # Connection to the nova APIs
-from occiosapi.nova_glue import vm
+from occi_os_api.nova_glue import vm
 
 VOLUME_API = volume.API()
 

occi_os_api/nova_glue/vm.py

@@ -1,3 +1,4 @@
+# coding=utf-8
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 #
@@ -34,8 +35,8 @@ from nova.flags import FLAGS
 from occi import exceptions
 from occi.extensions import infrastructure
 
-from occiosapi.extensions import os_mixins
-from occiosapi.extensions import os_addon
+from occi_os_api.extensions import os_mixins
+from occi_os_api.extensions import os_addon
 
 import logging
 

occi_os_api/registry.py

@@ -27,10 +27,14 @@ import uuid
 from occi import registry as occi_registry
 from occi import core_model
 from occi.extensions import infrastructure
-from occiosapi.backends import openstack
-from occiosapi.extensions import os_addon
 
-from occiosapi.nova_glue import vm, storage, net
+from occi_os_api.backends import openstack
+from occi_os_api.extensions import os_addon
+
+from occi_os_api.nova_glue import vm
+from occi_os_api.nova_glue import storage
+from occi_os_api.nova_glue import net
+
 
 class OCCIRegistry(occi_registry.NonePersistentRegistry):
     """

occi_os_api/wsgi.py

@@ -34,18 +34,18 @@ from nova.compute import instance_types
 from nova.network import api
 from nova.openstack.common import cfg
 
-from occiosapi import registry
-from occiosapi.backends import compute, openstack
-from occiosapi.backends import network
-from occiosapi.backends import storage
-from occiosapi.extensions import os_mixins
-from occiosapi.extensions import os_addon
+from occi_os_api import registry
+from occi_os_api.backends import compute
+from occi_os_api.backends import openstack
+from occi_os_api.backends import network
+from occi_os_api.backends import storage
+from occi_os_api.extensions import os_mixins
+from occi_os_api.extensions import os_addon
 
 from occi import backend
 from occi import core_model
 from occi import wsgi as occi_wsgi
 from occi.extensions import infrastructure
-from occiosapi.extensions.os_mixins import UserSecurityGroupMixin
 
 LOG = logging.getLogger(__name__)
 
@@ -233,7 +233,7 @@ class OCCIApplication(occi_wsgi.Application, wsgi.Application):
 
         for group in groups:
             if group['name'] not in excld_grps:
-                sec_mix = UserSecurityGroupMixin(
+                sec_mix = os_mixins.UserSecurityGroupMixin(
                 term=group['name'],
                 scheme=sec_grp,
                 related=[os_addon.SEC_GROUP],

tests/dummy_api.py

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

tests/system_test.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+# coding=utf-8
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 #    Licensed under the Apache License, Version 2.0 (the "License");