Update test cases to fix the TOSCA issues

Issue-ID: VNFSDK-352

Change-Id: I058dbe23a02244b90f3e9d58c136960249c7ffdf
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>

2 files changed, 1 insertions, 70 deletions

diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR01123.java b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR01123.java
index 8fc216b..a34196e 100644
--- a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR01123.java
+++ b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR01123.java
@@ -21,7 +21,7 @@ import org.onap.cvc.csar.CSARArchive;
 import org.onap.cvc.csar.CSARArchive.CSARErrorEntryMissing;
 import org.onap.cvc.csar.cc.VTPValidateCSARBase;
 
-@OnapCommandSchema(schema = "vtp-validate-csar-01123.yaml")
+@OnapCommandSchema(schema = "vtp-validate-csar-r01123.yaml")
 public class VTPValidateCSARR01123 extends VTPValidateCSARBase {
 
     public static class CSARErrorEntryVNFProviderDetailsNotFound extends CSARErrorEntryMissing {
diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR02454.java b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR02454.java
deleted file mode 100644
index 14998f5..0000000
--- a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR02454.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright 2017 Huawei Technologies Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.onap.cvc.csar.cc.sol004;
-
-import java.io.FileInputStream;
-import java.util.Map;
-
-import org.onap.cli.fw.schema.OnapCommandSchema;
-import org.onap.cvc.csar.CSARArchive;
-import org.onap.cvc.csar.CSARArchive.CSARErrorEntryMissing;
-import org.onap.cvc.csar.cc.VTPValidateCSARBase;
-import org.yaml.snakeyaml.Yaml;
-
-@OnapCommandSchema(schema = "vtp-validate-csar-r02454.yaml")
-public class VTPValidateCSARR02454 extends VTPValidateCSARBase {
-
-    public static class CSARErrorEntryMissingSwImage extends CSARErrorEntryMissing {
-        public CSARErrorEntryMissingSwImage(String defYaml, String entry) {
-            super(entry, defYaml);
-            this.setCode("0x1000");
-        }
-    }
-
-    @Override
-    protected String getVnfReqsNo() {
-        return "R02454";
-    }
-
-    @Override
-    protected void validateCSAR(CSARArchive csar) throws Exception {
-        try(FileInputStream ipStream = new FileInputStream(csar.getDefinitionYamlFile())) {
-            Map<String, ?> yaml = (Map<String, ?>) new Yaml().load(ipStream);
-            yaml = (Map<String, ?>) yaml.get("topology_template");
-            Map<String, ?> nodeTmpls = (Map<String,?>) yaml.get("node_templates");
-
-            boolean vlExist = false;
-
-            for (Object nodeO: nodeTmpls.values()) {
-                Map<String, ?> node = (Map<String, ?>) nodeO;
-                if (node.containsKey("type")) {
-                    String type = (String)node.get("type");
-                    if (type.equalsIgnoreCase("tosca.artifacts.nfv.SwImage")) {
-                        vlExist = true;
-                        break;
-                    }
-                }
-            }
-
-            if (!vlExist)
-            this.errors.add(new CSARErrorEntryMissingSwImage(
-                    csar.getDefinitionYamlFile().getName(),
-                    "Software Image"));
-        }
-    }
-}