SEBA-206 manage and report switchport state
Change-Id: I9499cb24f66b4c64125cc5c8bfd97afe9104cdb6
diff --git a/xos/synchronizer/steps/sync_fabric_port.py b/xos/synchronizer/steps/sync_fabric_port.py
index 2ccdbac..1ab0f52 100644
--- a/xos/synchronizer/steps/sync_fabric_port.py
+++ b/xos/synchronizer/steps/sync_fabric_port.py
@@ -16,8 +16,8 @@
import requests
import urllib
from requests.auth import HTTPBasicAuth
-from xossynchronizer.steps.syncstep import SyncStep, DeferredException
-from xossynchronizer.modelaccessor import FabricService, SwitchPort, PortInterface, FabricIpAddress, model_accessor
+from xossynchronizer.steps.syncstep import SyncStep
+from xossynchronizer.modelaccessor import SwitchPort, PortInterface, FabricIpAddress, model_accessor
from xosconfig import Config
from multistructlog import create_logger
@@ -26,6 +26,7 @@
log = create_logger(Config().get('logging'))
+
class SyncFabricPort(SyncStep):
provides = [SwitchPort]
observes = [SwitchPort, PortInterface, FabricIpAddress]
@@ -33,19 +34,22 @@
def sync_record(self, model):
if model.leaf_model_name == "PortInterface":
- log.info("Receivent update for PortInterface", port=model.port.portId, interface=model)
+ log.info("Received update for PortInterface", port=model.port.portId, interface=model)
return self.sync_record(model.port)
if model.leaf_model_name == "FabricIpAddress":
- log.info("Receivent update for FabricIpAddress", port=model.interface.port.portId, interface=model.interface.name, ip=model.ip)
+ log.info("Received update for FabricIpAddress",
+ port=model.interface.port.portId,
+ interface=model.interface.name,
+ ip=model.ip)
return self.sync_record(model.interface.port)
log.info("Adding port %s/%s to onos-fabric" % (model.switch.ofId, model.portId))
interfaces = []
for intf in model.interfaces.all():
i = {
- "name" : intf.name,
- "ips" : [ i.ip for i in intf.ips.all() ]
+ "name": intf.name,
+ "ips": [i.ip for i in intf.ips.all()]
}
if intf.vlanUntagged:
i["vlan-untagged"] = intf.vlanUntagged
@@ -54,7 +58,7 @@
# Send port config to onos-fabric netcfg
data = {
"ports": {
- "%s/%s" % (model.switch.ofId, model.portId) : {
+ "%s/%s" % (model.switch.ofId, model.portId): {
"interfaces": interfaces,
"hostLearning": {
"enabled": model.host_learning
@@ -80,6 +84,26 @@
except Exception:
log.info("Port %s/%s response" % (model.switch.ofId, model.portId), text=r.text)
+ # Now set the port's administrative state.
+ # TODO(smbaker): See if netcfg allows us to specify the portstate instead of using a separate REST call
+
+ url = 'http://%s:%s/onos/v1/devices/%s/portstate/%s' % (onos.rest_hostname,
+ onos.rest_port,
+ model.switch.ofId,
+ model.portId)
+ data = {"enabled": True if model.admin_state == "enabled" else False}
+ log.debug("Sending portstate %s to %s/%s" % (data, model.switch.ofId, model.portId))
+ r = requests.post(url, json=data, auth=HTTPBasicAuth(onos.rest_username, onos.rest_password))
+
+ if r.status_code != 200:
+ log.error(r.text)
+ raise Exception("Failed to set portstate %s/%s into ONOS" % (model.switch.ofId, model.portId))
+ else:
+ try:
+ log.info("Portstate %s/%s response" % (model.switch.ofId, model.portId), json=r.json())
+ except Exception:
+ log.info("Portstate %s/%s response" % (model.switch.ofId, model.portId), text=r.text)
+
def delete_netcfg_item(self, partial_url):
onos = Helpers.get_onos_fabric_service(self.model_accessor)
url = 'http://%s:%s/onos/v1/network/configuration/ports/%s' % (onos.rest_hostname, onos.rest_port, partial_url)
diff --git a/xos/synchronizer/steps/test_sync_fabric_port.py b/xos/synchronizer/steps/test_sync_fabric_port.py
index 97c93c5..234a048 100644
--- a/xos/synchronizer/steps/test_sync_fabric_port.py
+++ b/xos/synchronizer/steps/test_sync_fabric_port.py
@@ -15,17 +15,17 @@
import unittest
import urllib
import functools
-from mock import patch, call, Mock, PropertyMock
+from mock import patch, Mock
import requests_mock
-import multistructlog
-from multistructlog import create_logger
-import os, sys
+import os
+import sys
-test_path=os.path.abspath(os.path.dirname(os.path.realpath(__file__)))
+test_path = os.path.abspath(os.path.dirname(os.path.realpath(__file__)))
+
def match_json(desired, req):
- if desired!=req.json():
+ if desired != req.json():
raise Exception("Got request %s, but body is not matching" % req.url)
return False
return True
@@ -49,8 +49,8 @@
import xossynchronizer.modelaccessor
import mock_modelaccessor
- reload(mock_modelaccessor) # in case nose2 loaded it in a previous test
- reload(xossynchronizer.modelaccessor) # in case nose2 loaded it in a previous test
+ reload(mock_modelaccessor) # in case nose2 loaded it in a previous test
+ reload(xossynchronizer.modelaccessor) # in case nose2 loaded it in a previous test
from xossynchronizer.modelaccessor import model_accessor
self.model_accessor = model_accessor
@@ -111,6 +111,7 @@
port.interfaces.all.return_value = [intf1, intf2]
port.switch.ofId = "of:1234"
port.portId = "1"
+ port.admin_state = "enabled"
expected_conf = {
"ports": {
@@ -118,7 +119,7 @@
"interfaces": [
{
"name": intf1.name,
- "ips": [ ip1.ip, ip2.ip ]
+ "ips": [ip1.ip, ip2.ip]
},
{
"name": intf2.name,
@@ -137,6 +138,79 @@
status_code=200,
additional_matcher=functools.partial(match_json, expected_conf))
+ expected_activation = {"enabled": True}
+
+ m.post("http://onos-fabric:8181/onos/v1/devices/%s/portstate/%s" % (port.switch.ofId, port.portId),
+ status_code=200,
+ additional_matcher=functools.partial(match_json, expected_activation))
+
+ with patch.object(Service.objects, "get") as onos_fabric_get:
+ onos_fabric_get.return_value = self.fabric
+ self.sync_step(model_accessor=self.model_accessor).sync_record(port)
+ self.assertTrue(m.called)
+
+ @requests_mock.Mocker()
+ def test_sync_port_disabled(self, m):
+ # IPs
+ ip1 = Mock()
+ ip1.ip = "1.1.1.1/16"
+ ip1.description = "My IPv4 ip"
+ ip2 = Mock()
+ ip2.ip = "2001:0db8:85a3:0000:0000:8a2e:0370:7334/64"
+ ip2.description = "My IPv6 ip"
+ ip3 = Mock()
+ ip3.ip = "2.2.2.2/8"
+ ip3.description = "My other IPv4 ip"
+
+ intf1 = Mock()
+ intf1.name = "intf1"
+ intf1.vlanUntagged = None
+ intf1.ips.all.return_value = [ip1, ip2]
+ intf2 = Mock()
+ intf2.name = "intf2"
+ intf2.vlanUntagged = 42
+ intf2.ips.all.return_value = [ip3]
+
+ port = Mock()
+ port.id = 1
+ port.tologdict.return_value = {}
+ port.host_learning = True
+ port.interfaces.all.return_value = [intf1, intf2]
+ port.switch.ofId = "of:1234"
+ port.portId = "1"
+ port.admin_state = "disabled"
+
+ expected_conf = {
+ "ports": {
+ "%s/%s" % (port.switch.ofId, port.portId): {
+ "interfaces": [
+ {
+ "name": intf1.name,
+ "ips": [ip1.ip, ip2.ip]
+ },
+ {
+ "name": intf2.name,
+ "ips": [ip3.ip],
+ "vlan-untagged": intf2.vlanUntagged
+ }
+ ],
+ "hostLearning": {
+ "enabled": port.host_learning
+ }
+ }
+ }
+ }
+
+ m.post("http://onos-fabric:8181/onos/v1/network/configuration/",
+ status_code=200,
+ additional_matcher=functools.partial(match_json, expected_conf))
+
+ expected_activation = {"enabled": False}
+
+ m.post("http://onos-fabric:8181/onos/v1/devices/%s/portstate/%s" % (port.switch.ofId, port.portId),
+ status_code=200,
+ additional_matcher=functools.partial(match_json, expected_activation))
+
with patch.object(Service.objects, "get") as onos_fabric_get:
onos_fabric_get.return_value = self.fabric
self.sync_step(model_accessor=self.model_accessor).sync_record(port)
@@ -154,7 +228,7 @@
key = urllib.quote("of:1234/1", safe='')
m.delete("http://onos-fabric:8181/onos/v1/network/configuration/ports/%s" % key,
- status_code=204)
+ status_code=204)
with patch.object(Service.objects, "get") as onos_fabric_get:
onos_fabric_get.return_value = self.fabric
@@ -189,6 +263,10 @@
m.post("http://onos-fabric:8181/onos/v1/network/configuration/", status_code=200)
+ m.post("http://onos-fabric:8181/onos/v1/devices/%s/portstate/%s" % (interface_to_remove.port.switch.ofId,
+ interface_to_remove.port.portId),
+ status_code=200)
+
with patch.object(Service.objects, "get") as onos_fabric_get:
onos_fabric_get.return_value = self.fabric
self.sync_step(model_accessor=self.model_accessor).delete_record(interface_to_remove)
@@ -208,17 +286,22 @@
ip_to_remove = Mock()
ip_to_remove.id = 1
ip_to_remove.leaf_model_name = "FabricIpAddress"
- ip_to_remove.interface.port.interfaces.all.return_value = [intf1]
+ ip_to_remove.interface.port.interfaces.all.return_value = [intf1]
ip_to_remove.interface.port.switch.ofId = "of:1234"
ip_to_remove.interface.port.portId = "1"
ip_to_remove.interface.port.host_learning = True
m.post("http://onos-fabric:8181/onos/v1/network/configuration/", status_code=200)
+ m.post("http://onos-fabric:8181/onos/v1/devices/%s/portstate/%s" % (ip_to_remove.interface.port.switch.ofId,
+ ip_to_remove.interface.port.portId),
+ status_code=200)
+
with patch.object(Service.objects, "get") as onos_fabric_get:
onos_fabric_get.return_value = self.fabric
self.sync_step(model_accessor=self.model_accessor).delete_record(ip_to_remove)
self.assertTrue(m.called)
+
if __name__ == '__main__':
unittest.main()