From 8a993403792afd08addfe950d85b3a335b24d1b7 Mon Sep 17 00:00:00 2001
From: Philip Joseph <philip.joseph@riftio.com>
Date: Tue, 8 Nov 2016 04:45:12 +0000
Subject: [PATCH] Model changes for VNF access point support

Merging changes by: Rajesh Velandy <rajesh.velandy@riftio.com>

Signed-off-by: Philip Joseph <philip.joseph@riftio.com>
---
 models/plugins/yang/mano-types.yang | 16 ++++++++++++
 models/plugins/yang/nsd.yang        | 40 +++++++++++++++++++++++++++++
 models/plugins/yang/vnfd.yang       |  5 ++++
 3 files changed, 61 insertions(+)

diff --git a/models/plugins/yang/mano-types.yang b/models/plugins/yang/mano-types.yang
index e72af47a..bfda23a4 100644
--- a/models/plugins/yang/mano-types.yang
+++ b/models/plugins/yang/mano-types.yang
@@ -125,6 +125,22 @@ module mano-types
       type boolean;
       default false;
     }
+    leaf parameter-type {
+      description "Type of this parameter, whether this in IN or OUT";
+      type enumeration {
+	enum OUT;
+	enum IN;
+      }
+      default "IN";
+    }
+    leaf parameter-path {
+      description "A Leafref to the parameter path with the attribute selection.
+                   At present only attribute ip-address() is supported.
+                   For example, to get the ip address of VNF connection point
+                   the xpath would look something along the following lines,
+                   /vnfd-catalog/vnfd[id='x']/connection-point[name='cp']/ip-address()";
+      type string;
+    }
   }
   
 
diff --git a/models/plugins/yang/nsd.yang b/models/plugins/yang/nsd.yang
index 494acf4b..8808dafc 100644
--- a/models/plugins/yang/nsd.yang
+++ b/models/plugins/yang/nsd.yang
@@ -289,6 +289,46 @@ module nsd
         }
       }
 
+      list vnfap-map {
+        key "id";
+        description "A mapping of VNF application point 
+                     capability/dependency within this network service";
+        leaf id {
+          description "Identfier for VNF access point map";
+          type string;
+        }
+        container capability {
+          leaf member-vnf-index-ref {
+            description "Reference to member-vnf within constituent-vnfds";
+            type leafref {
+              path "../../../../constituent-vnfd/member-vnf-index";
+            }
+          }
+          leaf capability-ref {
+            description "Reference to the capability with the capability of the VNF
+                         with the specified member-vnf-index";
+            type leafref {
+              path "/vnfd:vnfd-catalog/vnfd:vnfd/vnfd:vnfap/vnfd:capability/vnfd:name";
+            }
+          }
+        }
+        container dependency {
+          leaf member-vnf-index-ref {
+            description "Reference to member-vnf within constituent-vnfds";
+            type leafref {
+              path "../../../../constituent-vnfd/member-vnf-index";
+            }
+          }
+          leaf dependency-ref {
+            description "Reference to the dependency within the dependency of the VNF
+                         with the specified member-vnf-index";
+            type leafref {
+              path "/vnfd:vnfd-catalog/vnfd:vnfd/vnfd:vnfap/vnfd:dependency/vnfd:name";
+            }
+          }
+        }
+      }
+
       // replicate for pnfd container here
       uses manotypes:provider-network;
 
diff --git a/models/plugins/yang/vnfd.yang b/models/plugins/yang/vnfd.yang
index 279a4b85..946b446b 100644
--- a/models/plugins/yang/vnfd.yang
+++ b/models/plugins/yang/vnfd.yang
@@ -674,6 +674,11 @@ module vnfd
       key "id";
 
       uses vnfd-descriptor;
+<<<<<<< 06c19bf9f52cb8fa2c61d4135e0ab237b4f4d7d5
+=======
+
+      uses vnf-access-point;
+>>>>>>> Model changes for VNF access point support
     }
   }
 }
-- 
2.25.1