diff --git a/doc/source/contributor/monitor-api.rst b/doc/source/contributor/monitor-api.rst index 71097f33b..498ad3cdb 100644 --- a/doc/source/contributor/monitor-api.rst +++ b/doc/source/contributor/monitor-api.rst @@ -126,7 +126,7 @@ Example Template actions: failure: respawn - acme_scaling_driver: + vdu_scaling_driver: monitoring_params: resource: cpu threshold: 10000 diff --git a/doc/source/contributor/vnfd_template_description.rst b/doc/source/contributor/vnfd_template_description.rst index 9c5db3094..273e7518b 100644 --- a/doc/source/contributor/vnfd_template_description.rst +++ b/doc/source/contributor/vnfd_template_description.rst @@ -443,8 +443,8 @@ Virtual Links Virtual link provides connectivity between VDUs. It represents the logical virtual link entity. -An example of a virtual link whose vendor is Acme and is attached to network -net-01 is as shown below. +An example of a virtual link whose vendor is "Tacker" and is attached to +network net-01 is as shown below. :: @@ -458,7 +458,7 @@ net-01 is as shown below. VL1: type: tosca.nodes.nfv.VL properties: - vendor: Acme + vendor: Tacker network_name: net-01 :type: @@ -629,4 +629,4 @@ a template which mentions all node types with all available options. type: tosca.nodes.nfv.VL properties: network_name: name of network to attach to - vendor: Acme + vendor: Tacker diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-userdata.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-userdata.yaml index 004742a89..0c82b4ad6 100644 --- a/samples/tosca-templates/vnfd/tosca-vnfd-userdata.yaml +++ b/samples/tosca-templates/vnfd/tosca-vnfd-userdata.yaml @@ -43,5 +43,5 @@ topology_template: type: tosca.nodes.nfv.VL properties: network_name: net_mgmt - vendor: ACME + vendor: Tacker diff --git a/tacker/tests/etc/samples/sample-tosca-vnfd-monitor.yaml b/tacker/tests/etc/samples/sample-tosca-vnfd-monitor.yaml index d6ab95d30..507bd64eb 100644 --- a/tacker/tests/etc/samples/sample-tosca-vnfd-monitor.yaml +++ b/tacker/tests/etc/samples/sample-tosca-vnfd-monitor.yaml @@ -49,4 +49,4 @@ topology_template: type: tosca.nodes.nfv.VL properties: network_name: net_mgmt - vendor: ACME + vendor: Tacker diff --git a/tacker/tests/etc/samples/sample-tosca-vnfd-static-ip.yaml b/tacker/tests/etc/samples/sample-tosca-vnfd-static-ip.yaml index 3d470746e..d2b893512 100644 --- a/tacker/tests/etc/samples/sample-tosca-vnfd-static-ip.yaml +++ b/tacker/tests/etc/samples/sample-tosca-vnfd-static-ip.yaml @@ -56,8 +56,8 @@ topology_template: VL1: type: tosca.nodes.nfv.VL properties: - vendor: ACME network_name: net_mgmt + vendor: Tacker VL2: type: tosca.nodes.nfv.VL diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_flavor.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_flavor.yaml index 4f2197ee3..a543b2903 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_flavor.yaml +++ b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_flavor.yaml @@ -41,4 +41,4 @@ topology_template: type: tosca.nodes.nfv.VL properties: network_name: existing_network_1 - vendor: ACME + vendor: Tacker diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_flavor_and_capabilities.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_flavor_and_capabilities.yaml index 28b864457..9f076082b 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_flavor_and_capabilities.yaml +++ b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_flavor_and_capabilities.yaml @@ -41,4 +41,4 @@ topology_template: type: tosca.nodes.nfv.VL properties: network_name: existing_network_1 - vendor: ACME + vendor: Tacker diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_flavor_defaults.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_flavor_defaults.yaml index 88d616452..8c3e08627 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_flavor_defaults.yaml +++ b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_flavor_defaults.yaml @@ -38,4 +38,4 @@ topology_template: type: tosca.nodes.nfv.VL properties: network_name: existing_network_1 - vendor: ACME + vendor: Tacker diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_flavor_no_units.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_flavor_no_units.yaml index 4954cf186..576f007c2 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_flavor_no_units.yaml +++ b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_flavor_no_units.yaml @@ -40,4 +40,4 @@ topology_template: type: tosca.nodes.nfv.VL properties: network_name: existing_network_1 - vendor: ACME + vendor: Tacker diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_image.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_image.yaml index 023060ce9..1c5af18cf 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_image.yaml +++ b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_image.yaml @@ -39,4 +39,4 @@ topology_template: type: tosca.nodes.nfv.VL properties: network_name: existing_network_1 - vendor: ACME + vendor: Tacker diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_mac_ip.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_mac_ip.yaml index 0cd5f3fe9..971de767b 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_mac_ip.yaml +++ b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_mac_ip.yaml @@ -42,4 +42,4 @@ topology_template: type: tosca.nodes.nfv.VL properties: network_name: existing_network_1 - vendor: ACME + vendor: Tacker diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_openwrt.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_openwrt.yaml index b869457d6..c03a8d4c6 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_openwrt.yaml +++ b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_openwrt.yaml @@ -40,5 +40,5 @@ topology_template: type: tosca.nodes.nfv.VL properties: network_name: existing_network_1 - vendor: ACME + vendor: Tacker diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_openwrt_userdata.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_openwrt_userdata.yaml index 88710011a..9150437c2 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_openwrt_userdata.yaml +++ b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_openwrt_userdata.yaml @@ -45,5 +45,5 @@ topology_template: type: tosca.nodes.nfv.VL properties: network_name: existing_network_1 - vendor: ACME + vendor: Tacker diff --git a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_security_groups.yaml b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_security_groups.yaml index 13f4629c3..54d3f3685 100644 --- a/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_security_groups.yaml +++ b/tacker/tests/unit/vnfm/infra_drivers/openstack/data/test_tosca_security_groups.yaml @@ -43,4 +43,4 @@ topology_template: type: tosca.nodes.nfv.VL properties: network_name: existing_network_1 - vendor: ACME + vendor: Tacker