new scheme for env variable names

Based on discussions on env variable now the plugin will export them in following format: PCIDEVICE_INTEL_COM_NET_A=0000:87:10.0;0000:87:11.6 Change-Id: I60cf0ded245f041a1842cc541a584eb1de2f7dbc
TerrenceXu · Nov 22, 2018 · abfdd2e · abfdd2e
1 parent 9e0654f
commit abfdd2e
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 5 deletions.
diff --git a/pkg/resources/genericPool.go b/pkg/resources/genericPool.go
@@ -59,7 +59,7 @@ func (rp *genericResourcePool) GetEnvs(deviceIDs []string) map[string]string {
 		if i == lastIndex {
 			break
 		}
-		values += " "
+		values += ","
 	}
 	envs[rp.config.ResourceName] = values
 	return envs

diff --git a/pkg/resources/netDevicePool.go b/pkg/resources/netDevicePool.go
@@ -61,7 +61,7 @@ func (rp *netDevicePool) GetEnvs(deviceIDs []string) map[string]string {
 		if i == lastIndex {
 			break
 		}
-		values += " "
+		values += ","
 	}
 	envs[rp.config.ResourceName] = values
 	return envs

diff --git a/pkg/resources/server.go b/pkg/resources/server.go
@@ -19,6 +19,7 @@ import (
 	"net"
 	"os"
 	"path/filepath"
+	"strings"
 	"time"
 
 	"github.com/golang/glog"
@@ -86,7 +87,7 @@ func (rs *resourceServer) Allocate(ctx context.Context, rqt *pluginapi.AllocateR
 	for _, container := range rqt.ContainerRequests {
 		containerResp := new(pluginapi.ContainerAllocateResponse)
 		containerResp.Devices = rs.resourcePool.GetDeviceSpecs(rs.resourcePool.GetDeviceFiles(), container.DevicesIDs)
-		containerResp.Envs = rs.resourcePool.GetEnvs(container.DevicesIDs)
+		containerResp.Envs = rs.getEnvs(container.DevicesIDs)
 		containerResp.Mounts = rs.resourcePool.GetMounts()
 		resp.ContainerResponses = append(resp.ContainerResponses, containerResp)
 	}
@@ -281,3 +282,18 @@ func (rs *resourceServer) triggerUpdate() {
 		}()
 	}
 }
+
+func (rs *resourceServer) getEnvs(deviceIDs []string) map[string]string {
+
+	varPrefix := "PCIDEVICE"
+	resourceNamePrefix := strings.Replace(rs.resourceNamePrefix, ".", "_", -1)
+
+	envs := rs.resourcePool.GetEnvs(deviceIDs)
+
+	newEnvs := make(map[string]string)
+	for k, v := range envs {
+		exportedVar := strings.ToUpper(fmt.Sprintf("%s_%s_%s", varPrefix, resourceNamePrefix, k))
+		newEnvs[exportedVar] = v
+	}
+	return newEnvs
+}
diff --git a/pkg/resources/uioPool.go b/pkg/resources/uioPool.go
@@ -56,7 +56,7 @@ func (rp *uioResourcePool) GetEnvs(deviceIDs []string) map[string]string {
 		if i == lastIndex {
 			break
 		}
-		values += " "
+		values += ","
 	}
 	envs[rp.config.ResourceName] = values
 	return envs

diff --git a/pkg/resources/vfioPool.go b/pkg/resources/vfioPool.go
@@ -60,7 +60,7 @@ func (rp *vfioResourcePool) GetEnvs(deviceIDs []string) map[string]string {
 		if i == lastIndex {
 			break
 		}
-		values += " "
+		values += ","
 	}
 	envs[rp.config.ResourceName] = values
 	return envs