From 380a20129bbae7df3e61006cefd368bc74093178 Mon Sep 17 00:00:00 2001 From: Sridhar Ramaswamy Date: Fri, 6 May 2016 22:39:50 +0000 Subject: [PATCH] Re-organize tacker sample templates Tacker TOSCA templates are currently buried under tacker/devstack. These samples templates are applicable for the whole project and they are not related specifically to the devstack installation. Also, segregate the new TOSCA parser based templates from the legacy ones for easier deprecation when the time comes. Change-Id: I35547335baf6827e6b7b10702d05276343d8ce75 Closes-Bug: #1579251 --- devstack/lib/tacker | 2 +- devstack/{samples => }/local.conf.example | 0 devstack/{samples => }/local.sh.mysql_fix | 0 devstack/{samples => }/vim_config.yaml | 0 .../legacy-templates}/config-openwrt-with-firewall.yaml | 0 {devstack/samples => samples/legacy-templates}/openwrt.yaml | 0 .../legacy-templates}/sample-vnfd-http-monitor.yaml | 0 .../legacy-templates}/sample-vnfd-monitor.yaml | 0 .../legacy-templates}/sample-vnfd-multi-vdu.yaml | 0 .../samples => samples/legacy-templates}/sample-vnfd.yaml | 0 .../legacy-templates}/vnf_cirros_param_values_ipaddr.yaml | 0 .../legacy-templates}/vnf_cirros_param_values_user_data.yaml | 0 .../legacy-templates}/vnf_cirros_template_ipaddr.yaml | 0 .../legacy-templates}/vnf_cirros_template_user_data.yaml | 0 .../vnfd}/tosca-config-openwrt-with-firewall.yaml | 0 .../tosca-templates/vnfd/tosca-vnfd-cpu-dedicate.yaml | 0 .../tosca-templates/vnfd/tosca-vnfd-flavor.yaml | 0 .../tosca-templates/vnfd/tosca-vnfd-http-monitor.yaml | 0 .../tosca-templates/vnfd/tosca-vnfd-hugepages.yaml | 0 .../tosca-templates/vnfd/tosca-vnfd-image.yaml | 0 .../tosca-templates/vnfd/tosca-vnfd-monitor.yaml | 0 .../tosca-templates/vnfd/tosca-vnfd-multi-vdu.yaml | 0 .../tosca-templates/vnfd/tosca-vnfd-numacount.yaml | 0 .../tosca-templates/vnfd/tosca-vnfd-numadefine.yaml | 0 .../tosca-templates/vnfd/tosca-vnfd-sriov.yaml | 0 .../tosca-templates/vnfd/tosca-vnfd-vcpu-topology.yaml | 0 .../tosca-templates/vnfd/tosca_hello_world_vnfd.yaml | 0 .../tosca-templates/vnfd/tosca_openwrt_vnfd.yaml | 0 samples/vim/vim_config.yaml | 4 ++++ 29 files changed, 5 insertions(+), 1 deletion(-) rename devstack/{samples => }/local.conf.example (100%) rename devstack/{samples => }/local.sh.mysql_fix (100%) rename devstack/{samples => }/vim_config.yaml (100%) rename {devstack/samples => samples/legacy-templates}/config-openwrt-with-firewall.yaml (100%) rename {devstack/samples => samples/legacy-templates}/openwrt.yaml (100%) rename {devstack/samples => samples/legacy-templates}/sample-vnfd-http-monitor.yaml (100%) rename {devstack/samples => samples/legacy-templates}/sample-vnfd-monitor.yaml (100%) rename {devstack/samples => samples/legacy-templates}/sample-vnfd-multi-vdu.yaml (100%) rename {devstack/samples => samples/legacy-templates}/sample-vnfd.yaml (100%) rename {devstack/samples => samples/legacy-templates}/vnf_cirros_param_values_ipaddr.yaml (100%) rename {devstack/samples => samples/legacy-templates}/vnf_cirros_param_values_user_data.yaml (100%) rename {devstack/samples => samples/legacy-templates}/vnf_cirros_template_ipaddr.yaml (100%) rename {devstack/samples => samples/legacy-templates}/vnf_cirros_template_user_data.yaml (100%) rename {devstack/samples => samples/tosca-templates/vnfd}/tosca-config-openwrt-with-firewall.yaml (100%) rename devstack/samples/sample-tosca-vnfd-cpu-dedicate.yaml => samples/tosca-templates/vnfd/tosca-vnfd-cpu-dedicate.yaml (100%) rename devstack/samples/sample-tosca-vnfd-flavor.yaml => samples/tosca-templates/vnfd/tosca-vnfd-flavor.yaml (100%) rename devstack/samples/sample-tosca-vnfd-http-monitor.yaml => samples/tosca-templates/vnfd/tosca-vnfd-http-monitor.yaml (100%) rename devstack/samples/sample-tosca-vnfd-hugepages.yaml => samples/tosca-templates/vnfd/tosca-vnfd-hugepages.yaml (100%) rename devstack/samples/sample-tosca-vnfd-image.yaml => samples/tosca-templates/vnfd/tosca-vnfd-image.yaml (100%) rename devstack/samples/sample-tosca-vnfd-monitor.yaml => samples/tosca-templates/vnfd/tosca-vnfd-monitor.yaml (100%) rename devstack/samples/sample-tosca-vnfd-multi-vdu.yaml => samples/tosca-templates/vnfd/tosca-vnfd-multi-vdu.yaml (100%) rename devstack/samples/sample-tosca-vnfd-numacount.yaml => samples/tosca-templates/vnfd/tosca-vnfd-numacount.yaml (100%) rename devstack/samples/sample-tosca-vnfd-numadefine.yaml => samples/tosca-templates/vnfd/tosca-vnfd-numadefine.yaml (100%) rename devstack/samples/sample-tosca-vnfd-sriov.yaml => samples/tosca-templates/vnfd/tosca-vnfd-sriov.yaml (100%) rename devstack/samples/sample-tosca-vnfd-vcpu-topology.yaml => samples/tosca-templates/vnfd/tosca-vnfd-vcpu-topology.yaml (100%) rename devstack/samples/sample-tosca-vnfd.yaml => samples/tosca-templates/vnfd/tosca_hello_world_vnfd.yaml (100%) rename devstack/samples/tosca_openwrt.yaml => samples/tosca-templates/vnfd/tosca_openwrt_vnfd.yaml (100%) create mode 100644 samples/vim/vim_config.yaml diff --git a/devstack/lib/tacker b/devstack/lib/tacker index f33ba532b..30622862f 100644 --- a/devstack/lib/tacker +++ b/devstack/lib/tacker @@ -403,7 +403,7 @@ function tacker_register_default_vim { get_or_create_user $DEFAULT_VIM_USER $DEFAULT_VIM_PASSWORD get_or_add_user_project_role "admin" $DEFAULT_VIM_USER $DEFAULT_VIM_PROJECT_NAME get_or_add_user_project_role "advsvc" $DEFAULT_VIM_USER $DEFAULT_VIM_PROJECT_NAME - VIM_CONFIG_FILE="$TACKER_DIR/devstack/samples/vim_config.yaml" + VIM_CONFIG_FILE="$TACKER_DIR/devstack/vim_config.yaml" default_vim_id=$(tacker vim-register --name $DEFAULT_VIM_NAME --config-file $VIM_CONFIG_FILE -f value -c id) echo $default_vim_id iniset $TACKER_CONF nfvo_vim default_vim $DEFAULT_VIM_NAME diff --git a/devstack/samples/local.conf.example b/devstack/local.conf.example similarity index 100% rename from devstack/samples/local.conf.example rename to devstack/local.conf.example diff --git a/devstack/samples/local.sh.mysql_fix b/devstack/local.sh.mysql_fix similarity index 100% rename from devstack/samples/local.sh.mysql_fix rename to devstack/local.sh.mysql_fix diff --git a/devstack/samples/vim_config.yaml b/devstack/vim_config.yaml similarity index 100% rename from devstack/samples/vim_config.yaml rename to devstack/vim_config.yaml diff --git a/devstack/samples/config-openwrt-with-firewall.yaml b/samples/legacy-templates/config-openwrt-with-firewall.yaml similarity index 100% rename from devstack/samples/config-openwrt-with-firewall.yaml rename to samples/legacy-templates/config-openwrt-with-firewall.yaml diff --git a/devstack/samples/openwrt.yaml b/samples/legacy-templates/openwrt.yaml similarity index 100% rename from devstack/samples/openwrt.yaml rename to samples/legacy-templates/openwrt.yaml diff --git a/devstack/samples/sample-vnfd-http-monitor.yaml b/samples/legacy-templates/sample-vnfd-http-monitor.yaml similarity index 100% rename from devstack/samples/sample-vnfd-http-monitor.yaml rename to samples/legacy-templates/sample-vnfd-http-monitor.yaml diff --git a/devstack/samples/sample-vnfd-monitor.yaml b/samples/legacy-templates/sample-vnfd-monitor.yaml similarity index 100% rename from devstack/samples/sample-vnfd-monitor.yaml rename to samples/legacy-templates/sample-vnfd-monitor.yaml diff --git a/devstack/samples/sample-vnfd-multi-vdu.yaml b/samples/legacy-templates/sample-vnfd-multi-vdu.yaml similarity index 100% rename from devstack/samples/sample-vnfd-multi-vdu.yaml rename to samples/legacy-templates/sample-vnfd-multi-vdu.yaml diff --git a/devstack/samples/sample-vnfd.yaml b/samples/legacy-templates/sample-vnfd.yaml similarity index 100% rename from devstack/samples/sample-vnfd.yaml rename to samples/legacy-templates/sample-vnfd.yaml diff --git a/devstack/samples/vnf_cirros_param_values_ipaddr.yaml b/samples/legacy-templates/vnf_cirros_param_values_ipaddr.yaml similarity index 100% rename from devstack/samples/vnf_cirros_param_values_ipaddr.yaml rename to samples/legacy-templates/vnf_cirros_param_values_ipaddr.yaml diff --git a/devstack/samples/vnf_cirros_param_values_user_data.yaml b/samples/legacy-templates/vnf_cirros_param_values_user_data.yaml similarity index 100% rename from devstack/samples/vnf_cirros_param_values_user_data.yaml rename to samples/legacy-templates/vnf_cirros_param_values_user_data.yaml diff --git a/devstack/samples/vnf_cirros_template_ipaddr.yaml b/samples/legacy-templates/vnf_cirros_template_ipaddr.yaml similarity index 100% rename from devstack/samples/vnf_cirros_template_ipaddr.yaml rename to samples/legacy-templates/vnf_cirros_template_ipaddr.yaml diff --git a/devstack/samples/vnf_cirros_template_user_data.yaml b/samples/legacy-templates/vnf_cirros_template_user_data.yaml similarity index 100% rename from devstack/samples/vnf_cirros_template_user_data.yaml rename to samples/legacy-templates/vnf_cirros_template_user_data.yaml diff --git a/devstack/samples/tosca-config-openwrt-with-firewall.yaml b/samples/tosca-templates/vnfd/tosca-config-openwrt-with-firewall.yaml similarity index 100% rename from devstack/samples/tosca-config-openwrt-with-firewall.yaml rename to samples/tosca-templates/vnfd/tosca-config-openwrt-with-firewall.yaml diff --git a/devstack/samples/sample-tosca-vnfd-cpu-dedicate.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-cpu-dedicate.yaml similarity index 100% rename from devstack/samples/sample-tosca-vnfd-cpu-dedicate.yaml rename to samples/tosca-templates/vnfd/tosca-vnfd-cpu-dedicate.yaml diff --git a/devstack/samples/sample-tosca-vnfd-flavor.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-flavor.yaml similarity index 100% rename from devstack/samples/sample-tosca-vnfd-flavor.yaml rename to samples/tosca-templates/vnfd/tosca-vnfd-flavor.yaml diff --git a/devstack/samples/sample-tosca-vnfd-http-monitor.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-http-monitor.yaml similarity index 100% rename from devstack/samples/sample-tosca-vnfd-http-monitor.yaml rename to samples/tosca-templates/vnfd/tosca-vnfd-http-monitor.yaml diff --git a/devstack/samples/sample-tosca-vnfd-hugepages.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-hugepages.yaml similarity index 100% rename from devstack/samples/sample-tosca-vnfd-hugepages.yaml rename to samples/tosca-templates/vnfd/tosca-vnfd-hugepages.yaml diff --git a/devstack/samples/sample-tosca-vnfd-image.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-image.yaml similarity index 100% rename from devstack/samples/sample-tosca-vnfd-image.yaml rename to samples/tosca-templates/vnfd/tosca-vnfd-image.yaml diff --git a/devstack/samples/sample-tosca-vnfd-monitor.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-monitor.yaml similarity index 100% rename from devstack/samples/sample-tosca-vnfd-monitor.yaml rename to samples/tosca-templates/vnfd/tosca-vnfd-monitor.yaml diff --git a/devstack/samples/sample-tosca-vnfd-multi-vdu.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-multi-vdu.yaml similarity index 100% rename from devstack/samples/sample-tosca-vnfd-multi-vdu.yaml rename to samples/tosca-templates/vnfd/tosca-vnfd-multi-vdu.yaml diff --git a/devstack/samples/sample-tosca-vnfd-numacount.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-numacount.yaml similarity index 100% rename from devstack/samples/sample-tosca-vnfd-numacount.yaml rename to samples/tosca-templates/vnfd/tosca-vnfd-numacount.yaml diff --git a/devstack/samples/sample-tosca-vnfd-numadefine.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-numadefine.yaml similarity index 100% rename from devstack/samples/sample-tosca-vnfd-numadefine.yaml rename to samples/tosca-templates/vnfd/tosca-vnfd-numadefine.yaml diff --git a/devstack/samples/sample-tosca-vnfd-sriov.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-sriov.yaml similarity index 100% rename from devstack/samples/sample-tosca-vnfd-sriov.yaml rename to samples/tosca-templates/vnfd/tosca-vnfd-sriov.yaml diff --git a/devstack/samples/sample-tosca-vnfd-vcpu-topology.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-vcpu-topology.yaml similarity index 100% rename from devstack/samples/sample-tosca-vnfd-vcpu-topology.yaml rename to samples/tosca-templates/vnfd/tosca-vnfd-vcpu-topology.yaml diff --git a/devstack/samples/sample-tosca-vnfd.yaml b/samples/tosca-templates/vnfd/tosca_hello_world_vnfd.yaml similarity index 100% rename from devstack/samples/sample-tosca-vnfd.yaml rename to samples/tosca-templates/vnfd/tosca_hello_world_vnfd.yaml diff --git a/devstack/samples/tosca_openwrt.yaml b/samples/tosca-templates/vnfd/tosca_openwrt_vnfd.yaml similarity index 100% rename from devstack/samples/tosca_openwrt.yaml rename to samples/tosca-templates/vnfd/tosca_openwrt_vnfd.yaml diff --git a/samples/vim/vim_config.yaml b/samples/vim/vim_config.yaml new file mode 100644 index 000000000..b9b28d6c9 --- /dev/null +++ b/samples/vim/vim_config.yaml @@ -0,0 +1,4 @@ +auth_url: 'http://10.18.112.10:5000' +username: 'nfv_user' +password: 'mySecretPW' +project_name: 'nfv'