INT app gui2
This patch contains the files needed by the INT app to work with gui2.
More in detail I reuse/modifie the html and the css, already provided in
the inbandtelemetry folder. I add the file needed to utilize the gui2,
e.g,intapp-gui2-lib.module.ts.
Link to my dropbox for screenshots:
https://www.dropbox.com/sh/ie2l0flcm8igesk/AAAsP2RdMbNbnt6A88lmBczaa?dl=0
Change-Id: I710c09f3a04a139a4482bb7aae3b3b76b39e67e6
diff --git a/apps/inbandtelemetry/app/src/main/java/org/onosproject/inbandtelemetry/app/ui/IntAppTableMessageHandler.java b/apps/inbandtelemetry/app/src/main/java/org/onosproject/inbandtelemetry/app/ui/IntAppTableMessageHandler.java
index a0df5a9..2c44696 100644
--- a/apps/inbandtelemetry/app/src/main/java/org/onosproject/inbandtelemetry/app/ui/IntAppTableMessageHandler.java
+++ b/apps/inbandtelemetry/app/src/main/java/org/onosproject/inbandtelemetry/app/ui/IntAppTableMessageHandler.java
@@ -41,6 +41,7 @@
*/
public class IntAppTableMessageHandler extends UiMessageHandler {
private static final String INT_APP_INT_INTENT = "intAppIntIntent";
+ private static final String INT_APP_INT_INTENT_PAYLOAD = "intAppIntIntents";
private static final String INT_APP_INT_INTENT_DATA_REQUEST = INT_APP_INT_INTENT + "DataRequest";
private static final String INT_APP_INT_INTENT_DATA_RESPONSE = INT_APP_INT_INTENT + "DataResponse";
@@ -74,7 +75,7 @@
private final class IntAppIntIntentRequestHandler extends TableRequestHandler {
private IntAppIntIntentRequestHandler() {
- super(INT_APP_INT_INTENT_DATA_REQUEST, INT_APP_INT_INTENT_DATA_RESPONSE, INT_APP_INT_INTENT);
+ super(INT_APP_INT_INTENT_DATA_REQUEST, INT_APP_INT_INTENT_DATA_RESPONSE, INT_APP_INT_INTENT_PAYLOAD);
}
@Override
diff --git a/apps/inbandtelemetry/app/src/main/java/org/onosproject/inbandtelemetry/app/ui/IntAppUiComponent.java b/apps/inbandtelemetry/app/src/main/java/org/onosproject/inbandtelemetry/app/ui/IntAppUiComponent.java
index 9769bb0..daa1968 100644
--- a/apps/inbandtelemetry/app/src/main/java/org/onosproject/inbandtelemetry/app/ui/IntAppUiComponent.java
+++ b/apps/inbandtelemetry/app/src/main/java/org/onosproject/inbandtelemetry/app/ui/IntAppUiComponent.java
@@ -61,6 +61,7 @@
new UiExtension.Builder(getClass().getClassLoader(), uiViews)
.resourcePath(VIEW_ID)
.messageHandlerFactory(messageHandlerFactory)
+ .ui2()
.build();
@Activate
diff --git a/apps/inbandtelemetry/app/src/main/java/org/onosproject/inbandtelemetry/app/ui/IntAppUiMessageHandler.java b/apps/inbandtelemetry/app/src/main/java/org/onosproject/inbandtelemetry/app/ui/IntAppUiMessageHandler.java
index 226c428..34e8fb4 100644
--- a/apps/inbandtelemetry/app/src/main/java/org/onosproject/inbandtelemetry/app/ui/IntAppUiMessageHandler.java
+++ b/apps/inbandtelemetry/app/src/main/java/org/onosproject/inbandtelemetry/app/ui/IntAppUiMessageHandler.java
@@ -37,6 +37,8 @@
import java.util.Collection;
+import static org.onosproject.inbandtelemetry.api.IntIntent.IntHeaderType.HOP_BY_HOP;
+
public class IntAppUiMessageHandler extends UiMessageHandler {
private static final String INT_INTENT_ADD_REQUEST = "intIntentAddRequest";
@@ -54,7 +56,7 @@
new IntIntentAddRequestHandler(),
new IntIntentDelRequestHandler(),
new IntConfigAddRequestHandler()
-// new intConfigDelRequestHandler()
+ //new intConfigDelRequestHandler()
);
}
@@ -181,7 +183,7 @@
}
builder.withSelector(sBuilder.build())
- .withHeaderType(IntIntent.IntHeaderType.HOP_BY_HOP)
+ .withHeaderType(HOP_BY_HOP)
.withReportType(IntIntent.IntReportType.TRACKED_FLOW)
.withTelemetryMode(IntIntent.TelemetryMode.INBAND_TELEMETRY);
intService.installIntIntent(builder.build());