Merge from SO/master to SO/projects
Change-Id: I89cba164c73b35407481e4805fe29de30b4ddf2f
Signed-off-by: Philip Joseph <philip.joseph@riftio.com>
diff --git a/models/plugins/yang/mano-types.yang b/models/plugins/yang/mano-types.yang
index 01e80d5..95ae070 100644
--- a/models/plugins/yang/mano-types.yang
+++ b/models/plugins/yang/mano-types.yang
@@ -236,7 +236,7 @@
leaf protocol {
description
- "Protocol to use for NETCONF such as ssh";
+ "Protocol to use for NETCONF, such as ssh";
type enumeration {
enum None;
enum ssh;
@@ -322,7 +322,7 @@
leaf config-priority {
description
"Configuration priority - order of configuration
- to be applied to each VNF in this NS ,A low
+ to be applied to each VNF in this NS. A low
number takes precedence over a high number";
type uint64;
}
@@ -1263,14 +1263,17 @@
key id;
leaf id {
+ description "Identifier for control parameter";
type string;
}
leaf name {
+ description "Name of a control parameter";
type string;
}
leaf description {
+ description "A description of the control parameter";
type string;
}
diff --git a/models/plugins/yang/nsd.yang b/models/plugins/yang/nsd.yang
index ddd4d92..5008d14 100644
--- a/models/plugins/yang/nsd.yang
+++ b/models/plugins/yang/nsd.yang
@@ -106,7 +106,7 @@
leaf vnfd-id-ref {
description
- "A reference to a vnfd";
+ "A reference to a VNFD";
type leafref {
path "../../../constituent-vnfd" +
"[member-vnf-index = current()/../member-vnf-index-ref]" +
@@ -160,7 +160,7 @@
key "member-vnf-index-ref";
leaf member-vnf-index-ref {
- description "member VNF index of this member VNF";
+ description "Member VNF index of this member VNF";
type leafref {
path "../../../constituent-vnfd/member-vnf-index";
}
@@ -190,7 +190,7 @@
leaf vnfd-id-ref {
description
- "A reference to a vnfd. This is a leafref";
+ "A reference to a VNFD. This is a leafref";
type leafref {
path "../../../constituent-vnfd" +
@@ -257,7 +257,7 @@
leaf vnfd-id-ref {
description
- "A reference to a vnfd. This is a leafref";
+ "A reference to a VNFD. This is a leafref";
type leafref {
path "../../../constituent-vnfd" +
diff --git a/rwcal/plugins/vala/rwcal_openstack/rwcal_openstack.py b/rwcal/plugins/vala/rwcal_openstack/rwcal_openstack.py
index 68702bb..e06e311 100644
--- a/rwcal/plugins/vala/rwcal_openstack/rwcal_openstack.py
+++ b/rwcal/plugins/vala/rwcal_openstack/rwcal_openstack.py
@@ -904,8 +904,13 @@
drv.neutron_subnet_create(**kwargs)
except Exception as e:
self.log.error("Encountered exceptions during network creation. Exception: %s", str(e))
- raise
-
+ # This is to delete the network if neutron_subnet_create fails after creation of network
+ # Note:- Any subnet created will be implicitly deleted.
+ try:
+ drv.neutron_network_delete(network_id)
+ except Exception as delete_exception:
+ self.log.debug("Exception while deleting the network after failure of neutron_subnet_create or make_subnet_args: %s", str(delete_exception))
+ raise e
return network_id