Fix: check the remote server connectivity before adding to map
1. replace boolean typed enable flag into enumeration status type
2. put the service in pending state, if the activation was failed
Change-Id: I15110f3d837d9a3ecf048c2777ec6fae9bf264ff
diff --git a/apps/openstacktelemetry/app/src/test/java/org/onosproject/openstacktelemetry/config/DefaultGrpcTelemetryConfigTest.java b/apps/openstacktelemetry/app/src/test/java/org/onosproject/openstacktelemetry/config/DefaultGrpcTelemetryConfigTest.java
index 89fc1d0..e4dc795 100644
--- a/apps/openstacktelemetry/app/src/test/java/org/onosproject/openstacktelemetry/config/DefaultGrpcTelemetryConfigTest.java
+++ b/apps/openstacktelemetry/app/src/test/java/org/onosproject/openstacktelemetry/config/DefaultGrpcTelemetryConfigTest.java
@@ -31,6 +31,7 @@
import static org.hamcrest.Matchers.is;
import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
import static org.onosproject.openstacktelemetry.api.config.TelemetryConfig.ConfigType.GRPC;
+import static org.onosproject.openstacktelemetry.api.config.TelemetryConfig.Status.ENABLED;
import static org.onosproject.openstacktelemetry.config.DefaultGrpcTelemetryConfig.ADDRESS;
import static org.onosproject.openstacktelemetry.config.DefaultGrpcTelemetryConfig.MAX_INBOUND_MSG_SIZE;
import static org.onosproject.openstacktelemetry.config.DefaultGrpcTelemetryConfig.PORT;
@@ -146,7 +147,7 @@
props.put(MAX_INBOUND_MSG_SIZE, String.valueOf(MSG_SIZE_1));
props.put(USE_PLAINTEXT, String.valueOf(USE_PLAIN_TEXT_1));
TelemetryConfig config = new DefaultTelemetryConfig(DUMMY, GRPC,
- ImmutableList.of(), DUMMY, DUMMY, false, props);
+ ImmutableList.of(), DUMMY, DUMMY, ENABLED, props);
GrpcTelemetryConfig grpcConfig = fromTelemetryConfig(config);
assertThat(grpcConfig.address(), is(IP_ADDRESS_1));
diff --git a/apps/openstacktelemetry/app/src/test/java/org/onosproject/openstacktelemetry/config/DefaultInfluxDbTelemetryConfigTest.java b/apps/openstacktelemetry/app/src/test/java/org/onosproject/openstacktelemetry/config/DefaultInfluxDbTelemetryConfigTest.java
index 9f84015..699f410 100644
--- a/apps/openstacktelemetry/app/src/test/java/org/onosproject/openstacktelemetry/config/DefaultInfluxDbTelemetryConfigTest.java
+++ b/apps/openstacktelemetry/app/src/test/java/org/onosproject/openstacktelemetry/config/DefaultInfluxDbTelemetryConfigTest.java
@@ -31,6 +31,7 @@
import static org.hamcrest.Matchers.is;
import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
import static org.onosproject.openstacktelemetry.api.config.TelemetryConfig.ConfigType.INFLUXDB;
+import static org.onosproject.openstacktelemetry.api.config.TelemetryConfig.Status.DISABLED;
import static org.onosproject.openstacktelemetry.config.DefaultInfluxDbTelemetryConfig.ADDRESS;
import static org.onosproject.openstacktelemetry.config.DefaultInfluxDbTelemetryConfig.DATABASE;
import static org.onosproject.openstacktelemetry.config.DefaultInfluxDbTelemetryConfig.ENABLE_BATCH;
@@ -174,7 +175,7 @@
props.put(MEASUREMENT, MEASUREMENT_1);
TelemetryConfig config = new DefaultTelemetryConfig(DUMMY, INFLUXDB,
- ImmutableList.of(), DUMMY, DUMMY, false, props);
+ ImmutableList.of(), DUMMY, DUMMY, DISABLED, props);
InfluxDbTelemetryConfig influxDbConfig = fromTelemetryConfig(config);
assertThat(influxDbConfig.address(), is(IP_ADDRESS_1));
diff --git a/apps/openstacktelemetry/app/src/test/java/org/onosproject/openstacktelemetry/config/DefaultKafkaTelemetryConfigTest.java b/apps/openstacktelemetry/app/src/test/java/org/onosproject/openstacktelemetry/config/DefaultKafkaTelemetryConfigTest.java
index 999bcf1..d70626c 100644
--- a/apps/openstacktelemetry/app/src/test/java/org/onosproject/openstacktelemetry/config/DefaultKafkaTelemetryConfigTest.java
+++ b/apps/openstacktelemetry/app/src/test/java/org/onosproject/openstacktelemetry/config/DefaultKafkaTelemetryConfigTest.java
@@ -31,6 +31,7 @@
import static org.hamcrest.Matchers.is;
import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
import static org.onosproject.openstacktelemetry.api.config.TelemetryConfig.ConfigType.KAFKA;
+import static org.onosproject.openstacktelemetry.api.config.TelemetryConfig.Status.DISABLED;
import static org.onosproject.openstacktelemetry.config.DefaultKafkaTelemetryConfig.ADDRESS;
import static org.onosproject.openstacktelemetry.config.DefaultKafkaTelemetryConfig.BATCH_SIZE;
import static org.onosproject.openstacktelemetry.config.DefaultKafkaTelemetryConfig.CODEC;
@@ -215,7 +216,7 @@
props.put(CODEC, CODEC_1);
TelemetryConfig config = new DefaultTelemetryConfig(DUMMY, KAFKA,
- ImmutableList.of(), DUMMY, DUMMY, false, props);
+ ImmutableList.of(), DUMMY, DUMMY, DISABLED, props);
KafkaTelemetryConfig kafkaConfig = fromTelemetryConfig(config);
assertThat(kafkaConfig.address(), is(IP_ADDRESS_1));
diff --git a/apps/openstacktelemetry/app/src/test/java/org/onosproject/openstacktelemetry/config/DefaultPrometheusTelemetryConfigTest.java b/apps/openstacktelemetry/app/src/test/java/org/onosproject/openstacktelemetry/config/DefaultPrometheusTelemetryConfigTest.java
index 4a89b74..1ebd53d 100644
--- a/apps/openstacktelemetry/app/src/test/java/org/onosproject/openstacktelemetry/config/DefaultPrometheusTelemetryConfigTest.java
+++ b/apps/openstacktelemetry/app/src/test/java/org/onosproject/openstacktelemetry/config/DefaultPrometheusTelemetryConfigTest.java
@@ -31,6 +31,7 @@
import static org.hamcrest.Matchers.is;
import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
import static org.onosproject.openstacktelemetry.api.config.TelemetryConfig.ConfigType.PROMETHEUS;
+import static org.onosproject.openstacktelemetry.api.config.TelemetryConfig.Status.DISABLED;
import static org.onosproject.openstacktelemetry.config.DefaultPrometheusTelemetryConfig.ADDRESS;
import static org.onosproject.openstacktelemetry.config.DefaultPrometheusTelemetryConfig.PORT;
import static org.onosproject.openstacktelemetry.config.DefaultPrometheusTelemetryConfig.fromTelemetryConfig;
@@ -128,7 +129,7 @@
props.put(PORT, String.valueOf(PORT_1));
TelemetryConfig config = new DefaultTelemetryConfig(DUMMY, PROMETHEUS,
- ImmutableList.of(), DUMMY, DUMMY, false, props);
+ ImmutableList.of(), DUMMY, DUMMY, DISABLED, props);
PrometheusTelemetryConfig prometheusConfig = fromTelemetryConfig(config);
assertThat(prometheusConfig.address(), is(IP_ADDRESS_1));
diff --git a/apps/openstacktelemetry/app/src/test/java/org/onosproject/openstacktelemetry/config/DefaultRestTelemetryConfigTest.java b/apps/openstacktelemetry/app/src/test/java/org/onosproject/openstacktelemetry/config/DefaultRestTelemetryConfigTest.java
index 28b8465..0cac7ae 100644
--- a/apps/openstacktelemetry/app/src/test/java/org/onosproject/openstacktelemetry/config/DefaultRestTelemetryConfigTest.java
+++ b/apps/openstacktelemetry/app/src/test/java/org/onosproject/openstacktelemetry/config/DefaultRestTelemetryConfigTest.java
@@ -31,6 +31,7 @@
import static org.hamcrest.Matchers.is;
import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
import static org.onosproject.openstacktelemetry.api.config.TelemetryConfig.ConfigType.REST;
+import static org.onosproject.openstacktelemetry.api.config.TelemetryConfig.Status.DISABLED;
import static org.onosproject.openstacktelemetry.config.DefaultRestTelemetryConfig.ADDRESS;
import static org.onosproject.openstacktelemetry.config.DefaultRestTelemetryConfig.ENDPOINT;
import static org.onosproject.openstacktelemetry.config.DefaultRestTelemetryConfig.METHOD;
@@ -161,7 +162,7 @@
props.put(RESPONSE_MEDIA_TYPE, RESPONSE_MEDIA_TYPE_1);
TelemetryConfig config = new DefaultTelemetryConfig(DUMMY, REST,
- ImmutableList.of(), DUMMY, DUMMY, false, props);
+ ImmutableList.of(), DUMMY, DUMMY, DISABLED, props);
RestTelemetryConfig restConfig = DefaultRestTelemetryConfig.fromTelemetryConfig(config);
assertThat(restConfig.address(), is(IP_ADDRESS_1));
assertThat(restConfig.port(), is(PORT_1));
diff --git a/apps/openstacktelemetry/app/src/test/java/org/onosproject/openstacktelemetry/impl/DistributedTelemetryConfigStoreTest.java b/apps/openstacktelemetry/app/src/test/java/org/onosproject/openstacktelemetry/impl/DistributedTelemetryConfigStoreTest.java
index 85f6b41..4b03da8 100644
--- a/apps/openstacktelemetry/app/src/test/java/org/onosproject/openstacktelemetry/impl/DistributedTelemetryConfigStoreTest.java
+++ b/apps/openstacktelemetry/app/src/test/java/org/onosproject/openstacktelemetry/impl/DistributedTelemetryConfigStoreTest.java
@@ -32,6 +32,8 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import static org.onosproject.openstacktelemetry.api.config.TelemetryConfig.Status.DISABLED;
+import static org.onosproject.openstacktelemetry.api.config.TelemetryConfig.Status.ENABLED;
/**
* Distributed TelemetryConfig store test suite.
@@ -62,8 +64,8 @@
private static final String PROP_2_VALUE_1 = "value21";
private static final String PROP_2_VALUE_2 = "value22";
- private static final boolean ENABLED_1 = true;
- private static final boolean ENABLED_2 = false;
+ private static final TelemetryConfig.Status STATUS_1 = ENABLED;
+ private static final TelemetryConfig.Status STATUS_2 = DISABLED;
private TelemetryConfig config1;
private TelemetryConfig config2;
@@ -132,8 +134,8 @@
PROP_2.put(PROP_2_KEY_2, PROP_2_VALUE_2);
config1 = new DefaultTelemetryConfig(NAME_1, TYPE_1, null,
- MANUFACTURER_1, SW_VERSION_1, ENABLED_1, PROP_1);
+ MANUFACTURER_1, SW_VERSION_1, STATUS_1, PROP_1);
config2 = new DefaultTelemetryConfig(NAME_2, TYPE_2, null,
- MANUFACTURER_2, SW_VERSION_2, ENABLED_2, PROP_2);
+ MANUFACTURER_2, SW_VERSION_2, STATUS_2, PROP_2);
}
}