From: Ofir Sonsino Date: Tue, 27 Feb 2018 13:34:04 +0000 (+0200) Subject: Verifying owning entity works E2E X-Git-Tag: v2.0.0~50 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=5a233ba6b2d258ed009e3515513679102e0b0eaa;p=vid.git Verifying owning entity works E2E Change-Id: I8669b5e28c6bea1bcacbb5fcc7101f2d7541909c Issue-ID: VID-176 Signed-off-by: Ofir Sonsino --- diff --git a/vid-app-common/src/main/java/org/onap/vid/asdc/rest/RestfulAsdcClient.java b/vid-app-common/src/main/java/org/onap/vid/asdc/rest/RestfulAsdcClient.java index 1fe9df185..1bdf9534a 100644 --- a/vid-app-common/src/main/java/org/onap/vid/asdc/rest/RestfulAsdcClient.java +++ b/vid-app-common/src/main/java/org/onap/vid/asdc/rest/RestfulAsdcClient.java @@ -22,6 +22,7 @@ package org.onap.vid.asdc.rest; import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; +import org.onap.portalsdk.core.util.SystemProperties; import org.onap.vid.asdc.AsdcCatalogException; import org.onap.vid.asdc.AsdcClient; import org.onap.vid.asdc.beans.Artifact; @@ -160,6 +161,7 @@ public class RestfulAsdcClient implements AsdcClient { commonHeaders = new MultivaluedHashMap(); commonHeaders.put("Authorization", Collections.singletonList((Object) (auth))); + commonHeaders.put("X-ECOMP-InstanceID", Collections.singletonList((Object) (SystemProperties.getProperty(SystemProperties.APP_DISPLAY_NAME)))); } private Path createTmpFile(InputStream csarInputStream) throws AsdcCatalogException { diff --git a/vid-app-common/src/main/java/org/onap/vid/controllers/VidController.java b/vid-app-common/src/main/java/org/onap/vid/controllers/VidController.java index 84ba587b2..da27cd993 100644 --- a/vid-app-common/src/main/java/org/onap/vid/controllers/VidController.java +++ b/vid-app-common/src/main/java/org/onap/vid/controllers/VidController.java @@ -107,6 +107,7 @@ public class VidController extends RestrictedBaseController { secureServices.setServices(aaiService.getServicesByDistributionStatus()); //Disable roles until AAF integration finishes //secureServices.setReadOnly(roleProvider.userPermissionIsReadOnly(roles)); + secureServices.setReadOnly(false); return secureServices; } catch (Exception t) {