ONOS-6825: added OFAgent tracer
Change-Id: Ib04184b5fe108c636f8fb9c4b721a1004b72c0a7
diff --git a/apps/ofagent/src/test/java/org/onosproject/ofagent/impl/DefaultOFAgentTest.java b/apps/ofagent/src/test/java/org/onosproject/ofagent/impl/DefaultOFAgentTest.java
index 6e537b4..0028fc1 100644
--- a/apps/ofagent/src/test/java/org/onosproject/ofagent/impl/DefaultOFAgentTest.java
+++ b/apps/ofagent/src/test/java/org/onosproject/ofagent/impl/DefaultOFAgentTest.java
@@ -21,6 +21,7 @@
import org.onlab.packet.IpAddress;
import org.onlab.packet.TpPort;
import org.onosproject.incubator.net.virtual.NetworkId;
+import org.onosproject.incubator.net.virtual.TenantId;
import org.onosproject.ofagent.api.OFAgent;
import org.onosproject.ofagent.api.OFController;
@@ -51,26 +52,33 @@
private static final NetworkId NETWORK_1 = NetworkId.networkId(1);
private static final NetworkId NETWORK_2 = NetworkId.networkId(2);
+ private static final TenantId TENANT_1 = TenantId.tenantId("Tenant_1");
+ private static final TenantId TENANT_2 = TenantId.tenantId("Tenant_2");
+
private static final OFAgent OFAGENT = DefaultOFAgent.builder()
.networkId(NETWORK_1)
+ .tenantId(TENANT_1)
.controllers(CONTROLLER_1)
.state(STOPPED)
.build();
private static final OFAgent SAME_AS_OFAGENT_1 = DefaultOFAgent.builder()
.networkId(NETWORK_1)
+ .tenantId(TENANT_1)
.controllers(CONTROLLER_2)
.state(STOPPED)
.build();
private static final OFAgent SAME_AS_OFAGENT_2 = DefaultOFAgent.builder()
.networkId(NETWORK_1)
+ .tenantId(TENANT_1)
.controllers(CONTROLLER_1)
.state(STARTED)
.build();
private static final OFAgent ANOTHER_OFAGENT = DefaultOFAgent.builder()
.networkId(NETWORK_2)
+ .tenantId(TENANT_2)
.controllers(CONTROLLER_1)
.state(STOPPED)
.build();
diff --git a/apps/ofagent/src/test/java/org/onosproject/ofagent/impl/OFAgentManagerTest.java b/apps/ofagent/src/test/java/org/onosproject/ofagent/impl/OFAgentManagerTest.java
index 2a7c941..90ba30d 100644
--- a/apps/ofagent/src/test/java/org/onosproject/ofagent/impl/OFAgentManagerTest.java
+++ b/apps/ofagent/src/test/java/org/onosproject/ofagent/impl/OFAgentManagerTest.java
@@ -34,6 +34,7 @@
import org.onosproject.core.DefaultApplicationId;
import org.onosproject.event.Event;
import org.onosproject.incubator.net.virtual.NetworkId;
+import org.onosproject.incubator.net.virtual.TenantId;
import org.onosproject.incubator.net.virtual.VirtualNetworkService;
import org.onosproject.ofagent.api.OFAgent;
import org.onosproject.ofagent.api.OFAgentEvent;
@@ -76,25 +77,32 @@
private static final NetworkId NETWORK_1 = NetworkId.networkId(1);
private static final NetworkId NETWORK_2 = NetworkId.networkId(2);
+ private static final TenantId TENANT_1 = TenantId.tenantId("Tenant_1");
+ private static final TenantId TENANT_2 = TenantId.tenantId("Tenant_2");
+
private static final OFAgent OFAGENT_1 = DefaultOFAgent.builder()
.networkId(NETWORK_1)
+ .tenantId(TENANT_1)
.state(STOPPED)
.build();
private static final OFAgent OFAGENT_1_CTRL_1 = DefaultOFAgent.builder()
.networkId(NETWORK_1)
+ .tenantId(TENANT_1)
.controllers(CONTROLLER_1)
.state(STOPPED)
.build();
private static final OFAgent OFAGENT_1_CTRL_2 = DefaultOFAgent.builder()
.networkId(NETWORK_1)
+ .tenantId(TENANT_1)
.controllers(CONTROLLER_2)
.state(STOPPED)
.build();
private static final OFAgent OFAGENT_2 = DefaultOFAgent.builder()
.networkId(NETWORK_2)
+ .tenantId(TENANT_2)
.state(STOPPED)
.build();
diff --git a/apps/ofagent/src/test/java/org/onosproject/ofagent/rest/OFAgentWebResourceTest.java b/apps/ofagent/src/test/java/org/onosproject/ofagent/rest/OFAgentWebResourceTest.java
index dee4ba6..74e2c4a 100644
--- a/apps/ofagent/src/test/java/org/onosproject/ofagent/rest/OFAgentWebResourceTest.java
+++ b/apps/ofagent/src/test/java/org/onosproject/ofagent/rest/OFAgentWebResourceTest.java
@@ -29,6 +29,7 @@
import org.onlab.packet.TpPort;
import org.onlab.rest.BaseResource;
import org.onosproject.incubator.net.virtual.NetworkId;
+import org.onosproject.incubator.net.virtual.TenantId;
import org.onosproject.ofagent.api.OFAgent;
import org.onosproject.ofagent.api.OFAgentAdminService;
import org.onosproject.ofagent.api.OFAgentService;
@@ -94,19 +95,27 @@
private static final NetworkId NETWORK_2 = NetworkId.networkId(2);
private static final NetworkId NETWORK = NetworkId.networkId(3);
+
+ private static final TenantId TENANT_1 = TenantId.tenantId("Tenant_1");
+ private static final TenantId TENANT_2 = TenantId.tenantId("Tenant_2");
+ private static final TenantId TENANT = TenantId.tenantId("Tenant");
+
private static final OFAgent OF_AGENT = DefaultOFAgent.builder()
.networkId(NETWORK)
+ .tenantId(TENANT)
.controllers(CONTROLLER_SET)
.state(STOPPED)
.build();
private Set<OFAgent> agents = Sets.newHashSet(DefaultOFAgent.builder()
.networkId(NETWORK_1)
+ .tenantId(TENANT_1)
.controllers(CONTROLLER_SET_1)
.state(STOPPED)
.build(),
DefaultOFAgent.builder()
.networkId(NETWORK_2)
+ .tenantId(TENANT_2)
.controllers(CONTROLLER_SET_2)
.state(STOPPED)
.build(),
@@ -166,6 +175,9 @@
String expectedJsonStringNetworkId = "\"networkId\":\"" + ofAgent.networkId().id() + "\"";
assertThat(response, containsString(expectedJsonStringNetworkId));
+ String expectedJsonStringTenantId = "\"tenantId\":\"" + ofAgent.tenantId().id() + "\"";
+ assertThat(response, containsString(expectedJsonStringTenantId));
+
String expectedJsonStringState = "\"state\":\"" + ofAgent.state() + "\"";
assertThat(response, containsString(expectedJsonStringState));
@@ -219,8 +231,9 @@
final Response response = wt.path("service/ofagent/" + NETWORK).request().get();
final JsonObject result = Json.parse(response.readEntity(String.class)).asObject();
assertThat(result, notNullValue());
- assertThat(result.names(), hasSize(3));
+ assertThat(result.names(), hasSize(4));
assertThat(result.get("networkId").asString(), is(NETWORK.id().toString()));
+ assertThat(result.get("tenantId").asString(), is(TENANT.id()));
assertThat(result.get("state").asString(), is(STOPPED.toString()));
verify(mockOFAgentService);
diff --git a/apps/ofagent/src/test/resources/org/onosproject/ofagent/rest/post-ofagent-create.json b/apps/ofagent/src/test/resources/org/onosproject/ofagent/rest/post-ofagent-create.json
index 7632bbf..492ef7a 100644
--- a/apps/ofagent/src/test/resources/org/onosproject/ofagent/rest/post-ofagent-create.json
+++ b/apps/ofagent/src/test/resources/org/onosproject/ofagent/rest/post-ofagent-create.json
@@ -1,5 +1,6 @@
{
"networkId": "3",
+ "tenantId": "Tenant_3",
"controllers": [
{
"ip": "147.91.1.27",
diff --git a/apps/ofagent/src/test/resources/org/onosproject/ofagent/rest/put-non-existent-ofagent-update.json b/apps/ofagent/src/test/resources/org/onosproject/ofagent/rest/put-non-existent-ofagent-update.json
index 86d1b21..a420183 100644
--- a/apps/ofagent/src/test/resources/org/onosproject/ofagent/rest/put-non-existent-ofagent-update.json
+++ b/apps/ofagent/src/test/resources/org/onosproject/ofagent/rest/put-non-existent-ofagent-update.json
@@ -1,5 +1,6 @@
{
"networkId": "3",
+ "tenantId": "Tenant_2",
"controllers": [
{
"ip": "147.91.1.27",
diff --git a/apps/ofagent/src/test/resources/org/onosproject/ofagent/rest/put-ofagent-update.json b/apps/ofagent/src/test/resources/org/onosproject/ofagent/rest/put-ofagent-update.json
index 1a36150..1910339 100644
--- a/apps/ofagent/src/test/resources/org/onosproject/ofagent/rest/put-ofagent-update.json
+++ b/apps/ofagent/src/test/resources/org/onosproject/ofagent/rest/put-ofagent-update.json
@@ -1,5 +1,6 @@
{
"networkId": "3",
+ "tenantId": "Tenant_3",
"controllers": [
{
"ip": "147.91.1.27",