Support for ELAN, ETREE, and VNoD Global Service
Change-Id: Iea1ee5b5b9224404a16bc9b88bc082719f75d10f
diff --git a/xos/synchronizer/invokers/invokerfactory.py b/xos/synchronizer/invokers/invokerfactory.py
index 786f99d..b3628fe 100644
--- a/xos/synchronizer/invokers/invokerfactory.py
+++ b/xos/synchronizer/invokers/invokerfactory.py
@@ -2,6 +2,9 @@
from synchronizers.metronetwork.invokers.networkmultipointtomultipointinvoker import NetworkMultipointToMultipointInvoker
from synchronizers.metronetwork.invokers.networkedgetoedgepointinvoker import NetworkEdgeToEdgePointInvoker
from synchronizers.metronetwork.invokers.networkedgetomultipointinvoker import NetworkEdgeToMultipointInvoker
+from synchronizers.metronetwork.invokers.servicespokeinvoker import ServiceSpokeInvoker
+from synchronizers.metronetwork.invokers.vnodglobalserviceinvoker import VnodGlobalServiceInvoker
+from synchronizers.metronetwork.invokers.remoteportinvoker import RemotePortInvoker
class InvokerFactory(object):
@@ -16,5 +19,11 @@
return NetworkEdgeToEdgePointInvoker()
elif isinstance(obj, NetworkEdgeToMultipointConnection):
return NetworkEdgeToMultipointInvoker()
+ elif isinstance(obj, ServiceSpoke):
+ return ServiceSpokeInvoker()
+ elif isinstance(obj, VnodGlobalService):
+ return VnodGlobalServiceInvoker()
+ elif isinstance(obj, RemotePort):
+ return RemotePortInvoker()
else:
return None
diff --git a/xos/synchronizer/invokers/networkedgetoedgepointinvoker.py b/xos/synchronizer/invokers/networkedgetoedgepointinvoker.py
index ebc4d12..2c30d79 100644
--- a/xos/synchronizer/invokers/networkedgetoedgepointinvoker.py
+++ b/xos/synchronizer/invokers/networkedgetoedgepointinvoker.py
@@ -17,10 +17,11 @@
def presave(self, obj):
# Now that the Ports are created - get a proper reference to them and update the
# src and dst fields
- uni1port = NetworkEdgePort.objects.get(pid=obj.uni1_createbuffer)
- uni2port = NetworkEdgePort.objects.get(pid=obj.uni2_createbuffer)
- obj.uni1 = uni1port
- obj.uni2 = uni2port
+ if hasattr(obj, 'uni1_createbuffer'):
+ uni1port = NetworkEdgePort.objects.get(pid=obj.uni1_createbuffer)
+ uni2port = NetworkEdgePort.objects.get(pid=obj.uni2_createbuffer)
+ obj.uni1 = uni1port
+ obj.uni2 = uni2port
# Method for handline post save semantics
# content here would be model specific but could include handling Many-to-Many relationship
diff --git a/xos/synchronizer/invokers/networkedgetomultipointinvoker.py b/xos/synchronizer/invokers/networkedgetomultipointinvoker.py
index a0b7ffd..9b8e88b 100644
--- a/xos/synchronizer/invokers/networkedgetomultipointinvoker.py
+++ b/xos/synchronizer/invokers/networkedgetomultipointinvoker.py
@@ -17,8 +17,9 @@
def presave(self, obj):
# Now that the Ports are created - get a proper reference to them and update the
# root field
- rootEdgePort = NetworkEdgePort.objects.get(pid=obj.root_createbuffer)
- obj.root = rootEdgePort
+ if hasattr(obj, 'root_createbuffer'):
+ rootEdgePort = NetworkEdgePort.objects.get(pid=obj.root_createbuffer)
+ obj.root = rootEdgePort
# Method for handline post save semantics
@@ -37,9 +38,10 @@
# called 'eps' that just containts a reference to a bunch of NetworkEdgePorts
#
#
- scratchpad = json.loads(obj.eps_createbuffer)
- eps = scratchpad['eps']
+ if hasattr(obj, 'eps_createbuffer'):
+ scratchpad = json.loads(obj.eps_createbuffer)
+ eps = scratchpad['eps']
- for ep in eps:
- port = NetworkEdgePort.objects.get(pid=ep)
- obj.eps.add(port)
+ for ep in eps:
+ port = NetworkEdgePort.objects.get(pid=ep)
+ obj.eps.add(port)
diff --git a/xos/synchronizer/invokers/networkmultipointtomultipointinvoker.py b/xos/synchronizer/invokers/networkmultipointtomultipointinvoker.py
index 78b617c..6b2ab42 100644
--- a/xos/synchronizer/invokers/networkmultipointtomultipointinvoker.py
+++ b/xos/synchronizer/invokers/networkmultipointtomultipointinvoker.py
@@ -34,9 +34,10 @@
# called 'eps' that just containts a reference to a bunch of NetworkEdgePorts
#
#
- scratchpad = json.loads(obj.eps_createbuffer)
- eps = scratchpad['eps']
+ if hasattr(obj, 'eps_createbuffer'):
+ scratchpad = json.loads(obj.eps_createbuffer)
+ eps = scratchpad['eps']
- for ep in eps:
- port = NetworkEdgePort.objects.get(pid=ep)
- obj.eps.add(port)
+ for ep in eps:
+ port = NetworkEdgePort.objects.get(pid=ep)
+ obj.eps.add(port)
diff --git a/xos/synchronizer/invokers/remoteportinvoker.py b/xos/synchronizer/invokers/remoteportinvoker.py
new file mode 100644
index 0000000..1061dc4
--- /dev/null
+++ b/xos/synchronizer/invokers/remoteportinvoker.py
@@ -0,0 +1,35 @@
+import json
+from synchronizers.metronetwork.invokers.invoker import Invoker
+from core.models import Site
+from services.metronetwork.models import NetworkEdgePort
+
+class RemotePortInvoker(Invoker):
+ def __init__(self, **args):
+ pass
+
+ # Method for handline pre save semantics
+ # content here would be model specific but could include handling Many-to-Many relationship
+ # creation - which must occur post save
+ #
+ # obj - Whatever obj was just saved
+ # returns - None - this is a pure invoke() call, return type is None
+ #
+ def presave(self, obj):
+ # Now that the Site and EdgePorts are created set the foreign keys
+ if hasattr(obj, 'sitename'):
+ site = Site.objects.get(login_base=obj.sitename)
+ obj.remoteportsite = site
+
+ if hasattr(obj, 'edgeportname'):
+ edgeport = NetworkEdgePort.objects.get(pid=obj.edgeportname)
+ obj.edgeport = edgeport
+
+ # Method for handline post save semantics
+ # content here would be model specific but could include handling Many-to-Many relationship
+ # creation - which must occur post save
+ #
+ # obj - Whatever obj was just saved
+ # returns - N/A - this is a pure invoke() call
+ #
+ def postsave(self, obj):
+ pass
\ No newline at end of file
diff --git a/xos/synchronizer/invokers/servicespokeinvoker.py b/xos/synchronizer/invokers/servicespokeinvoker.py
new file mode 100644
index 0000000..8470cf5
--- /dev/null
+++ b/xos/synchronizer/invokers/servicespokeinvoker.py
@@ -0,0 +1,37 @@
+import json
+from synchronizers.metronetwork.invokers.invoker import Invoker
+from core.models import Site
+from services.metronetwork.models import RemotePort
+
+
+class ServiceSpokeInvoker(Invoker):
+ def __init__(self, **args):
+ pass
+
+ # Method for handline pre save semantics
+ # content here would be model specific but could include handling Many-to-Many relationship
+ # creation - which must occur post save
+ #
+ # obj - Whatever obj was just saved
+ # returns - None - this is a pure invoke() call, return type is None
+ #
+ def presave(self, obj):
+ # Now that the Ports are created - get a proper reference to them and update the
+ # src and dst fields
+ if hasattr(obj, 'sitename'):
+ site = Site.objects.get(login_base=obj.sitename)
+ obj.vnodlocalsite = site
+
+ if hasattr(obj, 'remoteportname'):
+ remoteport = RemotePort.objects.get(name=obj.remoteportname)
+ obj.vnodlocalport = remoteport
+
+ # Method for handline post save semantics
+ # content here would be model specific but could include handling Many-to-Many relationship
+ # creation - which must occur post save
+ #
+ # obj - Whatever obj was just saved
+ # returns - N/A - this is a pure invoke() call
+ #
+ def postsave(self, obj):
+ pass
\ No newline at end of file
diff --git a/xos/synchronizer/invokers/vnodglobalserviceinvoker.py b/xos/synchronizer/invokers/vnodglobalserviceinvoker.py
new file mode 100644
index 0000000..a313171
--- /dev/null
+++ b/xos/synchronizer/invokers/vnodglobalserviceinvoker.py
@@ -0,0 +1,50 @@
+import json
+from synchronizers.metronetwork.invokers.invoker import Invoker
+from services.metronetwork.models import ServiceSpoke
+from services.metronetwork.models import BandwidthProfile
+from services.metronetwork.models import NetworkEdgeToEdgePointConnection
+
+class VnodGlobalServiceInvoker(Invoker):
+
+ def __init__(self, **args):
+ pass
+
+ # Method for handline pre save semantics
+ # content here would be model specific but could include handling Many-to-Many relationship
+ # creation - which must occur post save
+ #
+ # obj - Whatever obj was just saved
+ # returns - None - this is a pure invoke() call, return type is None
+ #
+ def presave(self, obj):
+
+ if hasattr(obj, 'bwpname'):
+ bwprofile = BandwidthProfile.objects.get(name=obj.bwpname)
+ obj.bandwidthProfile = bwprofile
+
+ if hasattr(obj, 'pointtopointsid'):
+ connection = NetworkEdgeToEdgePointConnection.objects.get(sid=obj.pointtopointsid)
+ obj.metronetworkpointtopoint = connection
+
+ # Method for handline post save semantics
+ # content here would be model specific but could include handling Many-to-Many relationship
+ # creation - which must occur post save
+ #
+ # obj - Whatever obj was just saved
+ # returns - N/A - this is a pure invoke() call
+ #
+ def postsave(self, obj):
+ #
+ # Ok - we need to handle the multipoint many-to-many relationships in here
+ #
+ # By design convnetion we will look for them in the 'backend_register' object field
+ # this is a json field that is general purpose - we will expect to find a JSON array
+ # called 'eps' that just containts a reference to a bunch of NetworkEdgePorts
+ #
+ if hasattr(obj, 'spokes_createbuffer'):
+ scratchpad = json.loads(obj.spokes_createbuffer)
+ spokes = scratchpad['spokes']
+
+ for spokeid in spokes:
+ spoke = ServiceSpoke.objects.get(name=spokeid)
+ obj.spokes.add(spoke)