Skip to content
Snippets Groups Projects
Commit fd912243 authored by Manuel Kieweg's avatar Manuel Kieweg
Browse files

resolve conflict

parents 18f46026 5e53f43f
No related branches found
No related tags found
9 merge requests!246Develop,!245Develop into Master,!244Master into develop2 into master,!219Draft: Testing,!214Test pipelines,!195DO NOT MERGE 2,!194DO NOT MERGE! just for testing,!147Commit-Confirm Mechanic for PND,!138Develop
......@@ -3,7 +3,7 @@ module code.fbi.h-da.de/cocsn/gosdn
go 1.14
require (
code.fbi.h-da.de/cocsn/yang-models v0.0.6
code.fbi.h-da.de/cocsn/yang-models v0.0.7
github.com/aristanetworks/goarista v0.0.0-20201120222254-94a892eb0c6a
github.com/golang/protobuf v1.5.0
github.com/google/gnxi v0.0.0-20201221102247-c26672548161
......
......@@ -16,7 +16,7 @@ import (
const unreachable = "203.0.113.10:6030"
var testAddress = "141.100.67.238:6030"
var testAddress = "141.100.70.171:6030"
var testAPIEndpoint = "http://gosdn-latest.apps.ocp.fbi.h-da.de/api"
var testUsername = "admin"
var testPassword = "arista"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment