Merge pull request #262 from esnet/1.0.24-dev

1.0.24 dev
esnet · Jan 4, 2019 · c170120 · c170120
2 parents 696462b + c1c2b51
commit c170120
Show file tree

Hide file tree

Showing 20 changed files with 272 additions and 141 deletions.
diff --git a/backend/config/topo/testbed-devices.json b/backend/config/topo/testbed-devices.json
@@ -11,14 +11,35 @@
     "type": "ROUTER",
     "ports": [
       {
+        "urn": "nersc-tb1:1/1/1",
         "ipv4Address": "192.124.57.138",
         "reservableEgressBw": 100000,
-        "urn": "nersc-tb1:1/1/1",
         "reservableIngressBw": 100000,
         "capabilities": [
           "MPLS"
         ]
       },
+      {
+        "tags": [
+          "dell-z9100"
+        ],
+        "urn": "nersc-tb1:1/2/1",
+        "capabilities": [
+          "ETHERNET"
+        ],
+        "reservableVlans": [
+          {
+            "floor": "100",
+            "ceiling": "539"
+          },
+          {
+            "floor": "541",
+            "ceiling": "3999"
+          }
+        ],
+        "reservableIngressBw": 100000,
+        "reservableEgressBw": 100000
+      },
       {
         "tags": [
           "sunn-cr5"
@@ -29,12 +50,47 @@
         ],
         "reservableVlans": [
           {
-            "ceiling": "3399",
-            "floor": "3300"
+            "floor": "100",
+            "ceiling": "3999"
           }
         ],
         "reservableIngressBw": 100000,
         "reservableEgressBw": 100000
+      },
+      {
+        "tags": [
+          "nersc-tbn-2_eth40"
+        ],
+        "urn": "nersc-tb1:3/1/1",
+        "capabilities": [
+          "ETHERNET"
+        ],
+        "reservableVlans": [
+          {
+            "floor": "100",
+            "ceiling": "3999"
+          }
+        ],
+        "reservableIngressBw": 40000,
+        "reservableEgressBw": 40000
+      },
+
+      {
+        "tags": [
+          "nersc-tbn-1_eth40"
+        ],
+        "urn": "nersc-tb1:3/1/3",
+        "capabilities": [
+          "ETHERNET"
+        ],
+        "reservableVlans": [
+          {
+            "floor": "100",
+            "ceiling": "3999"
+          }
+        ],
+        "reservableIngressBw": 40000,
+        "reservableEgressBw": 40000
       }
     ]
   },
@@ -50,9 +106,9 @@
     "type": "ROUTER",
     "ports": [
       {
+        "urn": "star-tb1:2/1/1",
         "ipv4Address": "192.124.57.137",
         "reservableEgressBw": 100000,
-        "urn": "star-tb1:2/1/1",
         "reservableIngressBw": 100000,
         "capabilities": [
           "MPLS"
@@ -68,12 +124,100 @@
         ],
         "reservableVlans": [
           {
-            "ceiling": "3399",
-            "floor": "3300"
+            "floor": "100",
+            "ceiling": "627"
+          },
+          {
+            "floor": "628",
+            "ceiling": "1799"
+          },
+          {
+            "floor": "1801",
+            "ceiling": "1899"
+          },
+          {
+            "floor": "1901",
+            "ceiling": "1999"
+          },
+          {
+            "floor": "2002",
+            "ceiling": "2099"
+          },
+          {
+            "floor": "2101",
+            "ceiling": "2397"
+          },
+          {
+            "floor": "2400",
+            "ceiling": "2599"
+          },
+          {
+            "floor": "2606",
+            "ceiling": "3199"
+          },
+          {
+            "floor": "3202",
+            "ceiling": "3999"
+          }
+        ],
+        "reservableIngressBw": 100000,
+        "reservableEgressBw": 100000
+      },
+
+      {
+        "tags": [
+          "starlight-8700"
+        ],
+        "urn": "star-tb1:3/2/1",
+        "capabilities": [
+          "ETHERNET"
+        ],
+        "reservableVlans": [
+          {
+            "floor": "100",
+            "ceiling": "221"
+          },
+          {
+            "floor": "223",
+            "ceiling": "1799"
+          },
+          {
+            "floor": "1811",
+            "ceiling": "1870"
+          },
+          {
+            "floor": "1872",
+            "ceiling": "1939"
+          },
+          {
+            "floor": "1950",
+            "ceiling": "3999"
           }
+
         ],
         "reservableIngressBw": 100000,
         "reservableEgressBw": 100000
+      },
+      {
+        "tags": [
+          "xo-osf-ibm8264"
+        ],
+        "urn": "star-tb1:6/2/1",
+        "capabilities": [
+          "ETHERNET"
+        ],
+        "reservableVlans": [
+          {
+            "floor": "100",
+            "ceiling": "1920"
+          },
+          {
+            "floor": "1931",
+            "ceiling": "3999"
+          }
+        ],
+        "reservableIngressBw": 40000,
+        "reservableEgressBw": 40000
       }
     ]
   }

diff --git a/backend/pom.xml b/backend/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>newtech</artifactId>
         <groupId>net.es.oscars</groupId>
-        <version>1.0.23</version>
+        <version>1.0.24</version>
     </parent>
 
     <organization>

diff --git a/backend/src/main/java/net/es/oscars/pss/svc/AluParamsAdapter.java b/backend/src/main/java/net/es/oscars/pss/svc/AluParamsAdapter.java
@@ -215,12 +215,12 @@ public List<AluPipeResult> makePipe(VlanJunction otherJunction, List<EroHop> hop
         List<AluPipeResult> aluPipes = new ArrayList<>();
 
         List<MplsHop> mplsHops = MiscHelper.mplsHops(hops, topoService);
-        String pathName = c.getConnectionId() + "-WRK-" + p.getZ().getDeviceUrn();
+        String pathName = c.getConnectionId() + "-WRK-" + otherJunction.getDeviceUrn();
         if (pathName.length() > 32) {
             pathName = pathName.substring(0, 31);
             log.warn("path name trimmed to: " + pathName);
         }
-        String lspName = c.getConnectionId() + "-WRK-" + p.getZ().getDeviceUrn();
+        String lspName = c.getConnectionId() + "-WRK-" + otherJunction.getDeviceUrn();
         if (lspName.length() > 32) {
             lspName = lspName.substring(0, 31);
             log.warn("LSP name trimmed to: " + lspName);

diff --git a/backend/src/main/java/net/es/oscars/pss/svc/MxParamsAdapter.java b/backend/src/main/java/net/es/oscars/pss/svc/MxParamsAdapter.java
@@ -134,7 +134,7 @@ public MxParams params(Connection c, VlanJunction rvj) throws PSSException {
                 lsps.add(primary.getMxLsp());
                 qos.add(primary.getQos());
                 if (protectEnabled) {
-                    MxPipeResult protect = this.makePipe(other_j, hops, false, p, mbps, c);
+                    MxPipeResult protect = this.makePipe(other_j, hops, true, p, mbps, c);
                     paths.add(protect.getPath());
                     lsps.add(protect.getMxLsp());
                     qos.add(protect.getQos());
@@ -188,11 +188,11 @@ public MxPipeResult makePipe(VlanJunction otherJ, List<EroHop> hops, boolean pro
         String lspName = c.getConnectionId();
 
         if (protect) {
-            pathName += "-PRT-" + p.getZ().getDeviceUrn();
-            lspName += "-PRT-" + p.getZ().getDeviceUrn();
+            pathName += "-PRT-" + otherJ.getDeviceUrn();
+            lspName += "-PRT-" + otherJ.getDeviceUrn();
         } else {
-            pathName += "-WRK-" + p.getZ().getDeviceUrn();
-            lspName += "-WRK-" + p.getZ().getDeviceUrn();
+            pathName += "-WRK-" + otherJ.getDeviceUrn();
+            lspName += "-WRK-" + otherJ.getDeviceUrn();
         }
         MplsPath path = MplsPath.builder()
                 .hops(mplsHops)