fix bugs
diff --git a/xos/configurations/cord-pod/cord-vtn-vsg.yaml b/xos/configurations/cord-pod/cord-vtn-vsg.yaml
index e145a4e..d696d98 100644
--- a/xos/configurations/cord-pod/cord-vtn-vsg.yaml
+++ b/xos/configurations/cord-pod/cord-vtn-vsg.yaml
@@ -41,8 +41,8 @@
service_vsg:
type: tosca.nodes.VSGService
requirements:
- - vbng_tenant:
- node: service_vbng
+ - vrouter_tenant:
+ node: service_vrouter
relationship: tosca.relationships.TenantOfService
properties:
view_url: /admin/cord/vsgservice/$id$/
@@ -61,10 +61,10 @@
properties:
view_url: /admin/cord/vrouterservice/$id$/
requirements:
- addresses_vsg:
+ - addresses_vsg:
node: addresses_vsg
relationship: tosca.relationships.ProvidesAddresses
- addresses_service1:
+ - addresses_service1:
node: addresses_service1
relationship: tosca.relationships.ProvidesAddresses
diff --git a/xos/services/cord/models.py b/xos/services/cord/models.py
index 7cd20cb..2460ec7 100644
--- a/xos/services/cord/models.py
+++ b/xos/services/cord/models.py
@@ -8,7 +8,7 @@
from operator import itemgetter, attrgetter, methodcaller
from core.models import Tag
from core.models.service import LeastLoadedNodeScheduler
-from services.vrouter import VRouterService, VRouterTenant
+from services.vrouter.models import VRouterService, VRouterTenant
import traceback
from xos.exceptions import *
from xos.config import Config
diff --git a/xos/services/vrouter/models.py b/xos/services/vrouter/models.py
index d7d7387..ab9c90e 100644
--- a/xos/services/vrouter/models.py
+++ b/xos/services/vrouter/models.py
@@ -63,7 +63,7 @@
return t
-VRouterService.setup_simple_attributes()
+#VRouterService.setup_simple_attributes()
class VRouterTenant(Tenant):
class Meta: