Merge "Add new release file 1.2.7"
diff --git a/Changelog.md b/Changelog.md
index fa623b9..fb1ada9 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -32,4 +32,8 @@
### Fixed
- Fixed bug that was causing problem with loading rules properties.
- - https://jira.onap.org/browse/VNFSDK-587
\ No newline at end of file
+ - https://jira.onap.org/browse/VNFSDK-587
+- Fixed VNFSDK doesn't check if all files in package are listed in manifest file
+ - https://jira.onap.org/browse/VNFSDK-583
+- Fixed package security SOL004 Option 1 make rule less restrictive as this rule is not implemented in SDC Onboarding
+ - https://jira.onap.org/browse/VNFSDK-595
\ No newline at end of file
diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR130206.java b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR130206.java
index 64eb878..41625a9 100644
--- a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR130206.java
+++ b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR130206.java
@@ -122,7 +122,7 @@
public static class CSARWarningNoSecurity extends CSARArchive.CSARErrorWarning{
CSARWarningNoSecurity(){
super(EMPTY_STRING, EMPTY_STRING,-1, EMPTY_STRING);
- this.message = "Warning. Consider adding security options (CMS and hash codes for sources) in manifest file.";
+ this.message = "Warning. Consider adding package integrity and authenticity assurance according to ETSI NFV-SOL 004 Security Option 1";
}
}
diff --git a/csarvalidation/src/test/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR130206IntegrationTest.java b/csarvalidation/src/test/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR130206IntegrationTest.java
index 0147c90..eef9881 100644
--- a/csarvalidation/src/test/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR130206IntegrationTest.java
+++ b/csarvalidation/src/test/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR130206IntegrationTest.java
@@ -92,7 +92,7 @@
List<CSARArchive.CSARError> errors = testCase.getErrors();
assertThat(errors.size()).isEqualTo(1);
assertThat(convertToMessagesList(errors)).contains(
- "Warning. Consider adding security options (CMS and hash codes for sources) in manifest file."
+ "Warning. Consider adding package integrity and authenticity assurance according to ETSI NFV-SOL 004 Security Option 1"
);
}
@@ -151,7 +151,7 @@
List<CSARArchive.CSARError> errors = testCase.getErrors();
assertThat(convertToMessagesList(errors)).contains(
"Unable to find cert file defined by Entry-Certificate!",
- "Warning. Consider adding security options (CMS and hash codes for sources) in manifest file.",
+ "Warning. Consider adding package integrity and authenticity assurance according to ETSI NFV-SOL 004 Security Option 1",
"Missing. Entry [tosca_definitions_version]"
);
}
@@ -170,7 +170,7 @@
List<CSARArchive.CSARError> errors = testCase.getErrors();
assertThat(convertToMessagesList(errors)).contains(
"Unable to find cert file defined by ETSI-Entry-Certificate!",
- "Warning. Consider adding security options (CMS and hash codes for sources) in manifest file."
+ "Warning. Consider adding package integrity and authenticity assurance according to ETSI NFV-SOL 004 Security Option 1"
);
}