Refactor manotypes:vnf-configuration
1) Rename manotypes:vnf-configuration to manotypes:vca-configuration
2) Add manotypes:vca-configuration to the VDU to support multi-VDU scenarios
3) Add support for relations to the juju container
Signed-off-by: Adam Israel <adam.israel@canonical.com>
Change-Id: I3ac6d483284dcf68141d5031ce94e8b915d35107
diff --git a/models/yang/vnfr.yang b/models/yang/vnfr.yang
index f228f1d..773cc95 100644
--- a/models/yang/vnfr.yang
+++ b/models/yang/vnfr.yang
@@ -1,6 +1,6 @@
/*
- *
+ *
* Copyright 2016 RIFT.IO Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -69,10 +69,10 @@
key "name";
uses manotypes:placement-group-info;
uses manotypes:placement-group-input;
- }
+ }
}
-
-
+
+
grouping virtual-interface {
container virtual-interface {
description
@@ -192,8 +192,8 @@
leaf create-time {
description
- "Creation timestamp of this Virtual Network
- Function. The timestamp is expressed as
+ "Creation timestamp of this Virtual Network
+ Function. The timestamp is expressed as
seconds since unix epoch - 1970-01-01T00:00:00Z";
type uint32;
@@ -213,7 +213,9 @@
}
// Use parameters provided here to configure this VNF
- uses manotypes:vnf-configuration;
+ container vnf-configuration {
+ uses manotypes:vca-configuration;
+ }
// Mainly used by Mon-params & dashboard url
container mgmt-interface {
@@ -351,6 +353,10 @@
uses manotypes:supplemental-boot-data;
+ container vdu-configuration {
+ uses manotypes:vca-configuration;
+ }
+
list volumes {
key "name";
@@ -445,7 +451,7 @@
}
leaf operational-status {
description
- "The operational status of the VDU
+ "The operational status of the VDU
init : The VDU has just started.
vm-init-phase : The VDUs in the VNF is being created in VIM.
vm-alloc-pending : The VM alloc is pending in VIM
@@ -566,4 +572,3 @@
}
}
}
-