rename software-version to software

Exa-Networks · Jul 15, 2024 · 3678343 · 3678343
1 parent 832a8db
commit 3678343
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/qa/decoding/bgp-open-sofware-version b/qa/decoding/bgp-open-sofware-version
@@ -1,3 +1,3 @@
 open
 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00510104FFFD00B40A000002340206010400010001020641040000FFFD02224B201F4578614247502F6D61696E2D633261326561386562642D3230323430373135
-{ "exabgp": "5.0.0", "time": 1721069327.773314, "host" : "MacBook-Pro-3.local", "pid" : 23259, "ppid" : 52865, "counter": 1, "type": "open", "neighbor": {     "address": { "local": "127.0.0.1", "peer": "127.0.0.1" },     "asn": { "local": 65533, "peer": 65533 }     , "direction": "in", "open": { "version": 4, "asn": 65533, "hold_time": 180, "router_id": "10.0.0.2", "capabilities": { "1": { "name": "multiprotocol", "families": [ "ipv4/unicast" ] }, "65": { "name": "asn4", "asn4": 65533 }, "75": { "software-version": "ExaBGP/main-c2a2ea8ebd-20240715" } } } } }
+{ "exabgp": "5.0.0", "time": 1721069327.773314, "host" : "MacBook-Pro-3.local", "pid" : 23259, "ppid" : 52865, "counter": 1, "type": "open", "neighbor": {     "address": { "local": "127.0.0.1", "peer": "127.0.0.1" },     "asn": { "local": 65533, "peer": 65533 }     , "direction": "in", "open": { "version": 4, "asn": 65533, "hold_time": 180, "router_id": "10.0.0.2", "capabilities": { "1": { "name": "multiprotocol", "families": [ "ipv4/unicast" ] }, "65": { "name": "asn4", "asn4": 65533 }, "75": { "software": "ExaBGP/main-c2a2ea8ebd-20240715" } } } } }
diff --git a/src/exabgp/bgp/message/open/capability/capabilities.py b/src/exabgp/bgp/message/open/capability/capabilities.py
@@ -22,7 +22,7 @@
 from exabgp.bgp.message.open.capability.refresh import EnhancedRouteRefresh
 from exabgp.bgp.message.open.capability.extended import ExtendedMessage
 from exabgp.bgp.message.open.capability.hostname import HostName
-from exabgp.bgp.message.open.capability.software_version import SoftwareVersion
+from exabgp.bgp.message.open.capability.software import Software
 
 from exabgp.bgp.message.notification import Notify
 
@@ -147,7 +147,7 @@ def _software_version(self, neighbor):
         if not neighbor['capability']['software-version']:
             return
 
-        self[Capability.CODE.SOFTWARE_VERSION] = SoftwareVersion()
+        self[Capability.CODE.SOFTWARE_VERSION] = Software()
 
     def _operational(self, neighbor):
         if not neighbor['capability']['operational']:

diff --git a/...ssage/open/capability/software_version.py → ...p/bgp/message/open/capability/software.py b/...ssage/open/capability/software_version.py → ...p/bgp/message/open/capability/software.py
@@ -14,7 +14,7 @@
 
 
 @Capability.register()
-class SoftwareVersion(Capability):
+class Software(Capability):
     ID = Capability.CODE.SOFTWARE_VERSION
     SOFTWARE_VERSION_MAX_LEN = 64
 
@@ -25,10 +25,10 @@ def __init__(self):
         self.software_version = software_version
 
     def __str__(self):
-        return 'SoftwareVersion(%s)' % self.software_version
+        return 'Software(%s)' % self.software_version
 
     def json(self):
-        return '{ "software-version": "%s" }' % self.software_version
+        return '{ "software": "%s" }' % self.software_version
 
     def extract(self):
         return [bytes([len(self.software_version)]) + self.software_version.encode('utf-8')]