This update addresses the following:
1. Decouple the kafka messaging proxy from the kafka client. This
will allow us to try out different kafka clients as well as test
the client separately.
2. Create unique device topics for the core, olt adapter and onu
adapters. This will ensure only cores and adapters handling these
devices will listens to the device messages.
3. Update the core with the latest device model APIs and changes.
While most of the model issues have been fixed, there is still an
issue with updating a child branch. This will be dealt in a separate
update.
Change-Id: I622ef5c636d7466bb3adefaa4ac4c85d7c450bea
diff --git a/kafka/kafka_inter_container_library_test.go b/kafka/kafka_inter_container_library_test.go
index 6a3bb37..790425e 100644
--- a/kafka/kafka_inter_container_library_test.go
+++ b/kafka/kafka_inter_container_library_test.go
@@ -21,38 +21,35 @@
)
func TestDefaultKafkaProxy(t *testing.T) {
- actualResult, error := NewKafkaMessagingProxy()
+ actualResult, error := NewInterContainerProxy()
assert.Equal(t, error, nil)
- assert.Equal(t, actualResult.KafkaHost, DefaultKafkaHost)
- assert.Equal(t, actualResult.KafkaPort, DefaultKafkaPort)
- assert.Equal(t, actualResult.TargetInterface, interface{}(nil))
- assert.Equal(t, actualResult.DefaultTopic.Name, "Core")
+ assert.Equal(t, actualResult.kafkaHost, DefaultKafkaHost)
+ assert.Equal(t, actualResult.kafkaPort, DefaultKafkaPort)
+ assert.Equal(t, actualResult.defaultRequestHandlerInterface, interface{}(nil))
}
func TestKafkaProxyOptionHost(t *testing.T) {
- actualResult, error := NewKafkaMessagingProxy(KafkaHost("10.20.30.40"))
+ actualResult, error := NewInterContainerProxy(InterContainerHost("10.20.30.40"))
assert.Equal(t, error, nil)
- assert.Equal(t, actualResult.KafkaHost, "10.20.30.40")
- assert.Equal(t, actualResult.KafkaPort, DefaultKafkaPort)
- assert.Equal(t, actualResult.TargetInterface, interface{}(nil))
- assert.Equal(t, actualResult.DefaultTopic.Name, "Core")
+ assert.Equal(t, actualResult.kafkaHost, "10.20.30.40")
+ assert.Equal(t, actualResult.kafkaPort, DefaultKafkaPort)
+ assert.Equal(t, actualResult.defaultRequestHandlerInterface, interface{}(nil))
}
func TestKafkaProxyOptionPort(t *testing.T) {
- actualResult, error := NewKafkaMessagingProxy(KafkaPort(1020))
+ actualResult, error := NewInterContainerProxy(InterContainerPort(1020))
assert.Equal(t, error, nil)
- assert.Equal(t, actualResult.KafkaHost, DefaultKafkaHost)
- assert.Equal(t, actualResult.KafkaPort, 1020)
- assert.Equal(t, actualResult.TargetInterface, interface{}(nil))
- assert.Equal(t, actualResult.DefaultTopic.Name, "Core")
+ assert.Equal(t, actualResult.kafkaHost, DefaultKafkaHost)
+ assert.Equal(t, actualResult.kafkaPort, 1020)
+ assert.Equal(t, actualResult.defaultRequestHandlerInterface, interface{}(nil))
}
func TestKafkaProxyOptionTopic(t *testing.T) {
- actualResult, error := NewKafkaMessagingProxy(DefaultTopic(&Topic{Name: "Adapter"}))
+ actualResult, error := NewInterContainerProxy(DefaultTopic(&Topic{Name: "Adapter"}))
assert.Equal(t, error, nil)
- assert.Equal(t, actualResult.KafkaHost, DefaultKafkaHost)
- assert.Equal(t, actualResult.KafkaPort, DefaultKafkaPort)
- assert.Equal(t, actualResult.TargetInterface, interface{}(nil))
+ assert.Equal(t, actualResult.kafkaHost, DefaultKafkaHost)
+ assert.Equal(t, actualResult.kafkaPort, DefaultKafkaPort)
+ assert.Equal(t, actualResult.defaultRequestHandlerInterface, interface{}(nil))
assert.Equal(t, actualResult.DefaultTopic.Name, "Adapter")
}
@@ -64,24 +61,23 @@
func TestKafkaProxyOptionTargetInterface(t *testing.T) {
var m *myInterface
- actualResult, error := NewKafkaMessagingProxy(TargetInterface(m))
+ actualResult, error := NewInterContainerProxy(RequestHandlerInterface(m))
assert.Equal(t, error, nil)
- assert.Equal(t, actualResult.KafkaHost, DefaultKafkaHost)
- assert.Equal(t, actualResult.KafkaPort, DefaultKafkaPort)
- assert.Equal(t, actualResult.TargetInterface, m)
- assert.Equal(t, actualResult.DefaultTopic.Name, "Core")
+ assert.Equal(t, actualResult.kafkaHost, DefaultKafkaHost)
+ assert.Equal(t, actualResult.kafkaPort, DefaultKafkaPort)
+ assert.Equal(t, actualResult.defaultRequestHandlerInterface, m)
}
func TestKafkaProxyChangeAllOptions(t *testing.T) {
var m *myInterface
- actualResult, error := NewKafkaMessagingProxy(
- KafkaHost("10.20.30.40"),
- KafkaPort(1020),
+ actualResult, error := NewInterContainerProxy(
+ InterContainerHost("10.20.30.40"),
+ InterContainerPort(1020),
DefaultTopic(&Topic{Name: "Adapter"}),
- TargetInterface(m))
+ RequestHandlerInterface(m))
assert.Equal(t, error, nil)
- assert.Equal(t, actualResult.KafkaHost, "10.20.30.40")
- assert.Equal(t, actualResult.KafkaPort, 1020)
- assert.Equal(t, actualResult.TargetInterface, m)
+ assert.Equal(t, actualResult.kafkaHost, "10.20.30.40")
+ assert.Equal(t, actualResult.kafkaPort, 1020)
+ assert.Equal(t, actualResult.defaultRequestHandlerInterface, m)
assert.Equal(t, actualResult.DefaultTopic.Name, "Adapter")
}