Merge pull request #1 from jalapeno-api-gateway/coordinates

Coordinates

arango/document-types.go

@@ -97,3 +97,11 @@ type LSNode_Edge struct {
 	To		             string						`json:"_to,omitempty"`
 	Link	             string						`json:"link,omitempty"`
 }
+
+type LSNode_Coordinates struct {
+	Key                  string						`json:"_key,omitempty"`
+	ID                   string						`json:"_id,omitempty"`
+	LsNodeKey	         string						`json:"ls_node_key,omitempty"`
+	Latitude			 float64					`json:"latitude,omitempty"`
+	Longitude	         float64					`json:"longitude,omitempty"`
+}

arango/fetch.go

@@ -15,6 +15,13 @@ func FetchLsNode(ctx context.Context, key string) LSNode {
 	return document
 }
 
+func FetchLsNodeCoordinates(ctx context.Context, key string) LSNode_Coordinates {
+	cursor := queryArangoDbDatabase(ctx, "FOR d IN LSNode_Coordinates FILTER d._key == \"" + key + "\" RETURN d");
+	var document LSNode_Coordinates
+	readDocument(cursor.ReadDocument(ctx, &document))
+	return document
+}
+
 func FetchLsLink(ctx context.Context, key string) LSLink {
 	cursor := queryArangoDbDatabase(ctx, "FOR d IN LSLink FILTER d._key == \"" + key + "\" RETURN d");
 	var document LSLink
@@ -60,6 +67,20 @@ func FetchAllLsNodes(ctx context.Context) []LSNode {
 	return documents
 }
 
+func FetchAllLsNodeCoordinates(ctx context.Context) []LSNode_Coordinates {
+	cursor := queryArangoDbDatabase(ctx, "FOR d IN LSNode_Coordinates RETURN d");
+	var documents []LSNode_Coordinates
+	for {
+		var document LSNode_Coordinates
+		if (!readDocument(cursor.ReadDocument(ctx, &document))) {
+			break
+		}
+		documents = append(documents, document)
+	}
+	return documents
+}
+
+
 func FetchAllLsLinks(ctx context.Context) []LSLink {
 	cursor := queryArangoDbDatabase(ctx, "FOR d IN LSLink RETURN d");
 	var documents []LSLink

model/class/class.go

@@ -8,6 +8,7 @@ const (
 	LsPrefix Class = "LSPrefix"
 	LsSrv6Sid Class = "LSSRv6SID"
 	LsNodeEdge Class = "LSNode_Edge"
+	LsNodeCoordinates Class = "LSNode_Coordinates"
 	PhysicalInterface Class = "PhysicalInterface"
 	LoopbackInterface Class = "LoopbackInterface"
 )

model/property/class-properties.go

@@ -97,6 +97,14 @@ var AllLsNodeEdgeProperties = []string{
 	Link,
 }
 
+var AllLsNodeCoordinatesProperties = []string{
+	Key,
+	Id,
+	LsNodeKey,
+	Latitude,
+	Longitude,
+}
+
 var AllPhysicalInterfaceProperties = []string{
 	DataRate,
 	PacketsSent,

model/property/property.go

@@ -40,4 +40,7 @@ const (
 	From = "From"
 	To = "To"
 	Link = "Link"
+	LsNodeKey = "LsNodeKey"
+	Latitude = "Latitude"
+	Longitude = "Longitude"
 )

model/topology/document-converters.go

@@ -25,6 +25,16 @@ func ConvertLsNode(doc arango.LSNode) LsNode {
 	}
 }
 
+func ConvertLsNodeCoordinates(doc arango.LSNode_Coordinates) LsNodeCoordinates {
+	return LsNodeCoordinates{
+		Id: doc.ID,
+		Key: doc.Key,
+		LsNodeKey: doc.LsNodeKey,
+		Latitude: doc.Latitude,
+		Longitude: doc.Longitude,
+	}
+}
+
 func ConvertLsLink(doc arango.LSLink) LsLink {
 	return LsLink{
 		Id: doc.ID,

model/topology/documents.go

@@ -21,6 +21,14 @@ type LsNode struct {
 	IsAdjRibIn	bool
 }
 
+type LsNodeCoordinates struct {
+	Id			string
+	Key			string
+	LsNodeKey	string
+	Latitude	float64
+	Longitude	float64
+}
+
 type LsLink struct {
 	Id					string
 	Key					string

model/topology/marshalling.go

@@ -6,6 +6,10 @@ func (doc LsNode) MarshalBinary() ([]byte, error) {
 	return json.Marshal(doc)
 }
 
+func (doc LsNodeCoordinates) MarshalBinary() ([]byte, error) {
+	return json.Marshal(doc)
+}
+
 func (doc LsLink) MarshalBinary() ([]byte, error) {
 	return json.Marshal(doc)
 }