diff --git a/tests/helper/helper_oc.go b/tests/helper/helper_oc.go index e686f3915ca..ff4096190b8 100644 --- a/tests/helper/helper_oc.go +++ b/tests/helper/helper_oc.go @@ -181,6 +181,13 @@ func (oc *OcRunner) DescribeDc(dcName string, namespace string) string { return strings.TrimSpace(describeInfo) } +// GetDcPorts returns the ports of the component +func (oc *OcRunner) GetDcPorts(componentName string, appName string, project string) string { + ports := CmdShouldPass(oc.path, "get", "dc", componentName+"-"+appName, "--namespace", project, + "-o", "go-template='{{range.spec.template.spec.containers}}{{.ports}}{{end}}'") + return ports +} + // MaxMemory reuturns maximum memory func (oc *OcRunner) MaxMemory(componentName string, appName string, project string) string { maxMemory := CmdShouldPass(oc.path, "get", "dc", componentName+"-"+appName, "--namespace", project, @@ -197,16 +204,16 @@ func (oc *OcRunner) MinMemory(componentName string, appName string, project stri // MaxCPU reuturns maximum cpu func (oc *OcRunner) MaxCPU(componentName string, appName string, project string) string { - maxMemory := CmdShouldPass(oc.path, "get", "dc", componentName+"-"+appName, "--namespace", project, + maxCPU := CmdShouldPass(oc.path, "get", "dc", componentName+"-"+appName, "--namespace", project, "-o", "go-template='{{range.spec.template.spec.containers}}{{.resources.limits.cpu}}{{end}}'") - return maxMemory + return maxCPU } -// MinCPU reuturns maximum cpu +// MinCPU reuturns minimum cpu func (oc *OcRunner) MinCPU(componentName string, appName string, project string) string { - minMemory := CmdShouldPass(oc.path, "get", "dc", componentName+"-"+appName, "--namespace", project, + minCPU := CmdShouldPass(oc.path, "get", "dc", componentName+"-"+appName, "--namespace", project, "-o", "go-template='{{range.spec.template.spec.containers}}{{.resources.requests.cpu}}{{end}}'") - return minMemory + return minCPU } // SourceTypeDC returns the source type from the deployment config diff --git a/tests/integration/component.go b/tests/integration/component.go index 4b40cd3e1c9..a99196e0fe1 100644 --- a/tests/integration/component.go +++ b/tests/integration/component.go @@ -687,7 +687,8 @@ func componentTests(args ...string) { helper.CmdShouldPass("odo", "config", "set", "--env", "FOO=BAR") helper.CmdShouldPass("odo", append(args, "push")...) helper.ValidateLocalCmpExist(context, "Type,nodejs", "Name,"+componentName, "Application,"+appName, "Ports,[8080/TCP]", "Envs,0,Name,FOO") - + ports := oc.GetDcPorts(componentName, appName, project) + Expect(ports).To(ContainSubstring("8080")) dcName := oc.GetDcName(componentName, project) stdOut := helper.CmdShouldPass("oc", "get", "dc/"+dcName, "-n", project, "-o", "go-template={{ .spec.template.spec }}{{.env}}") Expect(stdOut).To(ContainSubstring("FOO"))