diff --git a/applications/inventory-manager-netbox/main.go b/applications/inventory-manager-netbox/Main.go similarity index 73% rename from applications/inventory-manager-netbox/main.go rename to applications/inventory-manager-netbox/Main.go index 6d8ee5fca8cf720723ceb0119ba000a5e073a7af..833376fdacba0a4a314adfa0e90e28c10854a470 100644 --- a/applications/inventory-manager-netbox/main.go +++ b/applications/inventory-manager-netbox/Main.go @@ -1,22 +1,25 @@ package main import ( + "flag" "log" "time" - "code.fbi.h-da.de/danet/gosdn/api/go/gosdn/networkelement" + "code.fbi.h-da.de/danet/gosdn/applications/inventory-manager-netbox/inventoryManager" "code.fbi.h-da.de/danet/gosdn/applications/inventory-manager-netbox/netboxManager" ) +var configPathGosdn = flag.String("configGosdn", "config/config.yaml", "Pfad zur NetBox-Konfigurationsdatei") +var configPathNetbox = flag.String("configNetbox", "config/configNetbox.yaml", "Pfad zur NetBox-Konfigurationsdatei") + func main() { + var elementeFigure int + flag.Parse() for { - var elementeFigure int - var elements *networkelement.GetAllResponse - var err error //getting date from the controller. - elements, err = inventoryManager.CreateGosdnConnectionwitNetzworkElementslist() + elements, err := inventoryManager.CreateGosdnConnectionwitNetzworkElementslist(configPathGosdn) if err != nil { log.Fatalf("Fehler beim Erstellen der Controller Conenction: %v", err) } else { @@ -27,7 +30,7 @@ func main() { if len(elements.Mne) != elementeFigure { //log.Printf("Es wurden %d Elemente gefunden", len(elementss.Mne)) //take the date into Netbox - err = netboxManager.FeedNetbox(elements) + err = netboxManager.FeedNetbox(elements, configPathNetbox) if err != nil { log.Fatalf("Fehler beim Erstellen des Geräts: %v", err) } else { diff --git a/applications/inventory-manager-netbox/example.yaml b/applications/inventory-manager-netbox/example.yaml deleted file mode 100644 index 70829840307c7eb6b0c059910259ce6315ad41de..0000000000000000000000000000000000000000 --- a/applications/inventory-manager-netbox/example.yaml +++ /dev/null @@ -1,34 +0,0 @@ -ControllerAddress: "127.0.0.1:55055" -PndID: "5f20f34b-cbd0-4511-9ddc-c50cf6a3b49d" -UserName: "admin" -UserPW: "TestPassword" -AppName: "Inventory-Manager" -NetworkElements: - - Name: "kms01" - UUID: "0ff33c82-7fe1-482b-a0ca-67565806ee4b" - Address: "kms01:7030" - Username: "admin" - Password: "admin" - Tls : false - PluginID: "823aad29-69be-42f0-b279-90f2c1b6a94d" - - Name: "kms02" - UUID: "5e41c291-6121-4335-84f6-41e04b8bdaa2" - Address: "kms02:7030" - Username: "admin" - Password: "admin" - Tls : false - PluginID: "823aad29-69be-42f0-b279-90f2c1b6a94d" - - Name: "kms03" - UUID: "f80db2c0-2480-46b9-b7d1-b63f954e8227" - Address: "kms03:7030" - Username: "admin" - Password: "admin" - Tls : false - PluginID: "823aad29-69be-42f0-b279-90f2c1b6a94d" - - Name: "kms04" - UUID: "968fd594-b0e7-41f0-ba4b-de259047a933" - Address: "kms04:7030" - Username: "admin" - Password: "admin" - Tls : false - PluginID: "823aad29-69be-42f0-b279-90f2c1b6a94d" diff --git a/applications/inventory-manager-netbox/inventoryManager/inventoryManager.go b/applications/inventory-manager-netbox/inventoryManager/inventoryManager.go index 7c27be411c999d5fee3971ac3c36309581ac55c9..654355e0b5805eb730d8626a18612f9f821b5534 100644 --- a/applications/inventory-manager-netbox/inventoryManager/inventoryManager.go +++ b/applications/inventory-manager-netbox/inventoryManager/inventoryManager.go @@ -2,7 +2,7 @@ package inventoryManager import ( "context" - "flag" + //"flag" "log" "os" "time" @@ -29,10 +29,10 @@ type InventoryManager struct { } // createGosdnConnectionwitNetzworkElementslist creates a context with the given authorization token. And gives the list of network elements bag. -func CreateGosdnConnectionwitNetzworkElementslist() (*networkelement.GetAllResponse, error) { +func CreateGosdnConnectionwitNetzworkElementslist(configFile *string) (*networkelement.GetAllResponse, error) { // Configpfad aus CLI-Flag holen - configFile := flag.String("configGosdn", "config/config.yaml", "Pfad zur NetBox-Konfigurationsdatei") - flag.Parse() + //configFile := flag.String("configGosdn", "config/config.yaml", "Pfad zur NetBox-Konfigurationsdatei") + //flag.Parse() log.Printf("Config-Pfad: %s", *configFile) diff --git a/applications/inventory-manager-netbox/inventoryManager/util.go b/applications/inventory-manager-netbox/inventoryManager/util.go index 15764b4f492a61130a5ea3e35e7a3da9a08b74bc..68be5df1a6d81686269869506c5e723bd8751152 100644 --- a/applications/inventory-manager-netbox/inventoryManager/util.go +++ b/applications/inventory-manager-netbox/inventoryManager/util.go @@ -1,4 +1,4 @@ -package inventorymanager +package inventoryManager import ( "context" diff --git a/applications/inventory-manager-netbox/netboxManager/netboxManager.go b/applications/inventory-manager-netbox/netboxManager/netboxManager.go index 6db84e17211294549ea14e920add6edc591e494e..cab2dafffadef3fca6c5c4ac6f468992dd0fc870 100644 --- a/applications/inventory-manager-netbox/netboxManager/netboxManager.go +++ b/applications/inventory-manager-netbox/netboxManager/netboxManager.go @@ -212,27 +212,27 @@ func Netzworhandling(netboxURL, apiToken, api string, device map[string]interfac } } - log.Printf("Kein existierendes Gerät mit dem Namen gefunden.") + log.Printf("Kein Gerät mit dem Namen gefunden.") } log.Printf("keine ID in Antwort gefunden und kein Gerät per Namen auffindbar") return 0, nil } -func FeedNetbox(elements *networkelement.GetAllResponse) error { +func FeedNetbox(elements *networkelement.GetAllResponse, configPathNetbox *string) error { var device map[string]interface{} if elements != nil { log.Printf("Es wurden %d Elemente gefunden", len(elements.Mne)) } //gehMirNichtAufdenSack() - configFileNetboxV2 := flag.String("configNetbox", "config/configNetbox.yaml", "Pfad zur NetBox-Konfigurationsdatei") + //configPathNetbox := flag.String("configNetbox", "config/configNetbox.yaml", "Pfad zur NetBox-Konfigurationsdatei") flag.Parse() - log.Printf("Config-Pfad: %s", *configFileNetboxV2) + log.Printf("Config-Pfad: %s", *configPathNetbox) // Config Datei lesen - data, err := os.ReadFile(*configFileNetboxV2) + data, err := os.ReadFile(*configPathNetbox) if err != nil { log.Printf("Fehler beim Lesen der Konfigurationsdatei: %v", err) return err