Various minor updates

DerAndereAndi · DerAndereAndi · commit 1bba43814634 · 2024-09-10T10:33:02.000+02:00
- Update SHIP to latest dev version which support avahi reconnects
- Update usecases testhelpers to properly set remote entites device
diff --git a/go.mod b/go.mod
@@ -3,15 +3,15 @@ module github.com/enbility/eebus-go
 go 1.21.1
 
 require (
-	github.com/enbility/ship-go v0.0.0-20240904104254-04d944c4f825
+	github.com/enbility/ship-go v0.0.0-20240909200111-0d37cebbfc21
 	github.com/enbility/spine-go v0.0.0-20240907194637-0024041a4f36
 	github.com/stretchr/testify v1.9.0
 )
 
 require (
 	github.com/ahmetb/go-linq/v3 v3.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/enbility/go-avahi v0.0.0-20240829083637-9ae2ef5f5ed2 // indirect
+	github.com/enbility/go-avahi v0.0.0-20240909195612-d5de6b280d7a // indirect
 	github.com/enbility/zeroconf/v2 v2.0.0-20240827101515-f3956627c450 // indirect
 	github.com/godbus/dbus/v5 v5.1.0 // indirect
 	github.com/golanguzb70/lrucache v1.2.0 // indirect
diff --git a/go.sum b/go.sum
@@ -2,10 +2,10 @@ github.com/ahmetb/go-linq/v3 v3.2.0 h1:BEuMfp+b59io8g5wYzNoFe9pWPalRklhlhbiU3hYZ
 github.com/ahmetb/go-linq/v3 v3.2.0/go.mod h1:haQ3JfOeWK8HpVxMtHHEMPVgBKiYyQ+f1/kLZh/cj9U=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/enbility/go-avahi v0.0.0-20240829083637-9ae2ef5f5ed2 h1:voP4zFVNvVWxlV22T1EUAdZ0VlqVV1pkFLhoTTPgwbA=
-github.com/enbility/go-avahi v0.0.0-20240829083637-9ae2ef5f5ed2/go.mod h1:KJXUEgg/b4XZzS+OFfqnykHREsinuNSL/IzJ+nU43P8=
-github.com/enbility/ship-go v0.0.0-20240904104254-04d944c4f825 h1:i/n9UFYf660TyC8Y48P3MDxLaWWKRNW3pFjEOVzPzto=
-github.com/enbility/ship-go v0.0.0-20240904104254-04d944c4f825/go.mod h1:dzymc1D7BDZUTLVHVt9JRRkFLlBrlUmRKyLJvAe07Mc=
+github.com/enbility/go-avahi v0.0.0-20240909195612-d5de6b280d7a h1:foChWb8lhzqa6lWDRs6COYMdp649YlUirFP8GqoT0JQ=
+github.com/enbility/go-avahi v0.0.0-20240909195612-d5de6b280d7a/go.mod h1:H64mhYcAQUGUUnVqMdZQf93kPecH4M79xwH95Lddt3U=
+github.com/enbility/ship-go v0.0.0-20240909200111-0d37cebbfc21 h1:ZuOja5wms/Yujch+f1wQAw5ASY8mEFUpqf/j2LFrjzA=
+github.com/enbility/ship-go v0.0.0-20240909200111-0d37cebbfc21/go.mod h1:8EaCKa2WOVZ/4SpquvZStPakEarjRXQLNHhC4azvaA0=
 github.com/enbility/spine-go v0.0.0-20240907194637-0024041a4f36 h1:Y44hzp5uIYSEyBMe/zwFzlXKokgZHQ9cv2NiIF1NkZs=
 github.com/enbility/spine-go v0.0.0-20240907194637-0024041a4f36/go.mod h1:BDvhbs+XsWDGYwd8eQOzPXc8w/avVFmWKLlSKV/gx9k=
 github.com/enbility/zeroconf/v2 v2.0.0-20240827101515-f3956627c450 h1:39tnpfiV5OVfYb9sOqYmoivBzTHyNLWSYIxd9Qng1eg=
diff --git a/usecases/cem/cevc/testhelper_test.go b/usecases/cem/cevc/testhelper_test.go
@@ -193,6 +193,10 @@ func setupDevices(
 	}
 	remoteDevice.UpdateDevice(detailedData.DeviceInformation.Description)
 
+	for _, entity := range entities {
+		entity.UpdateDeviceAddress(*remoteDevice.Address())
+	}
+
 	localDevice.AddRemoteDeviceForSki(remoteSki, remoteDevice)
 
 	return remoteDevice, entities
diff --git a/usecases/cem/evcc/testhelper_test.go b/usecases/cem/evcc/testhelper_test.go
@@ -203,6 +203,10 @@ func setupDevices(
 	}
 	remoteDevice.UpdateDevice(detailedData.DeviceInformation.Description)
 
+	for _, entity := range entities {
+		entity.UpdateDeviceAddress(*remoteDevice.Address())
+	}
+
 	localDevice.AddRemoteDeviceForSki(remoteSki, remoteDevice)
 
 	return remoteDevice, mockSender, entities
diff --git a/usecases/cem/evcem/testhelper_test.go b/usecases/cem/evcem/testhelper_test.go
@@ -176,6 +176,10 @@ func setupDevices(
 	}
 	remoteDevice.UpdateDevice(detailedData.DeviceInformation.Description)
 
+	for _, entity := range entities {
+		entity.UpdateDeviceAddress(*remoteDevice.Address())
+	}
+
 	localDevice.AddRemoteDeviceForSki(remoteSki, remoteDevice)
 
 	return remoteDevice, entities
diff --git a/usecases/cem/evsecc/testhelper_test.go b/usecases/cem/evsecc/testhelper_test.go
@@ -175,6 +175,10 @@ func setupDevices(
 	}
 	remoteDevice.UpdateDevice(detailedData.DeviceInformation.Description)
 
+	for _, entity := range entities {
+		entity.UpdateDeviceAddress(*remoteDevice.Address())
+	}
+
 	localDevice.AddRemoteDeviceForSki(remoteSki, remoteDevice)
 
 	return remoteDevice, entities
diff --git a/usecases/cem/evsoc/testhelper_test.go b/usecases/cem/evsoc/testhelper_test.go
@@ -176,6 +176,10 @@ func setupDevices(
 	}
 	remoteDevice.UpdateDevice(detailedData.DeviceInformation.Description)
 
+	for _, entity := range entities {
+		entity.UpdateDeviceAddress(*remoteDevice.Address())
+	}
+
 	localDevice.AddRemoteDeviceForSki(remoteSki, remoteDevice)
 
 	return remoteDevice, entities
diff --git a/usecases/cem/opev/testhelper_test.go b/usecases/cem/opev/testhelper_test.go
@@ -195,6 +195,10 @@ func setupDevices(
 	}
 	remoteDevice.UpdateDevice(detailedData.DeviceInformation.Description)
 
+	for _, entity := range entities {
+		entity.UpdateDeviceAddress(*remoteDevice.Address())
+	}
+
 	localDevice.AddRemoteDeviceForSki(remoteSki, remoteDevice)
 
 	return remoteDevice, entities
diff --git a/usecases/cem/oscev/testhelper_test.go b/usecases/cem/oscev/testhelper_test.go
@@ -205,6 +205,10 @@ func setupDevices(
 	}
 	remoteDevice.UpdateDevice(detailedData.DeviceInformation.Description)
 
+	for _, entity := range entities {
+		entity.UpdateDeviceAddress(*remoteDevice.Address())
+	}
+
 	localDevice.AddRemoteDeviceForSki(remoteSki, remoteDevice)
 
 	return remoteDevice, entities
diff --git a/usecases/cem/vabd/testhelper_test.go b/usecases/cem/vabd/testhelper_test.go
@@ -167,6 +167,10 @@ func setupDevices(
 	}
 	remoteDevice.UpdateDevice(detailedData.DeviceInformation.Description)
 
+	for _, entity := range entities {
+		entity.UpdateDeviceAddress(*remoteDevice.Address())
+	}
+
 	localDevice.AddRemoteDeviceForSki(remoteSki, remoteDevice)
 
 	return remoteDevice, entities[0]
diff --git a/usecases/cem/vapd/testhelper_test.go b/usecases/cem/vapd/testhelper_test.go
@@ -173,6 +173,10 @@ func setupDevices(
 	}
 	remoteDevice.UpdateDevice(detailedData.DeviceInformation.Description)
 
+	for _, entity := range entities {
+		entity.UpdateDeviceAddress(*remoteDevice.Address())
+	}
+
 	localDevice.AddRemoteDeviceForSki(remoteSki, remoteDevice)
 
 	return remoteDevice, entities[0]
diff --git a/usecases/cs/lpc/testhelper_test.go b/usecases/cs/lpc/testhelper_test.go
@@ -194,6 +194,10 @@ func setupDevices(
 	}
 	remoteDevice.UpdateDevice(detailedData.DeviceInformation.Description)
 
+	for _, entity := range entities {
+		entity.UpdateDeviceAddress(*remoteDevice.Address())
+	}
+
 	localDevice.AddRemoteDeviceForSki(remoteSki, remoteDevice)
 
 	return remoteDevice, entities[0]
diff --git a/usecases/cs/lpp/testhelper_test.go b/usecases/cs/lpp/testhelper_test.go
@@ -194,6 +194,10 @@ func setupDevices(
 	}
 	remoteDevice.UpdateDevice(detailedData.DeviceInformation.Description)
 
+	for _, entity := range entities {
+		entity.UpdateDeviceAddress(*remoteDevice.Address())
+	}
+
 	localDevice.AddRemoteDeviceForSki(remoteSki, remoteDevice)
 
 	return remoteDevice, entities[0]
diff --git a/usecases/eg/lpc/testhelper_test.go b/usecases/eg/lpc/testhelper_test.go
@@ -180,6 +180,10 @@ func setupDevices(
 	}
 	remoteDevice.UpdateDevice(detailedData.DeviceInformation.Description)
 
+	for _, entity := range entities {
+		entity.UpdateDeviceAddress(*remoteDevice.Address())
+	}
+
 	localDevice.AddRemoteDeviceForSki(remoteSki, remoteDevice)
 
 	return remoteDevice, entities[0]
diff --git a/usecases/eg/lpp/testhelper_test.go b/usecases/eg/lpp/testhelper_test.go
@@ -180,6 +180,10 @@ func setupDevices(
 	}
 	remoteDevice.UpdateDevice(detailedData.DeviceInformation.Description)
 
+	for _, entity := range entities {
+		entity.UpdateDeviceAddress(*remoteDevice.Address())
+	}
+
 	localDevice.AddRemoteDeviceForSki(remoteSki, remoteDevice)
 
 	return remoteDevice, entities[0]
diff --git a/usecases/ma/mgcp/testhelper_test.go b/usecases/ma/mgcp/testhelper_test.go
@@ -172,6 +172,10 @@ func setupDevices(
 	}
 	remoteDevice.UpdateDevice(detailedData.DeviceInformation.Description)
 
+	for _, entity := range entities {
+		entity.UpdateDeviceAddress(*remoteDevice.Address())
+	}
+
 	localDevice.AddRemoteDeviceForSki(remoteSki, remoteDevice)
 
 	return remoteDevice, entities[0]
diff --git a/usecases/ma/mpc/testhelper_test.go b/usecases/ma/mpc/testhelper_test.go
@@ -166,6 +166,10 @@ func setupDevices(
 	}
 	remoteDevice.UpdateDevice(detailedData.DeviceInformation.Description)
 
+	for _, entity := range entities {
+		entity.UpdateDeviceAddress(*remoteDevice.Address())
+	}
+
 	localDevice.AddRemoteDeviceForSki(remoteSki, remoteDevice)
 
 	return remoteDevice, entities[0]
diff --git a/usecases/usecase/testhelper_test.go b/usecases/usecase/testhelper_test.go
@@ -81,6 +81,7 @@ func (s *UseCaseSuite) BeforeTest(suiteName, testName string) {
 	s.localEntity, s.remoteDevice, entities = setupDevices(s.service, s.T())
 	s.evseEntity = entities[0]
 	s.monitoredEntity = entities[1]
+	s.remoteDevice.AddEntity(s.monitoredEntity)
 
 	validActorTypes := []model.UseCaseActorType{model.UseCaseActorTypeEV}
 	validEntityTypes := []model.EntityTypeType{model.EntityTypeTypeEV}
@@ -261,6 +262,11 @@ func setupDevices(
 	if err != nil {
 		fmt.Println(err)
 	}
+	remoteDevice.UpdateDevice(detailedData.DeviceInformation.Description)
+
+	for _, entity := range entities {
+		entity.UpdateDeviceAddress(*remoteDevice.Address())
+	}
 
 	localDevice.AddRemoteDeviceForSki(remoteSki, remoteDevice)
 

Original file line number	Diff line number	Diff line change
`@@ -193,6 +193,10 @@ func setupDevices(`
`193`	`193`	`}`
`194`	`194`	`remoteDevice.UpdateDevice(detailedData.DeviceInformation.Description)`
`195`	`195`
	`196`	`+ for _, entity := range entities {`
	`197`	`+ entity.UpdateDeviceAddress(*remoteDevice.Address())`
	`198`	`+ }`
	`199`	`+`
`196`	`200`	`localDevice.AddRemoteDeviceForSki(remoteSki, remoteDevice)`
`197`	`201`
`198`	`202`	`return remoteDevice, entities`
Original file line number	Diff line number	Diff line change
`@@ -203,6 +203,10 @@ func setupDevices(`
`203`	`203`	`}`
`204`	`204`	`remoteDevice.UpdateDevice(detailedData.DeviceInformation.Description)`
`205`	`205`
	`206`	`+ for _, entity := range entities {`
	`207`	`+ entity.UpdateDeviceAddress(*remoteDevice.Address())`
	`208`	`+ }`
	`209`	`+`
`206`	`210`	`localDevice.AddRemoteDeviceForSki(remoteSki, remoteDevice)`
`207`	`211`
`208`	`212`	`return remoteDevice, mockSender, entities`
Original file line number	Diff line number	Diff line change
`@@ -176,6 +176,10 @@ func setupDevices(`
`176`	`176`	`}`
`177`	`177`	`remoteDevice.UpdateDevice(detailedData.DeviceInformation.Description)`
`178`	`178`
	`179`	`+ for _, entity := range entities {`
	`180`	`+ entity.UpdateDeviceAddress(*remoteDevice.Address())`
	`181`	`+ }`
	`182`	`+`
`179`	`183`	`localDevice.AddRemoteDeviceForSki(remoteSki, remoteDevice)`
`180`	`184`
`181`	`185`	`return remoteDevice, entities`
Original file line number	Diff line number	Diff line change
`@@ -175,6 +175,10 @@ func setupDevices(`
`175`	`175`	`}`
`176`	`176`	`remoteDevice.UpdateDevice(detailedData.DeviceInformation.Description)`
`177`	`177`
	`178`	`+ for _, entity := range entities {`
	`179`	`+ entity.UpdateDeviceAddress(*remoteDevice.Address())`
	`180`	`+ }`
	`181`	`+`
`178`	`182`	`localDevice.AddRemoteDeviceForSki(remoteSki, remoteDevice)`
`179`	`183`
`180`	`184`	`return remoteDevice, entities`
Original file line number	Diff line number	Diff line change
`@@ -195,6 +195,10 @@ func setupDevices(`
`195`	`195`	`}`
`196`	`196`	`remoteDevice.UpdateDevice(detailedData.DeviceInformation.Description)`
`197`	`197`
	`198`	`+ for _, entity := range entities {`
	`199`	`+ entity.UpdateDeviceAddress(*remoteDevice.Address())`
	`200`	`+ }`
	`201`	`+`
`198`	`202`	`localDevice.AddRemoteDeviceForSki(remoteSki, remoteDevice)`
`199`	`203`
`200`	`204`	`return remoteDevice, entities`
Original file line number	Diff line number	Diff line change
`@@ -205,6 +205,10 @@ func setupDevices(`
`205`	`205`	`}`
`206`	`206`	`remoteDevice.UpdateDevice(detailedData.DeviceInformation.Description)`
`207`	`207`
	`208`	`+ for _, entity := range entities {`
	`209`	`+ entity.UpdateDeviceAddress(*remoteDevice.Address())`
	`210`	`+ }`
	`211`	`+`
`208`	`212`	`localDevice.AddRemoteDeviceForSki(remoteSki, remoteDevice)`
`209`	`213`
`210`	`214`	`return remoteDevice, entities`
Original file line number	Diff line number	Diff line change
`@@ -167,6 +167,10 @@ func setupDevices(`
`167`	`167`	`}`
`168`	`168`	`remoteDevice.UpdateDevice(detailedData.DeviceInformation.Description)`
`169`	`169`
	`170`	`+ for _, entity := range entities {`
	`171`	`+ entity.UpdateDeviceAddress(*remoteDevice.Address())`
	`172`	`+ }`
	`173`	`+`
`170`	`174`	`localDevice.AddRemoteDeviceForSki(remoteSki, remoteDevice)`
`171`	`175`
`172`	`176`	`return remoteDevice, entities[0]`