Merge branch '13-neo4j' into 'develop'

Resolve "neo4j"

See merge request cocsn/gosdn!27

database/database.go

@@ -5,16 +5,21 @@ import (
 	"github.com/neo4j/neo4j-go-driver/neo4j"
 )
 
-//Database
+//Database is a database
 type Database struct {
 	driver  neo4j.Driver
 	session neo4j.Session
 }
 
+//PND is a principle network domain
+type PND struct {
+	name                 string
+	description          string
+	southboundInterfaces []string
+}
+
 //NewDatabaseClient creates a database client
 func NewDatabaseClient(uri, username, password string, encrypted bool) Database {
-	//TODO: defer close()?
-	//		probably pretty nasty since it creates copies
 	driver := createDriver(uri, username, password, encrypted)
 	session := createSession(driver)
 
@@ -54,9 +59,38 @@ func createSession(driver neo4j.Driver) neo4j.Session {
 	return session
 }
 
-//StoreNodes stores the given nodes to the database
+//StorePND stores the given principle network domain
+func (d Database) StorePND(pnd *PND) {
+	query :=
+		`
+		MERGE (pnd:PND {name: $name})
+		ON CREATE SET pnd.description = $description,
+			pnd.southboundInterfaces = $southboundInterfaces
+		`
+		//refactor map[string]interface... in own function
+	_, err := d.session.Run(
+		query, map[string]interface{}{
+			"name":                 pnd.name,
+			"description":          pnd.description,
+			"southboundInterfaces": pnd.southboundInterfaces,
+		})
+
+	if err != nil {
+		log.Info("failed storing PND into database:", err)
+	}
+
+	log.Info("successfully added PND into database")
+}
+
+//RemovePND removes the given principle network domain by id.
+func (d Database) RemovePND(id string) {}
+
+//StoreNodes stores the given nodes to the database and adds them to a
+//principle networt domain (PND). It is required for a node to belong to a PND.
 func (d Database) StoreNodes(json string) {
-	session := d.session
+	//TODO: remove this after testing and add own gRPC call for it
+	testPND := PND{name: "test_PND", description: "very, interesting", southboundInterfaces: []string{"TAPI", "RESTCONF"}}
+	d.StorePND(&testPND)
 
 	query :=
 		`
@@ -64,15 +98,21 @@ func (d Database) StoreNodes(json string) {
 		AS value
 		UNWIND value.data as d
 		MERGE (device:Device {id: d.object_id})
-		ON CREATE SET device.nativeName = d.object_data.name[0].value,
-			device.deviceType = d.object_data.name[1].value,
-			device.serialNumber = d.object_data.name[2].value,
-			device.softwareVersion = d.object_data.name[3].value,
-			device.` + "`operational-state` = d.object_data.`operational-state`"
+		ON CREATE SET device.nativeName = d.object_data.` + "`tapi-object-data`.name[0].value," + `
+			device.deviceType = d.object_data.` + "`tapi-object-data`.name[1].value," + `
+			device.serialNumber = d.object_data.` + "`tapi-object-data`.name[2].value," + `
+			device.softwareVersion = d.object_data.` + "`tapi-object-data`.name[3].value," + `
+			device.` + "`operational-state` = d.object_data.`tapi-object-data`.`operational-state`" + `
+		WITH device
+		MATCH (pnd:PND)
+		WHERE pnd.name = $pnd
+		MERGE (device)-[:BELONGS_TO]->(pnd)
+		`
 
-	_, err := session.Run(
+	_, err := d.session.Run(
 		query, map[string]interface{}{
 			"stringToAdd": json,
+			"pnd":         testPND.name,
 		})
 
 	if err != nil {
@@ -82,23 +122,54 @@ func (d Database) StoreNodes(json string) {
 	log.Info("successfully added Nodes into database")
 }
 
+//RemoveNodes removes the given nodes and their relationships
+func (d Database) RemoveNodes(json string) {}
+
+//RemoveSingleNode removes the given node and their relationship by id.
+func (d Database) RemoveSingleNode(id string) {}
+
+//StoreLinks stores the links between nodes
+func (d Database) StoreLinks(json string) {
+	query :=
+		`
+		WITH apoc.convert.fromJsonMap($stringToAdd)
+		AS value
+		UNWIND value.data as l
+		MATCH (d:Device), (d2:Device)
+		WHERE d.id = l.object_data.` + "`tapi-object-data`.`node-edge-point`[0].`node-uuid`" + `
+		AND d2.id = l.object_data.` + "`tapi-object-data`.`node-edge-point`[1].`node-uuid`" + `
+		CALL apoc.merge.relationship(d,l.object_data.` + "`tapi-object-data`.`layer-qualifier`,{},{}, d2,{})" + `
+		YIELD rel
+		RETURN rel
+		`
+
+	_, err := d.session.Run(
+		query, map[string]interface{}{
+			"stringToAdd": json,
+		})
+
+	if err != nil {
+		log.Info("failed storing Links into database:", err)
+	}
+
+	log.Info("successfully added Links into database")
+}
+
 //StoreNodeEdgePoints stores the given node edge points (interfaces)
 func (d Database) StoreNodeEdgePoints(json string) {
-	session := d.session
-
-	queryEdgePoints :=
+	query :=
 		`
 		WITH apoc.convert.fromJsonMap($stringToAdd)
 		AS value
 		UNWIND value.data as i
 		MERGE (interface:Interface {id: i.object_id})
 		ON CREATE SET interface.object_type =i.object_type,
-		interface.localId = i.object_data.name[0].value,
-		interface.location = i.object_data.name[1].value,
-		interface.` + "`containing-node` = i.object_data.`containing-node`"
+		interface.localId = i.object_data.` + "`tapi-object-data`.name[0].value," + `
+		interface.location = i.object_data.` + "`tapi-object-data`.name[1].value," + `
+		interface.` + "`containing-node` = i.object_data.`tapi-object-data`.`containing-node`"
 
-	_, err := session.Run(
-		queryEdgePoints, map[string]interface{}{
+	_, err := d.session.Run(
+		query, map[string]interface{}{
 			"stringToAdd": json,
 		})
 
@@ -106,12 +177,13 @@ func (d Database) StoreNodeEdgePoints(json string) {
 		log.Info("failed storing NodeEdgePoints into database:", err)
 	}
 
-	setNodeNodeEdgePointsRelation(session)
+	setNodeNodeEdgePointsRelation(d.session)
 
 	log.Info("successfully added NodeEdgePoints into database")
 
 }
 
+//StoreConnections stores relations between nodes
 func (d Database) StoreConnections(json string) {}
 
 //setNodeNodeEdgePointsRelation creates the database relations between "nodes" and "node edge points"
@@ -120,7 +192,7 @@ func setNodeNodeEdgePointsRelation(session neo4j.Session) {
 		`
 		MATCH (d:Device), (i:Interface)
 		WHERE d.id = i.` + "`containing-node`" + `
-		CREATE (i)-[:BELONGS_TO]->(d)
+		MERGE (i)-[:INTERFACE_OF]->(d)
 		`
 
 	_, err := session.Run(
@@ -133,6 +205,12 @@ func setNodeNodeEdgePointsRelation(session neo4j.Session) {
 	log.Info("successfully stored NodeNodeEdgePointsRelation into database")
 }
 
-//logError logs error with custom and error message
-func logError(message string, err error) {
+//Shutdown closes the connection to the database
+func (d Database) Shutdown() {
+	//TODO: add logger
+	if err := d.session.Close(); err != nil {
+	}
+
+	if err := d.driver.Close(); err != nil {
+	}
 }

restconf/client/ciena/client.go

@@ -60,7 +60,7 @@ func (c *MCPClient) GetConnections() error {
 func (c *MCPClient) GetLinks() error {
 	defer c.buffer.Reset()
 	_, err := c.client.TapiTopologyCore.GetTapiCoreContextTopologyMcpBaseTopologyLink(nil)
-	c.database.StoreConnections(c.buffer.String())
+	c.database.StoreLinks(c.buffer.String())
 	log.Debug(c.buffer.Next(25))
 	return err
 }