Fix SO crash on instantiate from UI
Signed-off-by: Philip Joseph <philip.joseph@riftio.com>
diff --git a/common/plugins/yang/rw-cloud.tailf.yang b/common/plugins/yang/rw-cloud.tailf.yang
index 3838ab7..2d65325 100644
--- a/common/plugins/yang/rw-cloud.tailf.yang
+++ b/common/plugins/yang/rw-cloud.tailf.yang
@@ -28,14 +28,14 @@
}
import tailf-common {
- prefix tailf;
+ prefix tailf-common;
}
- tailf:annotate "/rw-cloud:cloud/rw-cloud:account/rw-cloud:connection-status" {
- tailf:callpoint rw_callpoint;
+ tailf-common:annotate "/rw-cloud:cloud/rw-cloud:account/rw-cloud:connection-status" {
+ tailf-common:callpoint rw_callpoint;
}
- tailf:annotate "/rw-cloud:update-cloud-status" {
- tailf:actionpoint rw_actionpoint;
+ tailf-common:annotate "/rw-cloud:update-cloud-status" {
+ tailf-common:actionpoint rw_actionpoint;
}
}
diff --git a/common/plugins/yang/rw-cloud.yang b/common/plugins/yang/rw-cloud.yang
index f580e93..e4682ac 100644
--- a/common/plugins/yang/rw-cloud.yang
+++ b/common/plugins/yang/rw-cloud.yang
@@ -25,15 +25,7 @@
import rw-pb-ext {
- prefix "rwpb";
- }
-
- import rw-cli-ext {
- prefix "rwcli";
- }
-
- import rw-yang-types {
- prefix "rwt";
+ prefix "rw-pb-ext";
}
import rwcal {
@@ -50,9 +42,9 @@
}
container cloud {
- rwpb:msg-new CloudConfig;
+ rw-pb-ext:msg-new CloudConfig;
list account {
- rwpb:msg-new CloudAccount;
+ rw-pb-ext:msg-new CloudAccount;
description "Configure Cloud Accounts";
max-elements 16;
diff --git a/common/plugins/yang/rw-config-agent.tailf.yang b/common/plugins/yang/rw-config-agent.tailf.yang
index 85f6eca..07f0d74 100644
--- a/common/plugins/yang/rw-config-agent.tailf.yang
+++ b/common/plugins/yang/rw-config-agent.tailf.yang
@@ -28,14 +28,14 @@
}
import tailf-common {
- prefix tailf;
+ prefix tailf-common;
}
- tailf:annotate "/rw-config-agent:config-agent/rw-config-agent:account/rw-config-agent:connection-status" {
- tailf:callpoint rw_callpoint;
+ tailf-common:annotate "/rw-config-agent:config-agent/rw-config-agent:account/rw-config-agent:connection-status" {
+ tailf-common:callpoint rw_callpoint;
}
- tailf:annotate "/rw-config-agent:update-cfg-agent-status" {
- tailf:actionpoint rw_actionpoint;
+ tailf-common:annotate "/rw-config-agent:update-cfg-agent-status" {
+ tailf-common:actionpoint rw_actionpoint;
}
}
diff --git a/common/plugins/yang/rw-sdn.tailf.yang b/common/plugins/yang/rw-sdn.tailf.yang
index 89ee4ec..c8a4d46 100644
--- a/common/plugins/yang/rw-sdn.tailf.yang
+++ b/common/plugins/yang/rw-sdn.tailf.yang
@@ -27,14 +27,14 @@
prefix rw-sdn;
}
import tailf-common {
- prefix tailf;
+ prefix tailf-common;
}
- tailf:annotate "/rw-sdn:sdn-account/rw-sdn:connection-status" {
- tailf:callpoint rw_callpoint;
+ tailf-common:annotate "/rw-sdn:sdn-account/rw-sdn:connection-status" {
+ tailf-common:callpoint rw_callpoint;
}
- tailf:annotate "/rw-sdn:update-sdn-status" {
- tailf:actionpoint rw_actionpoint;
+ tailf-common:annotate "/rw-sdn:update-sdn-status" {
+ tailf-common:actionpoint rw_actionpoint;
}
}
diff --git a/common/plugins/yang/rw-sdn.yang b/common/plugins/yang/rw-sdn.yang
index 5b82d47..0a5b228 100644
--- a/common/plugins/yang/rw-sdn.yang
+++ b/common/plugins/yang/rw-sdn.yang
@@ -25,15 +25,7 @@
import rw-pb-ext {
- prefix "rwpb";
- }
-
- import rw-cli-ext {
- prefix "rwcli";
- }
-
- import rw-yang-types {
- prefix "rwt";
+ prefix "rw-pb-ext";
}
import rwsdn {
@@ -46,7 +38,7 @@
}
list sdn-account {
- rwpb:msg-new SDNAccountConfig;
+ rw-pb-ext:msg-new SDNAccountConfig;
key "name";
leaf name {