ocispec: add allowed connections field to service config

Signed-off-by: Oleksandr Grytsov <[email protected]>

Author: al1img

src/core/cm/config.hpp

@@ -7,11 +7,4 @@
 #ifndef AOS_CORE_CM_CONFIG_HPP_
 #define AOS_CORE_CM_CONFIG_HPP_
 
-/**
- * Max number of service instance connections.
- */
-#ifndef AOS_CONFIG_NETWORKMANAGER_CONNECTIONS_PER_INSTANCE_MAX_COUNT
-#define AOS_CONFIG_NETWORKMANAGER_CONNECTIONS_PER_INSTANCE_MAX_COUNT 16
-#endif
-
 #endif

src/core/cm/networkmanager/itf/networkmanager.hpp

@@ -16,16 +16,6 @@ namespace aos::cm::networkmanager {
  *  @{
  */
 
-/**
- * Max number of allowed connections.
- */
-static constexpr auto cMaxNumConnections = AOS_CONFIG_NETWORKMANAGER_CONNECTIONS_PER_INSTANCE_MAX_COUNT;
-
-/**
- * Max length of connection name.
- */
-static constexpr auto cConnectionNameLen = cServiceIDLen + cExposedPortLen;
-
 /**
  * Represents network configuration parameters for service.
  */

src/core/common/config.hpp

@@ -547,6 +547,13 @@
 #define AOS_CONFIG_TYPES_MAX_NUM_EXPOSED_PORTS 8
 #endif
 
+/**
+ * Max number of service instance connections.
+ */
+#ifndef AOS_CONFIG_TYPES_MAX_NUM_ALLOWED_CONNECTIONS
+#define AOS_CONFIG_TYPES_MAX_NUM_ALLOWED_CONNECTIONS 16
+#endif
+
 /**
  * Identifier URN  len.
  */

src/core/common/ocispec/serviceconfig.hpp

@@ -113,6 +113,7 @@ struct ServiceConfig {
     Duration                                                                       mOfflineTTL;
     ServiceQuotas                                                                  mQuotas;
     Optional<RequestedResources>                                                   mRequestedResources;
+    StaticArray<StaticString<cConnectionNameLen>, cMaxNumConnections>              mAllowedConnections;
     StaticArray<ServiceDevice, cMaxNumNodeDevices>                                 mDevices;
     StaticArray<StaticString<cResourceNameLen>, cMaxNumNodeResources>              mResources;
     StaticArray<FunctionServicePermissions, cFuncServiceMaxCount>                  mPermissions;
@@ -130,8 +131,8 @@ struct ServiceConfig {
             && mSkipResourceLimits == config.mSkipResourceLimits && mHostname == config.mHostname
             && mBalancingPolicy == config.mBalancingPolicy && mRunners == config.mRunners
             && mRunParameters == config.mRunParameters && mSysctl == config.mSysctl && mOfflineTTL == config.mOfflineTTL
-            && mQuotas == config.mQuotas && mRequestedResources == config.mRequestedResources
-            && mAlertRules == config.mAlertRules;
+            && mQuotas == config.mQuotas && mAllowedConnections == config.mAllowedConnections
+            && mRequestedResources == config.mRequestedResources && mAlertRules == config.mAlertRules;
     }
 
     /**

src/core/common/types/types.hpp

@@ -403,6 +403,16 @@ static constexpr auto cMaxNumExposedPorts = AOS_CONFIG_TYPES_MAX_NUM_EXPOSED_POR
  */
 static constexpr auto cExposedPortLen = cPortLen + cProtocolNameLen;
 
+/**
+ * Max length of connection name.
+ */
+static constexpr auto cConnectionNameLen = cServiceIDLen + cExposedPortLen;
+
+/**
+ * Max number of allowed connections.
+ */
+static constexpr auto cMaxNumConnections = AOS_CONFIG_TYPES_MAX_NUM_ALLOWED_CONNECTIONS;
+
 /**
  * Identifier URN  len.
  */