summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Changelog.md12
-rw-r--r--csarvalidation/pom.xml2
-rw-r--r--csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR130206.java2
-rw-r--r--csarvalidation/src/main/resources/vnfreqs.properties2
-rw-r--r--csarvalidation/src/test/java/org/onap/cvc/csar/CsarValidatorTest.java4
-rw-r--r--csarvalidation/src/test/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR130206IntegrationTest.java6
-rw-r--r--deployment/pom.xml2
-rw-r--r--pom.xml2
-rw-r--r--releases/1.2.7-maven.yaml5
-rw-r--r--releases/1.2.8-maven.yaml5
-rw-r--r--version.properties2
11 files changed, 33 insertions, 11 deletions
diff --git a/Changelog.md b/Changelog.md
index fa623b9..bb971dc 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -32,4 +32,14 @@ All notable changes to this project will be documented in this file.
### 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 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
+
+## [1.2.8]
+
+## Fixed
+- Fixed VNFSDK doesn't check if all files in package are listed in manifest file
+ - https://jira.onap.org/browse/VNFSDK-583
+
+## [1.2.9]
diff --git a/csarvalidation/pom.xml b/csarvalidation/pom.xml
index 863f6f4..3c9bd5c 100644
--- a/csarvalidation/pom.xml
+++ b/csarvalidation/pom.xml
@@ -14,7 +14,7 @@
<parent>
<groupId>org.onap.vnfsdk.validation</groupId>
<artifactId>validation</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.9-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>validation-csar</artifactId>
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 class VTPValidateCSARR130206 extends VTPValidateCSARBase {
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/main/resources/vnfreqs.properties b/csarvalidation/src/main/resources/vnfreqs.properties
index a6d8d31..01fa8ae 100644
--- a/csarvalidation/src/main/resources/vnfreqs.properties
+++ b/csarvalidation/src/main/resources/vnfreqs.properties
@@ -1,5 +1,5 @@
vnfreqs.enabled=r01123,r02454,r04298,r07879,r09467,r10087,r13390,r15837,r17852,r21322,r23823,r26881,r26885,r27310,r32155,r35851,r35854,r40293,r40820,r43958,r46527,r51347,r54356,r65486,r67895,r66070,r77707,r77786,r87234,r95321,r130206,r787965
-pnfreqs.enabled=r10087,r15837,r17852,r35854,r57019,r87234,r130206,r146092,r293901,r787965,r972082
+pnfreqs.enabled=r01123,r10087,r15837,r17852,r35854,r57019,r87234,r130206,r146092,r293901,r787965,r972082
# ignored all chef and ansible related tests
vnferrors.ignored=0x1005,0x1006,r07879-0x1000,r13390-0x1000,r27310-0x1000,r40293-0x1000,r77786-0x1000,r04298-0x1000,r07879-0x1000,r10087-0x1000,r13390-0x1000,r23823-0x1000,r26881-0x1000,r40820-0x1000,r35851-0x1000,r32155-0x1000,r54356-0x1000,r67895-0x1000,r95321-0x1000,r46527-0x1000,r02454-0x1000
pnferrors.ignored=0x1006,r130206-0x1006
diff --git a/csarvalidation/src/test/java/org/onap/cvc/csar/CsarValidatorTest.java b/csarvalidation/src/test/java/org/onap/cvc/csar/CsarValidatorTest.java
index 2c39f74..ecdd6fe 100644
--- a/csarvalidation/src/test/java/org/onap/cvc/csar/CsarValidatorTest.java
+++ b/csarvalidation/src/test/java/org/onap/cvc/csar/CsarValidatorTest.java
@@ -35,6 +35,7 @@ import static org.onap.cvc.csar.cc.sol004.IntegrationTestUtils.absoluteFilePath;
public class CsarValidatorTest {
public static final String NO_CERTIFICATE_RULE = "r130206";
+ public static final String NO_ALL_FILES_LISTED_IN_MANIFEST = "r01123";
public static final String OPERATION_STATUS_FAILED = "FAILED";
@Test
@@ -93,8 +94,9 @@ public class CsarValidatorTest {
// then
final OnapCommandResult onapCommandResult = cli.getCommandResult();
verifyThatOperation(onapCommandResult, OPERATION_STATUS_FAILED);
- verifyThatXRulesFails(onapCommandResult, 1);
+ verifyThatXRulesFails(onapCommandResult, 2);
verifyThatRuleFails(onapCommandResult, NO_CERTIFICATE_RULE);
+ verifyThatRuleFails(onapCommandResult, NO_ALL_FILES_LISTED_IN_MANIFEST);
verifyThatOperationFinishedWithoutAnyError(cli);
}
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 @@ public class VTPValidateCSARR130206IntegrationTest {
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 @@ public class VTPValidateCSARR130206IntegrationTest {
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 @@ public class VTPValidateCSARR130206IntegrationTest {
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"
);
}
diff --git a/deployment/pom.xml b/deployment/pom.xml
index d5cd9de..e492484 100644
--- a/deployment/pom.xml
+++ b/deployment/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.onap.vnfsdk.validation</groupId>
<artifactId>validation</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.9-SNAPSHOT</version>
</parent>
<artifactId>csarvalidation-deployment</artifactId>
diff --git a/pom.xml b/pom.xml
index b6cb314..14fb75e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.vnfsdk.validation</groupId>
<artifactId>validation</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.9-SNAPSHOT</version>
<name>vnfsdk-validation</name>
<packaging>pom</packaging>
diff --git a/releases/1.2.7-maven.yaml b/releases/1.2.7-maven.yaml
new file mode 100644
index 0000000..9fc362a
--- /dev/null
+++ b/releases/1.2.7-maven.yaml
@@ -0,0 +1,5 @@
+---
+distribution_type: maven
+version: '1.2.7'
+project: 'vnfsdk-validation'
+log_dir: 'vnfsdk-validation-maven-stage-master/373' \ No newline at end of file
diff --git a/releases/1.2.8-maven.yaml b/releases/1.2.8-maven.yaml
new file mode 100644
index 0000000..7ba12e7
--- /dev/null
+++ b/releases/1.2.8-maven.yaml
@@ -0,0 +1,5 @@
+---
+distribution_type: maven
+version: '1.2.8'
+project: 'vnfsdk-validation'
+log_dir: 'vnfsdk-validation-maven-stage-master/375'
diff --git a/version.properties b/version.properties
index 42ee89e..2b0b934 100644
--- a/version.properties
+++ b/version.properties
@@ -5,7 +5,7 @@
major=1
minor=2
-patch=7
+patch=9
base_version=${major}.${minor}.${patch}