CORD GUI -- Information about bundles and functions updated.
Change-Id: Iad39ee4df5185e0a017a542b5a583241b78476da
diff --git a/apps/demo/cord-gui/src/main/java/org/onosproject/cord/gui/CordModelCache.java b/apps/demo/cord-gui/src/main/java/org/onosproject/cord/gui/CordModelCache.java
index b68928b..a098e8d 100644
--- a/apps/demo/cord-gui/src/main/java/org/onosproject/cord/gui/CordModelCache.java
+++ b/apps/demo/cord-gui/src/main/java/org/onosproject/cord/gui/CordModelCache.java
@@ -64,6 +64,9 @@
private static final String LEVEL = "level";
private static final String LOGOUT = "logout";
+ private static final String BUNDLE_NAME = BUNDLE + "_name";
+ private static final String BUNDLE_DESC = BUNDLE + "_desc";
+
private static final Map<Integer, Integer> LOOKUP = new HashMap<>();
private String email = null;
@@ -315,8 +318,10 @@
return jsonLogout();
}
+ BundleDescriptor bundleDescriptor = currentBundle.descriptor();
ObjectNode root = objectNode();
- root.put(BUNDLE, currentBundle.descriptor().displayName());
+ root.put(BUNDLE_NAME, bundleDescriptor.displayName());
+ root.put(BUNDLE_DESC, bundleDescriptor.description());
root.set(USERS, userJsonArray());
addSubId(root);
return root.toString();
diff --git a/apps/demo/cord-gui/src/main/java/org/onosproject/cord/gui/model/BundleFactory.java b/apps/demo/cord-gui/src/main/java/org/onosproject/cord/gui/model/BundleFactory.java
index 2aa6f7c..813ad98 100644
--- a/apps/demo/cord-gui/src/main/java/org/onosproject/cord/gui/model/BundleFactory.java
+++ b/apps/demo/cord-gui/src/main/java/org/onosproject/cord/gui/model/BundleFactory.java
@@ -35,12 +35,18 @@
private static final String BASIC_ID = "basic";
private static final String BASIC_DISPLAY_NAME = "Basic Bundle";
private static final String BASIC_DESCRIPTION =
- "Provides basic internet and firewall functions.";
+ "If the thing that matters most to you is high speed Internet" +
+ " connectivity delivered at a great price, then the basic" +
+ " bundle is right for you.\n" +
+ "Starting at $30 a month for 12 months.";
private static final String FAMILY_ID = "family";
private static final String FAMILY_DISPLAY_NAME = "Family Bundle";
private static final String FAMILY_DESCRIPTION =
- "Provides internet, firewall and parental control functions.";
+ "Enjoy great entertainment, peace of mind and big savings when " +
+ "you bundle high speed Internet and Firewall with" +
+ " Parental Control.\n" +
+ "Starting at $40 a month for 12 months.";
// no instantiation
diff --git a/apps/demo/cord-gui/src/main/java/org/onosproject/cord/gui/model/XosFunctionDescriptor.java b/apps/demo/cord-gui/src/main/java/org/onosproject/cord/gui/model/XosFunctionDescriptor.java
index 411a208..efc9537 100644
--- a/apps/demo/cord-gui/src/main/java/org/onosproject/cord/gui/model/XosFunctionDescriptor.java
+++ b/apps/demo/cord-gui/src/main/java/org/onosproject/cord/gui/model/XosFunctionDescriptor.java
@@ -26,7 +26,8 @@
*/
INTERNET("internet",
"Internet",
- "Basic internet connectivity.",
+ "Discover the joys of high-speed, reliable Internet" +
+ " connectivity delivered seamlessly to your home.",
false,
true),
@@ -35,7 +36,7 @@
*/
FIREWALL("firewall",
"Firewall",
- "Normal firewall protection.",
+ "Simple access control and filtering with minimal set-up.",
true,
true),
@@ -44,7 +45,11 @@
*/
URL_FILTER("url_filter",
"Parental Control",
- "Variable levels of URL filtering.",
+ "Parental Control is peace of mind that your kids are safe" +
+ " - whether you are around or away. Indicate with a " +
+ "few clicks what online content is appropriate for " +
+ "your children, and voila - you have control over" +
+ " what your kids can and cannot view.",
true,
true),