Merge pull request #355 from fabric-testbed/1.7-examples

1.7 examples

CHANGELOG.md

@@ -6,12 +6,20 @@ changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-# [1.7.1] - 07/19/2024
+## [1.7.3] - 08/05/2024
+### Fixed
+- Add kali linux user name and prefix subinterface name with Node name (Issue [#356](https://github.com/fabric-testbed/fabrictestbed-extensions/issues/356))
+
+## [1.7.2] - 07/22/2024
+### Fixed
+- Post Boot config check to run for current slices (PR [#353](https://github.com/fabric-testbed/fabrictestbed-extensions/pull/353))
+
+## [1.7.1] - 07/19/2024
 
 ### Fixed
 - Use cached resource information unless fresh information explicitly requested (Issue [#352](https://github.com/fabric-testbed/fabrictestbed-extensions/issues/352))
 
-# [1.7.0] - 07/18/2024
+## [1.7.0] - 07/18/2024
 
 ### Fixed
 - Error *may* be inaccurate or wrong when I issue an invalid configuration. (Issue [#304](https://github.com/fabric-testbed/fabrictestbed-extensions/issues/304))

docs/source/resources.rst

@@ -7,3 +7,11 @@ resources
 .. autoclass:: fabrictestbed_extensions.fablib.resources.Resources
    :members:
    :special-members: __str__
+
+.. autoclass:: fabrictestbed_extensions.fablib.resources.Links
+   :members:
+   :special-members: __str__
+
+.. autoclass:: fabrictestbed_extensions.fablib.resources.FacilityPorts
+   :members:
+   :special-members: __str__

fabrictestbed_extensions/fablib/interface.py

@@ -1335,6 +1335,9 @@ def add_sub_interface(self, name: str, vlan: str, bw: int = 10):
                 f"{Constants.CMP_NIC_ConnectX_5}, {Constants.CMP_NIC_ConnectX_6}"
             )
 
+        # Hack for finding interfaces
+        name = f"{self.get_name()}-{name}"
+
         if self.get_fim():
             child_interface = self.get_fim().add_child_interface(
                 name=name, labels=Labels(vlan=vlan)

fabrictestbed_extensions/fablib/node.py

@@ -772,6 +772,8 @@ def set_username(self, username: str = None):
             self.username = "freebsd"
         elif "openbsd" in self.get_image():
             self.username = "openbsd"
+        elif "kali" in self.get_image():
+            self.username = "kali"
         else:
             self.username = None
 

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "fabrictestbed-extensions"
-version = "1.7.2"
+version = "1.7.3"
 description = "FABRIC Python Client Library and CLI Extensions"
 authors = [
   { name = "Paul Ruth", email = "[email protected]" },
@@ -20,7 +20,7 @@ dependencies = [
     "ipyleaflet",
     "ipycytoscape",
     "tabulate",
-    "fabrictestbed==1.7.1",
+    "fabrictestbed==1.7.2",
     "paramiko",
     "jinja2>=3.0.0",
     "pandas",