diff options
| author |   Paira, Saurav (sp694w) <sp694w@att.com> | 2020-07-09 12:27:36 -0400 |
|---|---|---|
| committer | Paira, Saurav (sp694w) <sp694w@att.com> | 2020-07-09 12:52:13 -0400 |
| commit | f0318b256f3c94b98765569fa618878692a9949b (patch) | |
| tree | ec5af24436c4122bed891fecb924a8b54daf7212 | |
| parent | 56c57f2e215787fd1189e077e4dd91da9db099ca (diff) | |
Added x-onap-requestorid to common-header for LCM commands
Issue-ID: APPC-1899
Signed-off-by: Paira, Saurav (sp694w) <sp694w@att.com>
Change-Id: I320196f0357a929c8e88645c4a3ab6dec3052587
4 files changed, 19 insertions, 1 deletions
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml index 0de5ce71f..f3b0184e6 100644 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml +++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml @@ -221,6 +221,11 @@ <scope>provided</scope> </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + </dependencies> <build> diff --git a/appc-client/code-generator/src/main/resources/templates/client-kit/pojo.ftl b/appc-client/code-generator/src/main/resources/templates/client-kit/pojo.ftl index 1be2d1173..c5854ef25 100644 --- a/appc-client/code-generator/src/main/resources/templates/client-kit/pojo.ftl +++ b/appc-client/code-generator/src/main/resources/templates/client-kit/pojo.ftl @@ -27,6 +27,8 @@ */ package ${meta.model\.package}; +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility; import com.fasterxml.jackson.annotation.JsonProperty; <#if pojo.description??> @@ -35,6 +37,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; */ </#if> <@generated/> +@JsonAutoDetect(fieldVisibility = Visibility.ANY, getterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE) public class ${objectName} { <#assign properties = pojo.properties> diff --git a/appc-client/pom.xml b/appc-client/pom.xml index 08d421ed1..5db3365a3 100644 --- a/appc-client/pom.xml +++ b/appc-client/pom.xml @@ -54,7 +54,7 @@ <cambria.client.version>0.0.1</cambria.client.version> <eelf.core.version>1.0.0</eelf.core.version> <eelf.version>1.0.0</eelf.version> - <freemarker.version>2.3.23</freemarker.version> + <freemarker.version>2.3.30</freemarker.version> <java.version>1.8</java.version> <junit.version>4.12</junit.version> <maven.compiler.plugin.version>3.6.0</maven.compiler.plugin.version> diff --git a/appc-provider/appc-provider-model/src/main/yang/appc-provider-lcm.yang b/appc-provider/appc-provider-model/src/main/yang/appc-provider-lcm.yang index 035fca223..c60ce1658 100644 --- a/appc-provider/appc-provider-model/src/main/yang/appc-provider-lcm.yang +++ b/appc-provider/appc-provider-model/src/main/yang/appc-provider-lcm.yang @@ -238,6 +238,16 @@ module appc-provider-lcm { mandatory false; } + leaf x-onap-requestorid { + description "This is the user who initiated the LCM action. The content of the + header should be in the format of attuid@domain or mechid@domain. + If id or domain is missing, return an error. This parameter is + mandatory for v2.01 and optional for v2.00. The Yang model has it as + optional and software makes determination"; + type string; + mandatory false; + } + /********************************************************************************** * Flags are generic flags that apply to any and all commands, all are optional |