Fixes to tests

Change-Id: Ife159ce00d501c8f0e00dc3cbc5a9f447d2b8ca4
Issue-ID: SDC-2028
Signed-off-by: ilanap <ilanap@amdocs.com>

5 files changed, 8 insertions, 16 deletions

diff --git a/cucumber-js-test-apis-ci/config.json b/cucumber-js-test-apis-ci/config.json
index 35c31272c1..00c6552482 100644
--- a/cucumber-js-test-apis-ci/config.json
+++ b/cucumber-js-test-apis-ci/config.json
@@ -3,16 +3,10 @@
 
   "onboarding" : {
     "port" : "onboarding.port",
-    "prefix" : "sdc1/feProxy/onboarding-api/v1.0",
+    "prefix" : "onboarding-api/v1.0",
     "server" : "onboarding.server",
     "user" : "onboarding.user"
   },
-  "vf" : {
-    "port" : "vf.port",
-    "prefix" : "sdc1/feProxy/rest/v1",
-    "server" : "vf.server",
-    "user" : "vf.user"
-  },
   "catalog" : {
     "port" : "CatalogBE.port",
     "prefix" : "sdc2/rest/v1",
diff --git a/cucumber-js-test-apis-ci/docker/startup.sh b/cucumber-js-test-apis-ci/docker/startup.sh
index f38acad8c7..3170411ae5 100644
--- a/cucumber-js-test-apis-ci/docker/startup.sh
+++ b/cucumber-js-test-apis-ci/docker/startup.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 
 cd /var/lib/tests
+mkdir resources/downloads
 yarn install
 yarn run test-and-report
diff --git a/cucumber-js-test-apis-ci/docker_run.sh b/cucumber-js-test-apis-ci/docker_run.sh
index 0e52a6bcbd..da4c532490 100644
--- a/cucumber-js-test-apis-ci/docker_run.sh
+++ b/cucumber-js-test-apis-ci/docker_run.sh
@@ -22,9 +22,9 @@ echo "Workspace under: $WORKSPACE"
 if [ -z "$TEST_CI_BE_HOST" ]
 then
     TEST_CI_BE_HOST="$(ifconfig  'eth0' | sed -n '2p' | awk '{print $2}' | sed 's/addr://g')"
-    TEST_CI_BE_PORT=8285
+    TEST_CI_BE_PORT=8081
     TEST_CI_CATALOG_HOST=$TEST_CI_BE_HOST
-    TEST_CI_CATALOG_PORT=$TEST_CI_BE_PORT
+    TEST_CI_CATALOG_PORT=8080
     TEST_CI_AP_HOST=$TEST_CI_BE_HOST
     TEST_CI_AP_PORT=8080
 fi
@@ -62,9 +62,6 @@ echo "setting configuration"
 sed -i "s/onboarding.port/$TEST_CI_BE_PORT/g" $WORKSPACE/data/environments/dockerConfig.json
 sed -i "s/onboarding.server/$TEST_CI_BE_HOST/g" $WORKSPACE/data/environments/dockerConfig.json
 sed -i "s/onboarding.user/cs0008/g" $WORKSPACE/data/environments/dockerConfig.json
-sed -i "s/vf.port/$TEST_CI_BE_PORT/g" $WORKSPACE/data/environments/dockerConfig.json
-sed -i "s/vf.server/$TEST_CI_BE_HOST/g" $WORKSPACE/data/environments/dockerConfig.json
-sed -i "s/vf.user/cs0008/g" $WORKSPACE/data/environments/dockerConfig.json
 sed -i "s/CatalogBE.port/$TEST_CI_CATALOG_PORT/g" $WORKSPACE/data/environments/dockerConfig.json
 sed -i "s/CatalogBE.server/$TEST_CI_CATALOG_HOST/g" $WORKSPACE/data/environments/dockerConfig.json
 sed -i "s/CatalogBE.user/cs0008/g" $WORKSPACE/data/environments/dockerConfig.json
diff --git a/cucumber-js-test-apis-ci/stepDefinitions/InterfaceOperationSteps.js b/cucumber-js-test-apis-ci/stepDefinitions/InterfaceOperationSteps.js
index abfad80ae4..3e2321963c 100644
--- a/cucumber-js-test-apis-ci/stepDefinitions/InterfaceOperationSteps.js
+++ b/cucumber-js-test-apis-ci/stepDefinitions/InterfaceOperationSteps.js
@@ -58,7 +58,7 @@ function makeType() {
 
 When('I want to create an Operation', function()  {
     let path = '/catalog/' + this.context.component.type + '/' + this.context.component.uniqueId + '/interfaceOperations';
-    let inputData = util.getJSONFromFile('resources/json/interfaceoperation/createInterfaceOperations.json');
+    let inputData = util.getJSONFromFile('resources/json/interfaceOperation/createInterfaceOperations.json');
     var operationName = makeType();
     var interfaceType = makeType();
     inputData.interfaces.interface1.type = interfaceType;
@@ -78,7 +78,7 @@ When('I want to create an Operation', function()  {
 });
 
 When('I want to update an Operation', function () {
-    let inputData = util.getJSONFromFile('resources/json/interfaceoperation/updateInterfaceOperation.json');
+    let inputData = util.getJSONFromFile('resources/json/interfaceOperation/updateInterfaceOperation.json');
     let path = '/catalog/'+ this.context.component.type + '/'+ this.context.component.uniqueId +'/interfaceOperations';
     inputData.interfaces.interface1.operations.delete.uniqueId = this.context.interface.operationUniqueId;
     inputData.interfaces.interface1.type=this.context.interface.interfaceType;
diff --git a/cucumber-js-test-apis-ci/stepDefinitions/VF_steps.js b/cucumber-js-test-apis-ci/stepDefinitions/VF_steps.js
index 3411a25fcb..a24a90b0a5 100644
--- a/cucumber-js-test-apis-ci/stepDefinitions/VF_steps.js
+++ b/cucumber-js-test-apis-ci/stepDefinitions/VF_steps.js
@@ -29,7 +29,7 @@ Then('I want to create a VF for this Item', function () {
 	return util.request(this.context, 'GET', '/vendor-software-products/' + this.context.item.id + '/versions/' + this.context.item.versionId).then(result => {
 		this.context.inputData = util.getJSONFromFile('resources/json/createVF.json');
 		// start replacing stuff
-		this.context.inputData.contactId = this.context.headers['vf']["USER_ID"];
+		this.context.inputData.contactId = this.context.headers['catalog']["USER_ID"];
 		this.context.inputData.categories[0].uniqueId = result.data.category;
 		this.context.inputData.categories[0].subcategories[0].uniqueId = result.data.subCategory;
 		this.context.inputData.description = result.data.description;
@@ -37,7 +37,7 @@ Then('I want to create a VF for this Item', function () {
 		this.context.inputData.tags[0] = result.data.name;
 		this.context.inputData.vendorName = result.data.vendorName;
 		this.context.inputData.csarUUID = this.context.item.id;
-		return util.request(this.context, 'POST', '/catalog/resources', this.context.inputData, false, 'vf');
+		return util.request(this.context, 'POST', '/catalog/resources', this.context.inputData, false, 'catalog');
 	});
 });