From 83dd82e6d2052208aef0e69ab8c66ae578d0ab5e Mon Sep 17 00:00:00 2001
From: Martin Geno <geno+dev@fireorbit.de>
Date: Sun, 29 May 2016 22:49:40 +0200
Subject: [PATCH] complete ansible alias

---
 api/aliases.go    | 12 +++++++-----
 models/aliases.go | 12 ++++++------
 models/ansible.go | 36 +++++++++++++++++++++---------------
 3 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/api/aliases.go b/api/aliases.go
index abd861b..2079139 100644
--- a/api/aliases.go
+++ b/api/aliases.go
@@ -38,11 +38,13 @@ func (api *ApiAliases) cleaner() {
 				if alias.Hostname == nodeinfo.Hostname {
 					count -= 1
 				}
-				if alias.Location.Latitude == nodeinfo.Location.Latitude {
-					count -= 1
-				}
-				if alias.Location.Longtitude == nodeinfo.Location.Longtitude {
-					count -= 1
+				if alias.Location != nil && nodeinfo.Location != nil {
+					if alias.Location.Latitude == nodeinfo.Location.Latitude {
+						count -= 1
+					}
+					if alias.Location.Longtitude == nodeinfo.Location.Longtitude {
+						count -= 1
+					}
 				}
 				/*
 					if alias.Freq24.TxPower == nodeinfo.Freq24.TxPower {
diff --git a/models/aliases.go b/models/aliases.go
index 92f3c62..2f5abe6 100644
--- a/models/aliases.go
+++ b/models/aliases.go
@@ -11,14 +11,14 @@ import (
 )
 
 type Alias struct {
-	Hostname string         `json:"hostname"`
-	Location *data.Location `json:"location"`
-	Freq24   *Frequence     `json:"freq24"`
-	Freq5    *Frequence     `json:"freq5"`
+	Hostname string         `json:"hostname,omitempty"`
+	Location *data.Location `json:"location,omitempty"`
+	Freq24   *Frequence     `json:"freq24,omitempty"`
+	Freq5    *Frequence     `json:"freq5,omitempty"`
 }
 type Frequence struct {
-	TxPower int `json:"txpower"`
-	Channel int `json:"channel"`
+	TxPower int `json:"txpower,omitempty"`
+	Channel int `json:"channel,omitempty"`
 }
 
 // Nodes struct: cache DB of Node's structs
diff --git a/models/ansible.go b/models/ansible.go
index fef859d..19255ea 100644
--- a/models/ansible.go
+++ b/models/ansible.go
@@ -8,13 +8,13 @@ type Ansible struct {
 }
 type AnsibleHostVars struct {
 	Address      string  `json:"ansible_ssh_host"`
-	Hostname     string  `json:"node_name"`
-	Channel24    int     `json:"radio24_channel"`
-	TxPower24    int     `json:"radio24_txpower"`
-	Channel5     int     `json:"radio5_channel"`
-	TxPower5     int     `json:"radio5_txpower"`
-	GeoLatitude  float64 `json:"geo_latitude"`
-	GeoLongitude float64 `json:"geo_longitude"`
+	Hostname     string  `json:"node_name,omitempty"`
+	Channel24    int     `json:"radio24_channel,omitempty"`
+	TxPower24    int     `json:"radio24_txpower,omitempty"`
+	Channel5     int     `json:"radio5_channel,omitempty"`
+	TxPower5     int     `json:"radio5_txpower,omitempty"`
+	GeoLatitude  float64 `json:"geo_latitude,omitempty"`
+	GeoLongitude float64 `json:"geo_longitude,omitempty"`
 }
 
 func GenerateAnsible(nodes *Nodes, aliases map[string]*Alias) *Ansible {
@@ -25,14 +25,20 @@ func GenerateAnsible(nodes *Nodes, aliases map[string]*Alias) *Ansible {
 			ansible.Nodes = append(ansible.Nodes, nodeid)
 
 			vars := &AnsibleHostVars{
-				Address:      node.Nodeinfo.Network.Addresses[0],
-				Hostname:     alias.Hostname,
-				Channel24:    alias.Freq24.Channel,
-				Channel5:     alias.Freq5.Channel,
-				TxPower24:    alias.Freq24.TxPower,
-				TxPower5:     alias.Freq5.TxPower,
-				GeoLatitude:  alias.Location.Latitude,
-				GeoLongitude: alias.Location.Longtitude,
+				Address:  node.Nodeinfo.Network.Addresses[0],
+				Hostname: alias.Hostname,
+			}
+			if alias.Freq24 != nil {
+				vars.Channel24 = alias.Freq24.Channel
+				vars.TxPower24 = alias.Freq24.TxPower
+			}
+			if alias.Freq5 != nil {
+				vars.Channel5 = alias.Freq5.Channel
+				vars.TxPower5 = alias.Freq5.TxPower
+			}
+			if alias.Location != nil {
+				vars.GeoLatitude = alias.Location.Latitude
+				vars.GeoLongitude = alias.Location.Longtitude
 			}
 			ansible.Meta.HostVars = append(ansible.Meta.HostVars, vars)