Modification for co-debug with aria parser.

Change-Id: I4839aab6651149d5b167c4cc452d922a5af878c7
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>

1 files changed, 124 insertions, 48 deletions

diff --git a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/aria/entity/AriaParserResult.java b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/aria/entity/AriaParserResult.java
index b610ecd9..f24e0c99 100644
--- a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/aria/entity/AriaParserResult.java
+++ b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/aria/entity/AriaParserResult.java
@@ -24,8 +24,6 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import com.google.gson.JsonObject;
-
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
@@ -33,57 +31,48 @@ public class AriaParserResult {
   private String description;
   private Map<String, String> metadata;
   private Node[] nodes;
-  private JsonObject groups;
-  private JsonObject policies;
+  private Group[] groups;
+  private Policy[] policies;
   private Substitution substitution;
   private Map<String, Input> inputs;
   private Map<String, Output> outpus;
   
-  @Data
-  public class Substitution {
-    private String node_type_name;
-    private Mapping[] requirement;
-    private Mapping[] capabilities;
-    
-    @Data
-    public class Mapping {
-      private String mapped_name;
-      private String node_id;
-      private String name;
-      
-    }
-  }
-
-  @Data
-  public class Input {
-    private String type_name;
-    private Object value;
-    private String description;
-  }
   
   @Data
-  public class Output {
-    private String type_name;
-    private Object value;
-    private String description;
-  }
-
-  @Data
   public class Node {
     private String id;
-    private String name;
     private String type_name;
+    private String template_name;
     private Map<String, Property> properties;
-    private JsonObject[] interfaces;
-    private JsonObject[] artifacts;
-    private JsonObject[] capabilities;
+    private Interface[] interfaces;
+    private Artifact[] artifacts;
+    private Capability[] capabilities;
     private Relationship[] relationships;
     
     @Data
-    public class Property {
+    public class Artifact {
+      private String name;
+      private String type_name;
+      private String source_path;
+      private String target_path;
+      private String repository_url;
+      private Credential repository_credential;
+      private Map<String, Property> properties;
+      
+      @Data
+      public class Credential {
+        private String protocol;
+        private String token_type;
+        private Map<String, String> keys;
+        private String user;
+      }
+    }
+    
+    @Data
+    public class Capability {
+      private String name;
       private String type_name;
-      private Object value;
-      private String description;
+      private Map<String, Property> properties;
     }
 
     @Data
@@ -93,15 +82,8 @@ public class AriaParserResult {
       private String type_name;
       private String template_name;
       private Map<String, Property> properties;
-      private JsonObject[] source_interfaces;
-      private JsonObject[] target_interfaces;
-      
-      @Data
-      public class Property {
-        private String type_name;
-        private Object value;
-        private String description;
-      }
+      private Interface[] source_interfaces;
+      private Interface[] target_interfaces;
     }
 
     /**
@@ -120,4 +102,98 @@ public class AriaParserResult {
       return ret;
     }
   }
+  
+  @Data
+  public class Group {
+    private String id;
+    private String type_name;
+    private String template_name;
+    private Map<String, Property> properties;
+    private Interface[] interfaces;
+    private GroupPolicy[] policies;
+    private String[] member_node_ids;
+    
+    @Data
+    public class GroupPolicy {
+      private String id;
+      private String type_name;
+      private Map<String, Property> properties;
+      private Trigger[] triggers;
+      
+      @Data
+      public class Trigger {
+        private String name;
+        private String implementation;
+        private Map<String, Property> properties;
+      }
+    }
+    
+  }
+
+  
+  @Data
+  public class Policy {
+    private String name;
+    private String type_name;
+    private Map<String, Property> properties;
+    private String[] target_node_ids;
+    private String[] target_group_ids;
+  }
+  
+  @Data
+  public class Substitution {
+    private String node_type_name;
+    private Mapping[] requirement;
+    private Mapping[] capabilities;
+    
+    @Data
+    public class Mapping {
+      private String mapped_name;
+      private String node_id;
+      private String name;
+      
+    }
+  }
+
+  @Data
+  public class Input {
+    private String type_name;
+    private Object value;
+    private String description;
+  }
+  
+  @Data
+  public class Output {
+    private String type_name;
+    private Object value;
+    private String description;
+  }
 }
+
+
+@Data
+class Property {
+  private String type_name;
+  private Object value;
+  private String description;
+}
+
+@Data
+class Interface {
+  private String name;
+  private String type_name;
+  private Map<String, Property> inputs;
+  private Operation[] operation;
+  
+  @Data
+  class Operation {
+    private String name;
+    private String implementation;
+    private String[] dependencies;
+    private String executor;
+    private int max_retries;
+    private int retry_interval;
+    private Map<String, Property> inputs;
+  }
+}
+