commit 3fd1ceeef316d6d8aebc61767a15eb143f272b49
author Thomas Vachuska <tom@opennetworking.org> Wed Apr 25 19:07:06 2018 -0400
committer Thomas Vachuska <tom@opennetworking.org> Thu Apr 26 02:08:52 2018 +0000
tree 1281738a7fb7d4197e4b0953ecfd7fd7e051aaba
parent 161e4d3c17c76b6e79af1369ed9dcf3516566488

Fixing access layout to better accommodate arbitrary number of service hosts.

Change-Id: Ia46b168e2337553bfd47fdabccc5eb08d63566dc
(cherry picked from commit 6c8e5f854f24eb8c9f2b18b23416f6bc0cd2f37d)

apps/layout/src/main/java/org/onosproject/layout/AccessNetworkLayout.java

diff --git a/apps/layout/src/main/java/org/onosproject/layout/AccessNetworkLayout.java b/apps/layout/src/main/java/org/onosproject/layout/AccessNetworkLayout.java
index 5aa7fcd..105840e 100644
--- a/apps/layout/src/main/java/org/onosproject/layout/AccessNetworkLayout.java
+++ b/apps/layout/src/main/java/org/onosproject/layout/AccessNetworkLayout.java
@@ -44,14 +44,16 @@
     private static final double GATEWAY_X = 900.0;
 
     private static final int HOSTS_PER_ROW = 6;
+    private static final int COMPUTE_PER_ROW = 12;
+
     private static final double ROW_GAP = 70;
-    private static final double COL_GAP = 50;
-    private static final double COMPUTE_GAP = 60.0;
+    private static final double COMPUTE_ROW_GAP = -120;
+    private static final double COL_GAP = 54;
     private static final double COMPUTE_OFFSET = 400.0;
     private static final double GATEWAY_GAP = 200.0;
     private static final double GATEWAY_OFFSET = -200.0;
 
-    private int spine, aggregation, accessLeaf, serviceLeaf, compute, gateway;
+    private int spine, aggregation, accessLeaf, serviceLeaf, gateway;
 
     @Override
     protected boolean classify(Device device) {
@@ -132,7 +134,6 @@
                 placed.add(hid);
             });
 
-            compute = 1;
             List<HostId> hosts = hostService.getConnectedHosts(id).stream()
                     .map(Host::id)
                     .filter(computes::contains)
@@ -140,13 +141,10 @@
                     .sorted(Comparators.ELEMENT_ID_COMPARATOR)
                     .collect(Collectors.toList());
 
-            hosts.forEach(hid -> {
-                place(hid, c(compute++, hosts.size(), COMPUTE_GAP,
-                             serviceLeaf <= 2 ? -COMPUTE_OFFSET : COMPUTE_OFFSET),
-                      COMPUTE_Y);
-                placed.add(hid);
-            });
-
+            placeHostBlock(hosts, serviceLeaf <= 2 ? -COMPUTE_OFFSET : COMPUTE_OFFSET,
+                           COMPUTE_Y, COMPUTE_PER_ROW, COMPUTE_ROW_GAP,
+                           serviceLeaf <= 2 ? -COL_GAP : COL_GAP);
+            placed.addAll(hosts);
         });
     }
 
@@ -158,7 +156,8 @@
         aggregation = 1;
         accessLeaf = 1;
         if (spines.isEmpty()) {
-            leaves.forEach(lid -> placeAccessLeafAndHosts(lid, leaves.size(), placed));
+            leaves.stream().sorted(Comparators.ELEMENT_ID_COMPARATOR)
+                    .forEach(lid -> placeAccessLeafAndHosts(lid, leaves.size(), placed));
         } else {
             spines.stream().sorted(Comparators.ELEMENT_ID_COMPARATOR).forEach(id -> {
                 place(id, c(aggregation++, spines.size()), AGGREGATION_Y);