From 06ba382adfe364eb39960327c4c5550f63b2ca0b Mon Sep 17 00:00:00 2001 From: Philip Joseph Date: Fri, 16 Sep 2016 07:24:18 -0400 Subject: [PATCH] Fix SO crash on instantiate from UI Signed-off-by: Philip Joseph --- common/plugins/yang/rw-cloud.tailf.yang | 10 +++++----- common/plugins/yang/rw-cloud.yang | 14 +++----------- common/plugins/yang/rw-config-agent.tailf.yang | 10 +++++----- common/plugins/yang/rw-sdn.tailf.yang | 10 +++++----- common/plugins/yang/rw-sdn.yang | 12 ++---------- examples/ping_pong_ns/CMakeLists.txt | 6 +++--- examples/ping_pong_ns/generate_packages.sh.in | 6 +++--- .../rift/mano/examples/ping_pong_nsd.py | 2 +- models/openmano/src/CMakeLists.txt | 6 ++++-- models/openmano/src/generate_tidgen_packages.sh.in | 2 +- models/plugins/yang/CMakeLists.txt | 3 +++ models/plugins/yang/rw-nsr.yang | 4 ++-- 12 files changed, 37 insertions(+), 48 deletions(-) diff --git a/common/plugins/yang/rw-cloud.tailf.yang b/common/plugins/yang/rw-cloud.tailf.yang index 3838ab7b..2d653256 100644 --- a/common/plugins/yang/rw-cloud.tailf.yang +++ b/common/plugins/yang/rw-cloud.tailf.yang @@ -28,14 +28,14 @@ module rw-cloud-annotation } 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 f580e93c..e4682ac6 100644 --- a/common/plugins/yang/rw-cloud.yang +++ b/common/plugins/yang/rw-cloud.yang @@ -25,15 +25,7 @@ module rw-cloud 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 @@ module rw-cloud } 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 85f6ecae..07f0d74f 100644 --- a/common/plugins/yang/rw-config-agent.tailf.yang +++ b/common/plugins/yang/rw-config-agent.tailf.yang @@ -28,14 +28,14 @@ module rw-config-agent-annotation } 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 89ee4ec4..c8a4d46f 100644 --- a/common/plugins/yang/rw-sdn.tailf.yang +++ b/common/plugins/yang/rw-sdn.tailf.yang @@ -27,14 +27,14 @@ module rw-sdn-annotation 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 5b82d47e..0a5b2285 100644 --- a/common/plugins/yang/rw-sdn.yang +++ b/common/plugins/yang/rw-sdn.yang @@ -25,15 +25,7 @@ module rw-sdn 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 @@ module rw-sdn } list sdn-account { - rwpb:msg-new SDNAccountConfig; + rw-pb-ext:msg-new SDNAccountConfig; key "name"; leaf name { diff --git a/examples/ping_pong_ns/CMakeLists.txt b/examples/ping_pong_ns/CMakeLists.txt index 9667465c..e373c2a2 100644 --- a/examples/ping_pong_ns/CMakeLists.txt +++ b/examples/ping_pong_ns/CMakeLists.txt @@ -39,18 +39,18 @@ set(PACKAGE_OUTPUT add_custom_command( OUTPUT ${PACKAGE_OUTPUT} COMMAND ${CMAKE_CURRENT_BINARY_DIR}/generate_packages.sh - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/ping_pong_nsd.py + DEPENDS mano_yang rwcloud_yang ${CMAKE_CURRENT_SOURCE_DIR}/ping_pong_nsd.py ) add_custom_target(ping_pong_pkg_gen ALL - DEPENDS mano_yang ${PACKAGE_OUTPUT} + DEPENDS mano_yang rwcloud_yang ${PACKAGE_OUTPUT} ) install( FILES ${PACKAGE_OUTPUT} DESTINATION usr/rift/mano/examples/ping_pong_ns - COMPONENT ${PKG_LONG_NAME} + COMPONENT ${PKG_LONG_NAME} ) install( diff --git a/examples/ping_pong_ns/generate_packages.sh.in b/examples/ping_pong_ns/generate_packages.sh.in index ae540522..5fa0a8f9 100755 --- a/examples/ping_pong_ns/generate_packages.sh.in +++ b/examples/ping_pong_ns/generate_packages.sh.in @@ -12,9 +12,9 @@ PONG_QCOW_IMAGE=${RIFT_ROOT}/images/Fedora-x86_64-20-20131211.1-sda-pong.qcow2 PING_QCOW_IMAGE=${RIFT_ROOT}/images/Fedora-x86_64-20-20131211.1-sda-ping.qcow2 # These paths are needed for finding the overrides and so files -PYTHONPATH=${PYTHONPATH}:@RIFT_SUBMODULE_SOURCE_ROOT@/rwvcs/ra:@RIFT_SUBMODULE_BINARY_ROOT@/models/plugins/yang -PYTHON3PATH=${PYTHON3PATH}:@RIFT_SUBMODULE_SOURCE_ROOT@/rwvcs/ra:@RIFT_SUBMODULE_BINARY_ROOT@/models/plugins/yang -LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:@RIFT_SUBMODULE_BINARY_ROOT@/models/plugins/yang +PYTHONPATH=@RIFT_SUBMODULE_SOURCE_ROOT@/rwvcs/ra:@RIFT_SUBMODULE_BINARY_ROOT@/models/plugins/yang:${PYTHONPATH} +PYTHON3PATH=@RIFT_SUBMODULE_SOURCE_ROOT@/rwvcs/ra:@RIFT_SUBMODULE_BINARY_ROOT@/models/plugins/yang:${PYTHON3PATH} +LD_LIBRARY_PATH=@RIFT_SUBMODULE_BINARY_ROOT@/models/plugins/yang:@RIFT_SUBMODULE_BINARY_ROOT@/common/plugins/yang:${LD_LIBRARY_PATH} #Rift Logos PING_VNFD_LOGO=${SOURCE_DIR}/rift_logo.png diff --git a/examples/ping_pong_ns/rift/mano/examples/ping_pong_nsd.py b/examples/ping_pong_ns/rift/mano/examples/ping_pong_nsd.py index bb834ed9..5348e00b 100755 --- a/examples/ping_pong_ns/rift/mano/examples/ping_pong_nsd.py +++ b/examples/ping_pong_ns/rift/mano/examples/ping_pong_nsd.py @@ -37,7 +37,7 @@ from gi.repository import ( RwVnfdYang, VnfdYang, RwYang, - ) +) try: diff --git a/models/openmano/src/CMakeLists.txt b/models/openmano/src/CMakeLists.txt index 949bb8be..d5ad4605 100644 --- a/models/openmano/src/CMakeLists.txt +++ b/models/openmano/src/CMakeLists.txt @@ -40,6 +40,8 @@ add_custom_command( ${CMAKE_CURRENT_BINARY_DIR}/generate_tidgen_packages.sh DEPENDS + mano_yang + rwcloud_yang ${RIFT_SUBMODULE_SOURCE_ROOT}/models/openmano/test/tidgen_ns_2sriov.yaml ${RIFT_SUBMODULE_SOURCE_ROOT}/models/openmano/test/tidgen_ns_4sriov.yaml ${RIFT_SUBMODULE_SOURCE_ROOT}/models/openmano/test/tidgen_vnf_2sriov.yaml @@ -54,6 +56,7 @@ add_custom_command( add_custom_target(tidgen ALL DEPENDS mano_yang + rwcloud_yang ${CMAKE_CURRENT_BINARY_DIR}/2tidgenMWC_2sriov.tar.gz ${CMAKE_CURRENT_BINARY_DIR}/tidgenMWC_2sriov.tar.gz ${CMAKE_CURRENT_BINARY_DIR}/2tidgenMWC_4sriov.tar.gz @@ -75,8 +78,7 @@ install( ${CMAKE_CURRENT_BINARY_DIR}/2tidgenMWC_2sriov_no_ctrlnet.tar.gz ${CMAKE_CURRENT_BINARY_DIR}/tidgenMWC_2sriov_no_ctrlnet.tar.gz - - DESTINATION + DESTINATION usr/rift/mano/examples/tidgen_ns COMPONENT ${PKG_LONG_NAME} ) diff --git a/models/openmano/src/generate_tidgen_packages.sh.in b/models/openmano/src/generate_tidgen_packages.sh.in index 208d2cdb..3c50cef2 100755 --- a/models/openmano/src/generate_tidgen_packages.sh.in +++ b/models/openmano/src/generate_tidgen_packages.sh.in @@ -9,7 +9,7 @@ PROJECT_TOP_DIR=@PROJECT_TOP_DIR@ # These paths are needed for finding the overrides and so files PYTHONPATH=${PYTHONPATH}:@RIFT_SUBMODULE_SOURCE_ROOT@/rwvcs/ra:@RIFT_SUBMODULE_BINARY_ROOT@/models/plugins/yang PYTHON3PATH=${PYTHON3PATH}:@RIFT_SUBMODULE_SOURCE_ROOT@/rwvcs/ra:@RIFT_SUBMODULE_BINARY_ROOT@/models/plugins/yang -LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:@RIFT_SUBMODULE_BINARY_ROOT@/models/plugins/yang +LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:@RIFT_SUBMODULE_BINARY_ROOT@/models/plugins/yang:@RIFT_SUBMODULE_BINARY_ROOT@/common/plugins/yang # Remove any old directories rm -rf ${BINARY_DIR}/2tidgenMWC_4sriov diff --git a/models/plugins/yang/CMakeLists.txt b/models/plugins/yang/CMakeLists.txt index 782415bd..2f6e9646 100644 --- a/models/plugins/yang/CMakeLists.txt +++ b/models/plugins/yang/CMakeLists.txt @@ -51,6 +51,9 @@ rift_add_yang_target( rwcloud_yang_gen rwconfig_agent_yang_gen mano-types_yang_gen + DEPENDS + rwcloud_yang + rwconfig_agent_yang ) #rift_gen_yang_tree(mano-pyang-trees diff --git a/models/plugins/yang/rw-nsr.yang b/models/plugins/yang/rw-nsr.yang index d73e7fa3..ae2c92ac 100644 --- a/models/plugins/yang/rw-nsr.yang +++ b/models/plugins/yang/rw-nsr.yang @@ -40,7 +40,7 @@ module rw-nsr } import rw-config-agent { - prefix "rw-ca"; + prefix "rw-config-agent"; } import rw-sdn { @@ -172,7 +172,7 @@ module rw-nsr The configuration for this VNF will be driven using the specified config agent account"; type leafref { - path "/rw-ca:config-agent/rw-ca:account/rw-ca:name"; + path "/rw-config-agent:config-agent/rw-config-agent:account/rw-config-agent:name"; } } } -- 2.25.1