diff --git a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/OspfsettingsController.php b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/OspfsettingsController.php index ab971af24..b81d126cd 100644 --- a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/OspfsettingsController.php +++ b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/OspfsettingsController.php @@ -37,6 +37,31 @@ class OspfsettingsController extends ApiMutableModelControllerBase protected static $internalModelName = 'ospf'; protected static $internalModelClass = '\OPNsense\Quagga\OSPF'; + public function searchNeighborAction() + { + return $this->searchBase('neighbors.neighbor'); + } + + public function getNeighborAction($uuid = null) + { + return $this->getBase('neighbor', 'neighbors.neighbor', $uuid); + } + + public function addNeighborAction() + { + return $this->addBase('neighbor', 'neighbors.neighbor'); + } + + public function delNeighborAction($uuid) + { + return $this->delBase('neighbors.neighbor', $uuid); + } + + public function setNeighborAction($uuid) + { + return $this->setBase('neighbor', 'neighbors.neighbor', $uuid); + } + public function searchNetworkAction() { return $this->searchBase('networks.network'); @@ -117,6 +142,10 @@ class OspfsettingsController extends ApiMutableModelControllerBase { return $this->setBase('routemap', 'routemaps.routemap', $uuid); } + public function toggleNeighborAction($uuid) + { + return $this->toggleBase('neighbors.neighbor', $uuid); + } public function toggleNetworkAction($uuid) { return $this->toggleBase('networks.network', $uuid); diff --git a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/OspfController.php b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/OspfController.php index 584c5da00..434767c47 100644 --- a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/OspfController.php +++ b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/OspfController.php @@ -34,6 +34,9 @@ class OspfController extends \OPNsense\Base\IndexController { $this->view->generalForm = $this->getForm("ospf"); + $this->view->formDialogEditOSPFNeighbor = $this->getForm("dialogEditOSPFNeighbor"); + $this->view->formGridEditOSPFNeighbor = $this->getFormGrid("dialogEditOSPFNeighbor"); + $this->view->formDialogEditNetwork = $this->getForm("dialogEditOSPFNetwork"); $this->view->formGridEditNetwork = $this->getFormGrid("dialogEditOSPFNetwork"); diff --git a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditOSPFNeighbor.xml b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditOSPFNeighbor.xml new file mode 100644 index 000000000..ebb004765 --- /dev/null +++ b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditOSPFNeighbor.xml @@ -0,0 +1,36 @@ +
+ + neighbor.enabled + + checkbox + + 6em + boolean + rowtoggle + + + + neighbor.description + + text + Optional description for the neighbor. + + + neighbor.address + + text + Specify the IP address of the OSPF neighbor. + + + neighbor.pollinterval + + text + The poll-interval specifies the rate for sending hello packets to neighbors that are not active. When the configured neighbor is discovered, hello packets will be sent at the rate of the hello-interval. The default poll-interval is 60 seconds. + + + neighbor.priority + + text + The priority is used to for the Designated Router (DR) election on non-broadcast multi-access networks. + +
diff --git a/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/OSPF.xml b/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/OSPF.xml index f303a35be..646ece657 100644 --- a/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/OSPF.xml +++ b/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/OSPF.xml @@ -103,6 +103,30 @@ + + + + 1 + Y + + + N + +
+ Y +
+ + N + 1 + 65535 + + + N + 0 + 255 + + + diff --git a/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/ospf.volt b/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/ospf.volt index 3cbbddce5..036c55fb2 100644 --- a/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/ospf.volt +++ b/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/ospf.volt @@ -51,6 +51,14 @@ POSSIBILITY OF SUCH DAMAGE. } }); + $("#{{formGridEditOSPFNeighbor['table_id']}}").UIBootgrid({ + 'search':'/api/quagga/ospfsettings/search_neighbor', + 'get':'/api/quagga/ospfsettings/get_neighbor/', + 'set':'/api/quagga/ospfsettings/set_neighbor/', + 'add':'/api/quagga/ospfsettings/add_neighbor/', + 'del':'/api/quagga/ospfsettings/del_neighbor/', + 'toggle':'/api/quagga/ospfsettings/toggle_neighbor/' + }); $("#{{formGridEditNetwork['table_id']}}").UIBootgrid({ 'search':'/api/quagga/ospfsettings/searchNetwork', 'get':'/api/quagga/ospfsettings/getNetwork/', @@ -122,6 +130,7 @@ POSSIBILITY OF SUCH DAMAGE.