Merge pull request #256 from openebs/fix-processid

fix: add agent function to install os package

Author: r1jt

common/e2e_agent/client.go

@@ -1450,6 +1450,27 @@ func IsKernelModuleLoaded(serverAddr string, moduleName string) (bool, error) {
 	return out == "1", err
 }
 
+// IsPackageInstalled checks if an os package is installed
+func IsPackageInstalled(serverAddr string, packageName string) (bool, error) {
+	logf.Log.Info("Executing IsPackageInstalled", "addr", serverAddr, "packageName", packageName)
+	url := "http://" + getAgentAddress(serverAddr) + "/isPackageInstalled"
+	encodedresult, err := sendRequestGetResponse("POST", url, packageName, false)
+	if err != nil {
+		logf.Log.Info("sendRequestGetResponse", "encodedresult", encodedresult, "error", err.Error())
+		return false, fmt.Errorf("failed to send command to e2e-agent, error: %s", err.Error())
+	}
+	out, e2eagenterrcode, err := UnwrapResult(encodedresult)
+	if err != nil {
+		logf.Log.Info("unwrap failed", "encodedresult", encodedresult, "error", err.Error())
+		return false, err
+	}
+	if e2eagenterrcode != ErrNone {
+		return false, fmt.Errorf("failed to check if package is installed, errcode %d", e2eagenterrcode)
+	}
+	logf.Log.Info("IsPackageInstalled succeeded", "output", out)
+	return out == "0", err
+}
+
 // IsKernelModulePersistent checks if a kernel module is set to load persistently on boot
 func IsKernelModulePersistent(serverAddr string, moduleName string, filename string) (bool, error) {
 	data := KernelModule{

common/k8stest/util_node.go

@@ -594,6 +594,21 @@ func VerifyKernelModuleOnNode(node string, module string) (bool, error) {
 	return out, nil
 }
 
+// verify if package is installed on node
+func VerifyPackageInstalledOnNode(node string, packageName string) (bool, error) {
+	nodeIp, err := GetNodeIPAddress(node)
+	if err != nil {
+		return false, fmt.Errorf("failed to get node %s ip, error: %v", node, err)
+	}
+
+	// verify package installation
+	out, err := e2e_agent.IsPackageInstalled(*nodeIp, packageName)
+	if err != nil {
+		return false, fmt.Errorf("failed to verify package %s installation on node %s, error: %v", packageName, node, err)
+	}
+	return out, nil
+}
+
 // verify kernel module is persistent on node after reboot
 func VerifyKernelModulePersistenceOnNode(node string, module string, filename string) (bool, error) {
 	nodeIp, err := GetNodeIPAddress(node)

tools/e2e-agent/build.sh

@@ -9,7 +9,7 @@
 # as long as we do not make breaking changes.
 set -e
 IMAGE="openebs/e2e-agent"
-TAG="v3.1.2"
+TAG="v3.1.3"
 registry=""
 tag_as_latest=""
 

tools/e2e-agent/e2e-agent.yaml

@@ -68,7 +68,7 @@ spec:
           securityContext:
             privileged: true
             allowPrivilegeEscalation: true
-          image: openebs/e2e-agent:v3.1.2
+          image: openebs/e2e-agent:v3.1.3
           imagePullPolicy: Always
           volumeMounts:
             - name: host-root

tools/e2e-agent/server.go

@@ -172,6 +172,7 @@ func handleRequests() {
 	router.HandleFunc("/unloadKernelModule", UnloadKernelModule).Methods("POST")
 	router.HandleFunc("/getProcessID", GetProcessID).Methods("POST")
 	router.HandleFunc("/isKernelModuleLoaded", IsKernelModuleLoaded).Methods("POST")
+	router.HandleFunc("/isPackageInstalled", IsPackageInstalled).Methods("POST")
 	router.HandleFunc("/isKernelModulePersistent", IsKernelModulePersistent).Methods("POST")
 	router.HandleFunc("/configureNonPersistentHugePages", ConfigureNonPersistentHugePages).Methods("POST")
 	router.HandleFunc("/isHugePagesPersistent", IsHugePagesPersistent).Methods("POST")
@@ -351,6 +352,28 @@ func IsKernelModuleLoaded(w http.ResponseWriter, r *http.Request) {
 	WrapResult(output, ErrNone, w)
 }
 
+func IsPackageInstalled(w http.ResponseWriter, r *http.Request) {
+	var packageName string
+	d := json.NewDecoder(r.Body)
+	if err := d.Decode(&packageName); err != nil {
+		fmt.Fprint(w, err.Error())
+		klog.Error("failed to read JSON encoded data, Error: ", err)
+		return
+	}
+	klog.Info("Checking if package is installed ", packageName)
+	params := fmt.Sprintf("nsenter --mount=/proc/1/ns/mnt dpkg -s %s >/dev/null 2>&1 && echo 0 || echo 1", packageName)
+	klog.Info("Checking if package is installed")
+	output, err := bashLocal(params)
+	if err != nil {
+		w.WriteHeader(InternalServerErrorCode)
+		fmt.Fprint(w, err.Error())
+		klog.Error("failed to check if package is installed:", packageName, "Error: ", err)
+		return
+	}
+	klog.Info("Successfully checked if package is installed")
+	WrapResult(output, ErrNone, w)
+}
+
 func IsKernelModulePersistent(w http.ResponseWriter, r *http.Request) {
 	var module KernelModule
 	d := json.NewDecoder(r.Body)
@@ -462,16 +485,8 @@ func GetProcessID(w http.ResponseWriter, r *http.Request) {
 		klog.Error("failed to retrieve process ID for:", process, "Error: ", err)
 		return
 	}
-	processBytes, err := base64.StdEncoding.DecodeString(output)
-	if err != nil {
-		w.WriteHeader(InternalServerErrorCode)
-		fmt.Fprint(w, err.Error())
-		klog.Error("failed to decode process ID for:", process, "Error: ", err)
-		return
-	}
-	process = string(processBytes)
 	klog.Info("Successfully retrieved process ID")
-	WrapResult(process, ErrNone, w)
+	WrapResult(output, ErrNone, w)
 }
 
 func createFaultyDevice(w http.ResponseWriter, r *http.Request) {