move endpoint from network to system

threefoldtech · Sep 18, 2024 · 98a467a · 98a467a
1 parent 19566ef
commit 98a467a
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 74 deletions.
diff --git a/client/node.go b/client/node.go
@@ -320,8 +320,8 @@ func (n *NodeClient) NetworkGetPublicConfig(ctx context.Context) (cfg pkg.Public
 	return
 }
 
-func (n *NodeClient) NetworkGetNodeFeatures(ctx context.Context) (feat pkg.NodeFeatures, err error) {
-	const cmd = "zos.network.node_features_get"
+func (n *NodeClient) SystemGetNodeFeatures(ctx context.Context) (feat []pkg.NodeFeature, err error) {
+	const cmd = "zos.system.node_features_get"
 
 	err = n.bus.Call(ctx, n.nodeTwin, cmd, nil, &feat)
 	return

diff --git a/docs/manual/api.md b/docs/manual/api.md
@@ -149,32 +149,6 @@ PublicConfig {
 returns the node public config or error if not set. If a node has public config
 it means it can act like an access node to user private networks
 
-### Get node features
-
-| command |body| return|
-|---|---|---|
-| `zos.network.node_features_get` | - |`NodeFeatures` |
-
-Where
-
-```json
-NodeFeatures {
-	"zmount_type": "string",
-	"network_type": "string",
-	"zdb_type": "string",
-	"zmachine_type": "string",
-	"volume_type": "string",
-	"public_ipv4_type": "string",
-	"public_ip_type": "string",
-	"gateway_name_proxy_type": "string",
-	"gateway_fqdn_proxy_type": "string",
-	"qantum_safe_fs_type": "string",
-	"zlog_type": "string",
-}
-```
-
-returns the features of the network manager running on the node
-
 ## Admin
 
 The next set of commands are ONLY possible to be called by the `farmer` only.
@@ -243,6 +217,22 @@ name must be one of (free) names returned by `zos.network.admin.interfaces`
 |---|---|---|
 | `zos.system.hypervisor` | - | `string` |
 
+### Get Node Features
+
+| command |body| return|
+|---|---|---|
+| `zos.system.node_features_get` | - |`[]NodeFeature` |
+
+
+Where
+
+```json
+NodeFeature: "string"
+
+```
+
+returns the types of workloads can be deployed depending on the network manager running on the node
+
 ## GPUs
 
 ### List Gpus

diff --git a/pkg/network.go b/pkg/network.go
@@ -198,8 +198,8 @@ type Networker interface {
 	// Get node public namespace config
 	GetPublicConfig() (PublicConfig, error)
 
-	// Get the features of the network manager running on the node
-	GetNodeFeatures() (NodeFeatures, error)
+	// Get the types of workloads can be deployed depending on the network manager running on the node
+	GetNodeFeatures() ([]NodeFeature, error)
 
 	// GetPublicExitDevice either return "singe" or "dual(<nic>)"
 	GetPublicExitDevice() (ExitDevice, error)
@@ -260,31 +260,7 @@ type PublicConfig struct {
 	Domain string `json:"domain"`
 }
 
-type NodeFeatures struct {
-	// ZMountType type
-	ZMountType gridtypes.WorkloadType `json:"zmount_type"`
-	// NetworkType type
-	NetworkType gridtypes.WorkloadType `json:"network_type"`
-	// ZDBType type
-	ZDBType gridtypes.WorkloadType `json:"zdb_type"`
-	// ZMachineType type
-	ZMachineType gridtypes.WorkloadType `json:"zmachine_type"`
-	// VolumeType type
-	VolumeType gridtypes.WorkloadType `json:"volume_type"`
-	// PublicIPv4Type type [deprecated]
-	PublicIPv4Type gridtypes.WorkloadType `json:"public_ipv4_type"`
-	// PublicIPType type is the new way to assign public ips
-	// to a VM. this has flags (V4, and V6) that has to be set.
-	PublicIPType gridtypes.WorkloadType `json:"public_ip_type"`
-	// GatewayNameProxyType type
-	GatewayNameProxyType gridtypes.WorkloadType `json:"gateway_name_proxy_type"`
-	// GatewayFQDNProxyType type
-	GatewayFQDNProxyType gridtypes.WorkloadType `json:"gateway_fqdn_proxy_type"`
-	// QuantumSafeFSType type
-	QuantumSafeFSType gridtypes.WorkloadType `json:"qantum_safe_fs_type"`
-	// ZLogsType type
-	ZLogsType gridtypes.WorkloadType `json:"zlog_type"`
-}
+type NodeFeature string
 
 func (p *PublicConfig) IsEmpty() bool {
 	return p.IPv4.Nil() && p.IPv6.Nil()

diff --git a/pkg/network/networker.go b/pkg/network/networker.go
@@ -1140,19 +1140,19 @@ func (n *networker) GetPublicConfig() (pkg.PublicConfig, error) {
 }
 
 // Get the features of the network manager running on the node
-func (n *networker) GetNodeFeatures() (pkg.NodeFeatures, error) {
-	feat := pkg.NodeFeatures{
-		ZMountType:           zos.ZMountType,
-		NetworkType:          zos.NetworkType,
-		ZDBType:              zos.ZDBType,
-		ZMachineType:         zos.ZMachineType,
-		VolumeType:           zos.VolumeType,
-		PublicIPv4Type:       zos.PublicIPv4Type,
-		PublicIPType:         zos.PublicIPType,
-		GatewayNameProxyType: zos.GatewayNameProxyType,
-		GatewayFQDNProxyType: zos.GatewayFQDNProxyType,
-		QuantumSafeFSType:    zos.QuantumSafeFSType,
-		ZLogsType:            zos.ZLogsType,
+func (n *networker) GetNodeFeatures() ([]pkg.NodeFeature, error) {
+	feat := []pkg.NodeFeature{
+		pkg.NodeFeature(zos.ZMountType),
+		pkg.NodeFeature(zos.NetworkType),
+		pkg.NodeFeature(zos.ZDBType),
+		pkg.NodeFeature(zos.ZMachineType),
+		pkg.NodeFeature(zos.VolumeType),
+		pkg.NodeFeature(zos.PublicIPv4Type),
+		pkg.NodeFeature(zos.PublicIPType),
+		pkg.NodeFeature(zos.GatewayNameProxyType),
+		pkg.NodeFeature(zos.GatewayFQDNProxyType),
+		pkg.NodeFeature(zos.QuantumSafeFSType),
+		pkg.NodeFeature(zos.ZLogsType),
 	}
 	return feat, nil
 }

diff --git a/pkg/stubs/network_stub.go b/pkg/stubs/network_stub.go
@@ -188,7 +188,7 @@ func (s *NetworkerStub) GetNet(ctx context.Context, arg0 zos.NetID) (ret0 net.IP
 	return
 }
 
-func (s *NetworkerStub) GetNodeFeatures(ctx context.Context) (ret0 pkg.NodeFeatures, ret1 error) {
+func (s *NetworkerStub) GetNodeFeatures(ctx context.Context) (ret0 []pkg.NodeFeature, ret1 error) {
 	args := []interface{}{}
 	result, err := s.client.RequestContext(ctx, s.module, s.object, "GetNodeFeatures", args...)
 	if err != nil {

diff --git a/pkg/zos_api/network.go b/pkg/zos_api/network.go
@@ -18,10 +18,6 @@ func (g *ZosAPI) networkPublicConfigGetHandler(ctx context.Context, payload []by
 	return g.networkerStub.GetPublicConfig(ctx)
 }
 
-func (g *ZosAPI) networkNodeFeaturesGetHandler(ctx context.Context, payload []byte) (interface{}, error) {
-	return g.networkerStub.GetNodeFeatures(ctx)
-}
-
 func (g *ZosAPI) networkInterfacesHandler(ctx context.Context, payload []byte) (interface{}, error) {
 	results := make(map[string][]net.IP)
 	type q struct {

diff --git a/pkg/zos_api/routes.go b/pkg/zos_api/routes.go
@@ -12,6 +12,7 @@ func (g *ZosAPI) SetupRoutes(router *peer.Router) {
 	system.WithHandler("dmi", g.systemDMIHandler)
 	system.WithHandler("hypervisor", g.systemHypervisorHandler)
 	system.WithHandler("diagnostics", g.systemDiagnosticsHandler)
+	system.WithHandler("node_features", g.systemNodeFeaturesHandler)
 
 	perf := root.SubRoute("perf")
 	perf.WithHandler("get", g.perfGetHandler)
@@ -26,7 +27,6 @@ func (g *ZosAPI) SetupRoutes(router *peer.Router) {
 	network := root.SubRoute("network")
 	network.WithHandler("list_wg_ports", g.networkListWGPortsHandler)
 	network.WithHandler("public_config_get", g.networkPublicConfigGetHandler)
-	network.WithHandler("node_features_get", g.networkNodeFeaturesGetHandler)
 	network.WithHandler("interfaces", g.networkInterfacesHandler)
 	network.WithHandler("has_ipv6", g.networkHasIPv6Handler)
 	network.WithHandler("list_public_ips", g.networkListPublicIPsHandler)

diff --git a/pkg/zos_api/system.go b/pkg/zos_api/system.go
@@ -37,3 +37,7 @@ func (g *ZosAPI) systemHypervisorHandler(ctx context.Context, payload []byte) (i
 func (g *ZosAPI) systemDiagnosticsHandler(ctx context.Context, payload []byte) (interface{}, error) {
 	return g.diagnosticsManager.GetSystemDiagnostics(ctx)
 }
+
+func (g *ZosAPI) systemNodeFeaturesHandler(ctx context.Context, payload []byte) (interface{}, error) {
+	return g.networkerStub.GetNodeFeatures(ctx)
+}