SEBA-259-1
breaking out of testLogin if in dummy mode
Change-Id: Ia8d918562b4ff31f10ba1207f1c102ba29de974f
diff --git a/Makefile b/Makefile
index aa0f08e..b470f16 100644
--- a/Makefile
+++ b/Makefile
@@ -60,9 +60,6 @@
--swagger_out=logtostderr=true:api \
api/abstract_olt_api.proto
-docker: ## build docker image
- @docker build -t sebaproject/abstract-olt:${DOCKERTAG} .
-
api: api/abstract_olt_api.pb.go api/abstract_olt_api.pb.gw.go swagger
dep: ## Get the dependencies
diff --git a/api/handler.go b/api/handler.go
index f6d4c5b..2d5c5ed 100644
--- a/api/handler.go
+++ b/api/handler.go
@@ -205,6 +205,9 @@
}
func testLogin(xosUser string, xosPassword string, xosIP net.IP, xosPort int) bool {
+ if settings.GetDummy() {
+ return true
+ }
var dummyYaml = `
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
diff --git a/client/main.go b/client/main.go
index 12697f1..ed2da71 100644
--- a/client/main.go
+++ b/client/main.go
@@ -218,7 +218,7 @@
fmt.Printf("Error when calling UpdateXOSUserPassword: %s", err)
return err
}
- log.Printf("Response from server: %s", response.GetSuccess())
+ log.Printf("Response from server: %t", response.GetSuccess())
return nil
}
diff --git a/models/serialize_test.go b/models/serialize_test.go
index aaca6ec..2db2490 100644
--- a/models/serialize_test.go
+++ b/models/serialize_test.go
@@ -36,7 +36,7 @@
clli = "TEST_CLLI"
chassisMap = models.GetChassisMap()
abstractChassis := abstract.GenerateChassis(clli, 1, 1)
- phyChassis := physical.Chassis{CLLI: clli, VCoreAddress: net.TCPAddr{IP: net.ParseIP("127.0.0.1"), Port: 1234}, Rack: 1, Shelf: 1}
+ phyChassis := physical.Chassis{CLLI: clli, XOSAddress: net.TCPAddr{IP: net.ParseIP("127.0.0.1"), Port: 1234}, Rack: 1, Shelf: 1}
chassisHolder := &models.ChassisHolder{AbstractChassis: abstractChassis, PhysicalChassis: phyChassis}
(*chassisMap)[clli] = chassisHolder
sOlt := physical.SimpleOLT{CLLI: clli, Hostname: "slot1", Address: net.TCPAddr{IP: net.ParseIP("127.0.0.1"), Port: 1234}, Parent: &phyChassis}