commit b645ce9cf7e1299f68ff35abc3557188d755a2c5
author Matteo Scandolo <teo@onlab.us> Mon Apr 18 09:18:43 2016 -0700
committer Matteo Scandolo <teo@onlab.us> Mon Apr 18 09:18:43 2016 -0700
tree 61a976713a00d68081fec98124d1ac966c6456b3
parent b0207baf8883bf0a5f108dcc368b6aeac1c227ad

Added vRouter to tests setup

xos/tests/api/helpers/subscriber.py

diff --git a/xos/tests/api/helpers/subscriber.py b/xos/tests/api/helpers/subscriber.py
index c4fcbf1..4ede030 100644
--- a/xos/tests/api/helpers/subscriber.py
+++ b/xos/tests/api/helpers/subscriber.py
@@ -82,19 +82,20 @@
     subscriber = CordSubscriberRoot(name='Test Subscriber 1', id=1)
     subscriber.save()
 
-    # address pools
-    ap_vsg = AddressPool()
-    ap_vsg.name = 'addresses_vsg'
-    ap_vsg.addresses = '10.168.0.0/24'
-    ap_vsg.gateway_ip = '10.168.0.1'
-    ap_vsg.gateway_mac = '02:42:0a:a8:00:01'
-    ap_vsg.save()
-
     # vRouter service
     vrouter_service = VRouterService()
     vrouter_service.name = 'service_vrouter'
     vrouter_service.save()
 
+    # address pools
+    ap_vsg = AddressPool()
+    ap_vsg.service = vrouter_service
+    ap_vsg.name = 'addresses_vsg'
+    ap_vsg.addresses = '10.168.0.0'
+    ap_vsg.gateway_ip = '10.168.0.1'
+    ap_vsg.gateway_mac = '02:42:0a:a8:00:01'
+    ap_vsg.save()
+
     print 'vRouter created'
 
     # Site

xos/tests/api/hooks.py

diff --git a/xos/tests/api/hooks.py b/xos/tests/api/hooks.py
index 228658f..ebe18f1 100644
--- a/xos/tests/api/hooks.py
+++ b/xos/tests/api/hooks.py
@@ -51,6 +51,9 @@
     for s in NetworkSlice.objects.all():
         s.delete(purge=True)
 
+    for s in AddressPool.objects.all():
+        s.delete(purge=True)
+
     # print 'DB Cleaned'
 
 
@@ -70,13 +73,22 @@
     subscriber = CordSubscriberRoot(name='Test Subscriber 1', id=1)
     subscriber.save()
 
+    # vRouter service
+    vrouter_service = VRouterService()
+    vrouter_service.name = 'service_vrouter'
+    vrouter_service.save()
+
     # address pools
     ap_vsg = AddressPool()
-    ap_vsg.addresses = '10.168.0.0/24'
+    ap_vsg.service = vrouter_service
+    ap_vsg.name = 'addresses_vsg'
+    ap_vsg.addresses = '10.168.0.0'
     ap_vsg.gateway_ip = '10.168.0.1'
     ap_vsg.gateway_mac = '02:42:0a:a8:00:01'
     ap_vsg.save()
 
+    print 'vRouter created'
+
     # Site
     site = Site.objects.get(name='MySite')