rename subconnetions table in order to get proper class name and consistent naming

datafiles/schema.sql

@@ -33,7 +33,7 @@ CREATE TABLE service_connections (
 );
 
 -- internal references to connections that are part of a service connection
-CREATE TABLE subconnections (
+CREATE TABLE sub_connections (
     id                      serial                      PRIMARY KEY,
     service_connection_id   integer                     NOT NULL REFERENCES service_connections(id),
     connection_id           text                        NOT NULL,

opennsa/aggregator.py

@@ -223,7 +223,7 @@ class Aggregator:
         # only works for calls where handler args is: requester, provider, security_attrs, connection_id
         # this happens to be quite a lot though
 
-        sub_connections = yield conn.subconnections.get()
+        sub_connections = yield conn.SubConnections.get()
 
         defs = []
 
@@ -359,7 +359,7 @@ class Aggregator:
                 # should probably do some sanity checks here
                 sp = service_params
                 local_link = True if link_provider_nsa == self.nsa_ else False
-                sc = database.Subconnection(provider_nsa=link_provider_nsa.urn(),
+                sc = database.SubConnection(provider_nsa=link_provider_nsa.urn(),
                                             connection_id=connection_id, local_link=local_link, revision=0, service_connection_id=conn.id, order_id=order_id,
                                             global_reservation_id=global_reservation_id, description=description,
                                             reservation_state=state.RESERVE_HELD, provision_state=state.SCHEDULED, activation_state=state.INACTIVE, lifecycle_state=state.INITIAL,

opennsa/database.py

@@ -74,12 +74,12 @@ def setupDatabase(database, user, password=None):
 # ORM Objects
 
 class ServiceConnection(DBObject):
-    HASMANY = ['subconnections']
+    HASMANY = ['SubConnections']
 
 
-class Subconnection(DBObject):
-    BELONGSTO = ['serviceconnection']
+class SubConnection(DBObject):
+    BELONGSTO = ['ServiceConnection']
 
 
-Registry.register(ServiceConnection, Subconnection)
+Registry.register(ServiceConnection, SubConnection)
 

test/test_aggregator.py

@@ -72,7 +72,7 @@ class DUDBackendTest(unittest.TestCase):
         from opennsa.backends.common import simplebackend
         # keep it simple...
         yield simplebackend.Simplebackendconnection.deleteAll()
-        yield database.Subconnection.deleteAll()
+        yield database.SubConnection.deleteAll()
         yield database.ServiceConnection.deleteAll()
 
         yield self.backend.stopService()