Merge branch 'main' into cj-azureopenai-resource-provider

solliancenet · Aug 10, 2024 · 869d46f · 869d46f
1 parent 9bde5fd
commit 869d46f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/deploy/standard-hub/infra/core/networking/vpnGateway.bicep b/deploy/standard-hub/infra/core/networking/vpnGateway.bicep
@@ -5,7 +5,7 @@ param location string
 param project string
 param subnetId string
 param tags object
-param vpnClientAddressPool string = '192.168.101.0/28'
+param vpnClientAddressPool string
 
 @allowed([
   'VpnGw1'

diff --git a/deploy/standard-hub/infra/main.bicep b/deploy/standard-hub/infra/main.bicep
@@ -6,6 +6,7 @@ param environmentName string
 param location string
 param project string
 param timestamp string = utcNow()
+param vpnClientAddressPool string
 
 // Locals
 var abbrs = loadJsonContent('./abbreviations.json')
@@ -130,6 +131,7 @@ module vpn './core/networking/vpnGateway.bicep' = {
     project: project
     subnetId: '${vnet.outputs.vnetId}/subnets/GatewaySubnet'
     tags: tags
+    vpnClientAddressPool: vpnClientAddressPool
   }
   scope: rg
 }

diff --git a/deploy/standard-hub/infra/main.parameters.json b/deploy/standard-hub/infra/main.parameters.json
@@ -2,11 +2,17 @@
     "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
     "contentVersion": "1.0.0.0",
     "parameters": {
+      "cidrVnet": {
+        "value": "${FLLM_HUB_CIDR_VNET=192.168.100.0/24}"
+      },
       "environmentName": {
         "value": "${AZURE_ENV_NAME}"
       },
       "location": {
         "value": "${AZURE_LOCATION}"
+      },
+      "vpnClientAddressPool": {
+        "value": "${VPN_CLIENT_ADDRESS_POOL=192.168.101.0/24}"
       }
     }
 }
diff --git a/src/dotnet/Orchestration/Orchestration/OrchestrationBuilder.cs b/src/dotnet/Orchestration/Orchestration/OrchestrationBuilder.cs
@@ -167,6 +167,10 @@ await EnsureAgentCapabilities(
             explodedObjects[CompletionRequestObjectsKeys.AllAgents] = allAgentsDescriptions;
 
             #region Knowledge management processing
+            if (agentBase.AgentType == typeof(KnowledgeManagementAgent) || agentBase.AgentType == typeof(AudioClassificationAgent))
+            {
+                KnowledgeManagementAgent kmAgent = (KnowledgeManagementAgent)agentBase;
+
             if (agentBase.AgentType == typeof(KnowledgeManagementAgent) || agentBase.AgentType == typeof(AudioClassificationAgent))
             {
                 KnowledgeManagementAgent kmAgent = (KnowledgeManagementAgent)agentBase;