From 04c464ac12f3af31f24bc1559b77037aa5306279 Mon Sep 17 00:00:00 2001
From: YuanHu <yuan.hu1@zte.com.cn>
Date: Mon, 10 Oct 2016 11:54:30 +0800
Subject: Modify the request parameter from extensionList to extension, while
 call tosca-yaml-parser.

Change-Id: Ie00fbca7ab2d3e71c72ff58715ff09c0df874506
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
---
 .../catalog/model/common/TemplateUtils.java         | 21 ++++++++++-----------
 .../yaml/zte/entity/ParseYamlRequestParemeter.java  | 10 +++++-----
 2 files changed, 15 insertions(+), 16 deletions(-)

(limited to 'catalog-core')

diff --git a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/common/TemplateUtils.java b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/common/TemplateUtils.java
index 03352f79..e1e89d19 100644
--- a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/common/TemplateUtils.java
+++ b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/common/TemplateUtils.java
@@ -15,9 +15,18 @@
  */
 package org.openo.commontosca.catalog.model.common;
 
+import org.openo.commontosca.catalog.db.exception.CatalogResourceException;
+import org.openo.commontosca.catalog.model.parser.yaml.yamlmodel.Plan;
+import org.openo.commontosca.catalog.model.parser.yaml.yamlmodel.ServiceTemplate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.esotericsoftware.yamlbeans.YamlConfig;
+import com.esotericsoftware.yamlbeans.YamlException;
+import com.esotericsoftware.yamlbeans.YamlReader;
+
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
-import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -28,16 +37,6 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 import java.util.zip.ZipInputStream;
 
-import org.openo.commontosca.catalog.db.exception.CatalogResourceException;
-import org.openo.commontosca.catalog.model.parser.yaml.yamlmodel.Plan;
-import org.openo.commontosca.catalog.model.parser.yaml.yamlmodel.ServiceTemplate;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.esotericsoftware.yamlbeans.YamlConfig;
-import com.esotericsoftware.yamlbeans.YamlException;
-import com.esotericsoftware.yamlbeans.YamlReader;
-
 public class TemplateUtils {
   private static final Logger logger = LoggerFactory.getLogger(TemplateUtils.class);
   
diff --git a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/zte/entity/ParseYamlRequestParemeter.java b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/zte/entity/ParseYamlRequestParemeter.java
index 049d8a3e..e598ef73 100644
--- a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/zte/entity/ParseYamlRequestParemeter.java
+++ b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/zte/entity/ParseYamlRequestParemeter.java
@@ -20,7 +20,7 @@ import java.util.List;
 public class ParseYamlRequestParemeter {
   private String path = "E:\\NFVO\\130. yaml2xml\\0. tosca-parser\\sample\\ag-vnfd-floatingIp.zip";
 
-  private List<Extension> extensionList;
+  private List<Extension> extension;
 
   public String getPath() {
     return path;
@@ -30,12 +30,12 @@ public class ParseYamlRequestParemeter {
     this.path = path;
   }
 
-  public List<Extension> getExtensionList() {
-    return extensionList;
+  public List<Extension> getExtension() {
+    return extension;
   }
 
-  public void setExtensionList(List<Extension> extensionList) {
-    this.extensionList = extensionList;
+  public void setExtension(List<Extension> extension) {
+    this.extension = extension;
   }
 
   public Extension createExtension() {
-- 
cgit 1.2.3-korg