rel3 IM fixes - removed references to rw-pb and corrected config-primitive instead of service-primitive
Signed-off-by: Rajesh <rajesh.velandy@riftio.com>
diff --git a/models/yang/mano-types.yang b/models/yang/mano-types.yang
index 81022ad..8950c7a 100644
--- a/models/yang/mano-types.yang
+++ b/models/yang/mano-types.yang
@@ -27,10 +27,6 @@
prefix "inet";
}
- import rw-pb-ext {
- prefix "rwpb";
- }
-
import rw-project {
prefix "rw-project";
}
@@ -241,7 +237,6 @@
}
}
-
grouping vca-configuration {
description
"Information about the VNF or VDU configuration. Note:
@@ -278,65 +273,61 @@
type string;
}
uses manotypes:vca-relationships;
-
}
}
+ }
+ list config-primitive {
+ description
+ "List of config primitives supported by the
+ configuration agent for this VNF or VDU.";
+ key "name";
- list service-primitive {
- rwpb:msg-new ServicePrimitive;
+ leaf name {
description
- "List of config primitives supported by the
- configuration agent for this VNF or VDU.";
+ "Name of the config primitive.";
+ type string;
+ }
+
+ list parameter {
+ description
+ "List of parameters to the config primitive.";
key "name";
-
- leaf name {
- description
- "Name of the config primitive.";
- type string;
- }
-
- list parameter {
- description
- "List of parameters to the config primitive.";
- key "name";
- uses primitive-parameter;
- }
-
- leaf user-defined-script {
- description
- "A user defined script. If user defined script is defined,
- the script will be executed using bash";
- type string;
- }
+ uses primitive-parameter;
}
- list initial-config-primitive {
- rwpb:msg-new InitialConfigPrimitive;
+ leaf user-defined-script {
description
- "Initial set of configuration primitives.";
- key "seq";
- leaf seq {
- description
- "Sequence number for the configuration primitive.";
- type uint64;
- }
+ "A user defined script. If user defined script is defined,
+ the script will be executed using bash";
+ type string;
+ }
+ }
- choice primitive-type {
- case primitive-definition {
- leaf name {
- description
- "Name of the configuration primitive.";
- type string;
- }
+ list initial-config-primitive {
+ description
+ "Initial set of configuration primitives.";
+ key "seq";
+ leaf seq {
+ description
+ "Sequence number for the configuration primitive.";
+ type uint64;
+ }
- uses primitive-parameter-value;
+ choice primitive-type {
+ case primitive-definition {
+ leaf name {
+ description
+ "Name of the configuration primitive.";
+ type string;
+ }
- leaf user-defined-script {
- description
- "A user defined script.";
- type string;
- }
+ uses primitive-parameter-value;
+
+ leaf user-defined-script {
+ description
+ "A user defined script.";
+ type string;
}
}
}
@@ -1959,7 +1950,6 @@
}
list user {
- rwpb:msg-new CloudConfigUser;
key "name";
description "List of users to be added through cloud-config";
diff --git a/models/yang/nsd-base.yang b/models/yang/nsd-base.yang
index 6c852cb..c332869 100644
--- a/models/yang/nsd-base.yang
+++ b/models/yang/nsd-base.yang
@@ -23,10 +23,6 @@
namespace "http://riftio.com/ns/riftware-1.0/nsd-base";
prefix "nsd-base";
- import rw-pb-ext {
- prefix "rwpb";
- }
-
import ietf-inet-types {
prefix "inet";
}
@@ -578,7 +574,6 @@
uses manotypes:ip-profile-list;
list initial-service-primitive {
- rwpb:msg-new NsdInitialServicePrimitive;
description
"Initial set of service primitives for NSD.";
key "seq";
@@ -587,7 +582,6 @@
}
list terminate-service-primitive {
- rwpb:msg-new NsdTerminateServicePrimitive;
description
"Set of service primitives during
termination for NSD.";
@@ -743,11 +737,6 @@
default false;
}
- leaf ipv4-nat-pool-name{
- type string;
- description "IPV4 nat pool name";
- }
-
choice init-params {
description "Extra parameters for VLD instantiation";
diff --git a/models/yang/nsr.yang b/models/yang/nsr.yang
index 7597a6f..12cf850 100644
--- a/models/yang/nsr.yang
+++ b/models/yang/nsr.yang
@@ -23,10 +23,6 @@
namespace "urn:ietf:params:xml:ns:yang:nfvo:nsr";
prefix "nsr";
- import rw-pb-ext {
- prefix "rwpb";
- }
-
import vlr {
prefix "vlr";
}
@@ -76,6 +72,34 @@
"Derived from earlier versions of base YANG files";
}
+ typedef vnffgr-operational-status {
+ type enumeration {
+ enum init;
+ enum running;
+ enum terminate;
+ enum terminated;
+ enum failed;
+ }
+ }
+
+ typedef ns-operational-status {
+ type enumeration {
+ enum init;
+ enum vl-init-phase;
+ enum vnf-init-phase;
+ enum running;
+ enum terminate;
+ enum vnf-terminate-phase;
+ enum vl-terminate-phase;
+ enum terminated;
+ enum failed;
+ enum scaling-out;
+ enum scaling-in;
+ enum vl-instantiate;
+ enum vl-terminate;
+ }
+ }
+
typedef config-states {
type enumeration {
enum init;
@@ -378,15 +402,7 @@
terminated : The VNFFGR is in the terminated state.
failed : The VNFFGR instantiation failed
";
-
- type enumeration {
- rwpb:enum-type "VnffgrOperationalStatus";
- enum init;
- enum running;
- enum terminate;
- enum terminated;
- enum failed;
- }
+ type vnffgr-operational-status;
}
list rsp {
@@ -507,13 +523,9 @@
type string;
}
leaf port-id {
- rwpb:field-inline "true";
- rwpb:field-string-max 64;
type string;
}
leaf vm-id {
- rwpb:field-inline "true";
- rwpb:field-string-max 64;
type string;
}
leaf address {
@@ -598,13 +610,9 @@
}
}
leaf port-id {
- rwpb:field-inline "true";
- rwpb:field-string-max 64;
type string;
}
leaf vm-id {
- rwpb:field-inline "true";
- rwpb:field-string-max 64;
type string;
}
leaf ip-address {
@@ -856,21 +864,7 @@
vl-terminate : The NS is terminating a VL
";
- type enumeration {
- enum init;
- enum vl-init-phase;
- enum vnf-init-phase;
- enum running;
- enum terminate;
- enum vnf-terminate-phase;
- enum vl-terminate-phase;
- enum terminated;
- enum failed;
- enum scaling-out;
- enum scaling-in;
- enum vl-instantiate;
- enum vl-terminate;
- }
+ type ns-operational-status;
}
leaf config-status {
@@ -960,7 +954,6 @@
}
list initial-service-primitive {
- rwpb:msg-new NsrInitialServicePrimitive;
description
"Initial set of service primitives for NSD.";
key "seq";
@@ -969,7 +962,6 @@
}
list terminate-service-primitive {
- rwpb:msg-new NsrTerminateServicePrimitive;
description
"Set of service primitives to
execute during termination of NSD.";
diff --git a/models/yang/vlr.yang b/models/yang/vlr.yang
index 616bad0..6a9b591 100644
--- a/models/yang/vlr.yang
+++ b/models/yang/vlr.yang
@@ -23,10 +23,6 @@
namespace "urn:ietf:params:xml:ns:yang:nfvo:vlr";
prefix "vlr";
- import rw-pb-ext {
- prefix "rwpb";
- }
-
import ietf-yang-types {
prefix "yang";
}
@@ -182,7 +178,6 @@
";
type enumeration {
- rwpb:enum-type "VlOperationalStatus";
enum init;
enum vl-alloc-pending;
enum running;
diff --git a/models/yang/vnfr.yang b/models/yang/vnfr.yang
index d47c6a7..ebccf12 100644
--- a/models/yang/vnfr.yang
+++ b/models/yang/vnfr.yang
@@ -27,10 +27,6 @@
prefix "manotypes";
}
- import rw-pb-ext {
- prefix "rwpb";
- }
-
import vnfd-base {
prefix "vnfd-base";
}
@@ -72,6 +68,34 @@
"Derived from earlier versions of base YANG files";
}
+ typedef vdu-operational-status {
+ type enumeration {
+ enum init;
+ enum vm-init-phase;
+ enum vm-alloc-pending;
+ enum running;
+ enum terminate;
+ enum vl-terminate-phase;
+ enum terminated;
+ enum failed;
+ }
+ }
+
+ typedef vnf-operational-status {
+ type enumeration {
+ enum pre-init;
+ enum init;
+ enum vl-init-phase;
+ enum vm-init-phase;
+ enum running;
+ enum terminate;
+ enum vm-terminate-phase;
+ enum vl-terminate-phase;
+ enum terminated;
+ enum failed;
+ }
+ }
+
grouping placement-group-info {
list placement-groups-info {
description
@@ -85,7 +109,6 @@
}
}
-
grouping virtual-interface {
container virtual-interface {
description
@@ -331,6 +354,7 @@
"IP address assigned to the external connection point";
type inet:ip-address;
}
+
leaf mac-address {
description
"MAC address assigned to the external connection point";
@@ -364,8 +388,6 @@
description "Short Unique name of the VDU
This will be of the format NSR name-ShortnedString-VDUname
NSR name and VDU name shall be constrained to 10 characters";
- rwpb:field-inline "true";
- rwpb:field-string-max 64;
type string;
}
@@ -450,6 +472,7 @@
"IP address assigned to the internal connection point";
type inet:ip-address;
}
+
leaf mac-address {
description
"MAC address assigned to the internal connection point";
@@ -513,31 +536,20 @@
uses virtual-interface;
}
- leaf operational-status {
- description
- "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
- running : The VDU is active in VM
- terminate : The VDU is being terminated
- vm-terminate-phase : The VDU in the VNF is being terminated in VIM.
- terminated : The VDU is in the terminated state.
- failed : The VDU instantiation failed.
- ";
-
- type enumeration {
- rwpb:enum-type "VduOperationalStatus";
- enum init;
- enum vm-init-phase;
- enum vm-alloc-pending;
- enum running;
- enum terminate;
- enum vl-terminate-phase;
- enum terminated;
- enum failed;
- }
- }
+ leaf operational-status {
+ description
+ "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
+ running : The VDU is active in VM
+ terminate : The VDU is being terminated
+ vm-terminate-phase : The VDU in the VNF is being terminated in VIM.
+ terminated : The VDU is in the terminated state.
+ failed : The VDU instantiation failed.
+ ";
+ type vdu-operational-status;
+ }
uses placement-group-info;
}
@@ -558,20 +570,7 @@
terminated : The VNF is in the terminated state.
failed : The VNF instantiation failed
";
-
- type enumeration {
- rwpb:enum-type "VnfrOperationalStatus";
- enum pre-init;
- enum init;
- enum vl-init-phase;
- enum vm-init-phase;
- enum running;
- enum terminate;
- enum vm-terminate-phase;
- enum vl-terminate-phase;
- enum terminated;
- enum failed;
- }
+ type vnf-operational-status;
}
leaf config-status {
@@ -599,7 +598,6 @@
uses placement-group-info;
container cloud-config {
- rwpb:msg-new VnfrCloudConfig;
uses manotypes:cloud-config;
}
}