Added location testing

fabric-testbed · Jul 20, 2021 · f8d0c30 · f8d0c30
1 parent d00b109
commit f8d0c30
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 10 deletions.
diff --git a/test/sliver_test.py b/test/sliver_test.py
@@ -5,7 +5,7 @@
 from fim.slivers.network_link import NetworkLinkSliver
 from fim.slivers.network_service import NetworkServiceSliver, NetworkServiceInfo
 from fim.slivers.path_info import ERO, PathInfo, Path
-from fim.slivers.capacities_labels import Capacities, Labels, CapacityHints
+from fim.slivers.capacities_labels import Capacities, Labels, CapacityHints, Location
 
 
 class TestSlivers(unittest.TestCase):
@@ -70,4 +70,14 @@ def testCapacitiesLabels(self):
         assert(ns.get_labels().vlan_range == '1-4096')
         assert(ns.get_capacities().core == 2)
 
+    def testLocation(self):
+        ns = NodeSliver()
+        loc = Location(postal='100 Europa Dr., Chapel Hill, NC 27517')
+        assert(loc.postal is not None)
+        ns.set_properties(location=loc)
+        loc1 = ns.get_property('location')
+        lat, lon = loc1.to_latlon()
+        self.assertGreater(lat, 35.00)
+        self.assertLess(lon, -79.00)
+        #print(f'{lat=} {lon=}')
 
diff --git a/test/substrate_topology_test.py b/test/substrate_topology_test.py
@@ -17,6 +17,7 @@ def tearDown(self) -> None:
     def testRENCSiteAd(self):
         # create a site advertisement
         site = 'RENC'
+        loc = f.Location(postal='100 Europa Dr., Chapel Hill, NC 27517')
         head_model = 'R7515'
         worker_model = 'R7525'
         hn_cap = f.Capacities()
@@ -36,18 +37,18 @@ def testRENCSiteAd(self):
         #
 
         gpuw = self.topo.add_node(name='renc-w1',
-                                  model=worker_model, site=site,
+                                  model=worker_model, site=site, location=loc,
                                   node_id='HX6VQ53',
                                   ntype=f.NodeType.Server,
                                   capacities=gpu_worker_cap)
 
         fnw = self.topo.add_node(name='renc-w2',
-                                 model=worker_model, site=site,
+                                 model=worker_model, site=site, location=loc,
                                  node_id='HX7LQ53',
                                  ntype=f.NodeType.Server,
                                  capacities=network_worker_cap)
         snw = self.topo.add_node(name='renc-w3',
-                                 model=worker_model, site=site,
+                                 model=worker_model, site=site, location=loc,
                                  node_id='HX7KQ53',
                                  ntype=f.NodeType.Server,
                                  capacities=network_worker_cap)
@@ -336,6 +337,7 @@ def testRENCSiteAd(self):
     def testUKYSiteAd(self):
         # create a site advertisement
         site = 'UKY'
+        loc = f.Location(postal='301 Hilltop Ave Lexington, KY 40506')
         head_model = 'R7515'
         worker_model = 'R7525'
         hn_cap = f.Capacities()
@@ -355,15 +357,15 @@ def testUKYSiteAd(self):
         #
 
         gpuw = self.topo.add_node(name='uky-w1',
-                                  model=worker_model, site=site,
+                                  model=worker_model, site=site, location=loc,
                                   node_id='3JB2R53',
                                   ntype=f.NodeType.Server, capacities=gpu_worker_cap)
         fnw = self.topo.add_node(name='uky-w2',
-                                 model=worker_model, site=site,
+                                 model=worker_model, site=site, location=loc,
                                  node_id='3JB0R53',
                                  ntype=f.NodeType.Server, capacities=network_worker_cap)
         snw = self.topo.add_node(name='uky-w3',
-                                 model=worker_model, site=site,
+                                 model=worker_model, site=site, location=loc,
                                  node_id='3JB1R53',
                                  ntype=f.NodeType.Server, capacities=network_worker_cap)
 
@@ -654,6 +656,7 @@ def testUKYSiteAd(self):
     def testLBNLSiteAd(self):
         # create a site advertisement
         site = 'LBNL'
+        loc = f.Location(postal='1 Cyclotron Rd, Berkeley, CA 94720')
         head_model = 'R7515'
         worker_model = 'R7525'
         hn_cap = f.Capacities()
@@ -673,15 +676,15 @@ def testLBNLSiteAd(self):
         #
 
         gpuw = self.topo.add_node(name='lbnl-w1',
-                                  model=worker_model, site=site,
+                                  model=worker_model, site=site, location=loc,
                                   node_id='5B3BR53',
                                   ntype=f.NodeType.Server, capacities=gpu_worker_cap)
         fnw = self.topo.add_node(name='lbnl-w2',
-                                 model=worker_model, site=site,
+                                 model=worker_model, site=site, location=loc,
                                  node_id='5B38R53',
                                  ntype=f.NodeType.Server, capacities=network_worker_cap)
         snw = self.topo.add_node(name='lbnl-w3',
-                                 model=worker_model, site=site,
+                                 model=worker_model, site=site, location=loc,
                                  node_id='5B39R53',
                                  ntype=f.NodeType.Server, capacities=network_worker_cap)