Update ansible script - csit - Integration tests

diff options

author	pmikus <pmikus@cisco.com>	2017-04-13 20:56:56 +0200
committer	Peter Mikus <pmikus@cisco.com>	2017-04-14 07:35:20 +0000
commit	4da982b7a0f5872de2cc721607894216a20892f4 (patch)
tree	217c41366985b96514c06f1e047fc14734462956 /resources/tools/testbed-setup/playbooks
parent	0778ed7eec4bfcdbad86e6962d92a10207d4ddd2 (diff)

Update ansible script

- Add more inter steps - Add alternative way to host files via Apache server (due to VIRL collisions) Change-Id: Ibb206fa630013e9cdff9cda145e993b033ec7138 Signed-off-by: pmikus <pmikus@cisco.com>

Diffstat (limited to 'resources/tools/testbed-setup/playbooks')

-rw-r--r--

resources/tools/testbed-setup/playbooks/01-host-setup.yaml

1 files changed, 2 insertions, 2 deletions

/* * Copyright (c) 2015 Cisco and/or its affiliates. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at: * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ /* * ip/ip4_cli.c: ip4 commands * * Copyright (c) 2008 Eliot Dresselhaus * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including * without limitation the rights to use, copy, modify, merge, publish, * distribute, sublicense, and/or sell copies of the Software, and to * permit persons to whom the Software is furnished to do so, subject to * the following conditions: * * The above copyright notice and this permission notice shall be * included in all copies or substantial portions of the Software. * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include <vnet/ip/ip.h> #include <vnet/ip/reass/ip4_full_reass.h> #include <vnet/ip/reass/ip6_full_reass.h> /** * @file * @brief Set IP Address. * * Configure an IPv4 or IPv6 address for on an interface. */ int ip4_address_compare (ip4_address_t * a1, ip4_address_t * a2) { return clib_net_to_host_u32 (a1->data_u32) - clib_net_to_host_u32 (a2->data_u32); } int ip6_address_compare (ip6_address_t * a1, ip6_address_t * a2) { int i; for (i = 0; i < ARRAY_LEN (a1->as_u16); i++) { int cmp = clib_net_to_host_u16 (a1->as_u16[i]) - clib_net_to_host_u16 (a2->as_u16[i]); if (cmp != 0) return cmp; } return 0; } /* *INDENT-OFF* */ VLIB_CLI_COMMAND (set_interface_ip_command, static) = { .path = "set interface ip", .short_help = "IP4/IP6 commands", }; /* *INDENT-ON* */ void ip_del_all_interface_addresses (vlib_main_t * vm, u32 sw_if_index) { ip4_main_t *im4 = &ip4_main; ip4_address_t *ip4_addrs = 0; u32 *ip4_masks = 0; ip6_main_t *im6 = &ip6_main; ip6_address_t *ip6_addrs = 0; u32 *ip6_masks = 0; ip_interface_address_t *ia; int i; /* *INDENT-OFF* */ foreach_ip_interface_address (&im4->lookup_main, ia, sw_if_index, 0 /* honor unnumbered */, ({ ip4_address_t * x = (ip4_address_t *) ip_interface_address_get_address (&im4->lookup_main, ia); vec_add1 (ip4_addrs, x[0]); vec_add1 (ip4_masks, ia->address_length); })); /* *INDENT-ON* */ /* *INDENT-OFF* */ foreach_ip_interface_address (&im6->lookup_main, ia, sw_if_index, 0 /* honor unnumbered */, ({ ip6_address_t * x = (ip6_address_t *) ip_interface_address_get_address (&im6->lookup_main, ia); vec_add1 (ip6_addrs, x[0]); vec_add1 (ip6_masks, ia->address_length); })); /* *INDENT-ON* */ for (i = 0; i < vec_len (ip4_addrs); i++) ip4_add_del_interface_address (vm, sw_if_index, &ip4_addrs[i], ip4_masks[i], 1 /* is_del */ ); for (i = 0; i < vec_len (ip6_addrs); i++) ip6_add_del_interface_address (vm, sw_if_index, &ip6_addrs[i], ip6_masks[i], 1 /* is_del */ ); vec_free (ip4_addrs); vec_free (ip4_masks); vec_free (ip6_addrs); vec_free (ip6_masks); } static clib_error_t * ip_address_delete_cleanup (vnet_main_t * vnm, u32 hw_if_index, u32 is_create) { vlib_main_t *vm = vlib_get_main (); vnet_hw_interface_t *hw; if (is_create) return 0; hw = vnet_get_hw_interface (vnm, hw_if_index); ip_del_all_interface_addresses (vm, hw->sw_if_index); return 0; } VNET_HW_INTERFACE_ADD_DEL_FUNCTION (ip_address_delete_cleanup); static clib_error_t * add_del_ip_address (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd) { vnet_main_t *vnm = vnet_get_main (); ip4_address_t a4; ip6_address_t a6; clib_error_t *error = 0; u32 sw_if_index, length, is_del; sw_if_index = ~0; is_del = 0; if (unformat (input, "del")) is_del = 1; if (!unformat_user (input, unformat_vnet_sw_interface, vnm, &sw_if_index)) { error = clib_error_return (0, "unknown interface `%U'", format_unformat_error, input); goto done; } if (is_del && unformat (input, "all")) ip_del_all_interface_addresses (vm, sw_if_index); else if (unformat (input, "%U/%d", unformat_ip4_address, &a4, &length)) error = ip4_add_del_interface_address (vm, sw_if_index, &a4, length, is_del); else if (unformat (input, "%U/%d", unformat_ip6_address, &a6, &length)) error = ip6_add_del_interface_address (vm, sw_if_index, &a6, length, is_del); else { error = clib_error_return (0, "expected IP4/IP6 address/length `%U'", format_unformat_error, input); goto done; } done: return error; } /*? * Add an IP Address to an interface or remove and IP Address from an interface. * The IP Address can be an IPv4 or an IPv6 address. Interfaces may have multiple * IPv4 and IPv6 addresses. There is no concept of primary vs. secondary * interface addresses; they're just addresses. * * To display the addresses associated with a given interface, use the command * '<em>show interface address <interface></em>'. * * Note that the debug CLI does not enforce classful mask-width / addressing * constraints. * * @cliexpar * @parblock * An example of how to add an IPv4 address to an interface: * @cliexcmd{set interface ip address GigabitEthernet2/0/0 172.16.2.12/24} * * An example of how to add an IPv6 address to an interface: * @cliexcmd{set interface ip address GigabitEthernet2/0/0 @::a:1:1:0:7/126} * * To delete a specific interface ip address: * @cliexcmd{set interface ip address GigabitEthernet2/0/0 172.16.2.12/24 del} * * To delete all interfaces addresses (IPv4 and IPv6): * @cliexcmd{set interface ip address GigabitEthernet2/0/0 del all} * @endparblock ?*/ /* *INDENT-OFF* */ VLIB_CLI_COMMAND (set_interface_ip_address_command, static) = { .path = "set interface ip address", .function = add_del_ip_address, .short_help = "set interface ip address [del] <interface> <ip-addr>/<mask> | [all]", }; /* *INDENT-ON* */ static clib_error_t * set_reassembly_command_fn (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd) { vnet_main_t *vnm = vnet_get_main (); unformat_input_t _line_input, *line_input = &_line_input; u32 sw_if_index = ~0; u8 ip4_on = 0; u8 ip6_on = 0; /* Get a line of input. */ if (!unformat_user (input, unformat_line_input, line_input)) { return NULL; } if (!unformat_user (line_input, unformat_vnet_sw_interface, vnm, &sw_if_index)) { return clib_error_return (0, "Invalid interface name"); } if (unformat (line_input, "on")) { ip4_on = 1; ip6_on = 1; } else if (unformat (line_input, "off")) { ip4_on = 0; ip6_on = 0; } else if (unformat (line_input, "ip4")) { ip4_on = 1; ip6_on = 0; } else if (unformat (line_input, "ip6")) { ip4_on = 0; ip6_on = 1; } else { return clib_error_return (0, "Unknown input `%U'", format_unformat_error, line_input); } vnet_api_error_t rv4 = ip4_full_reass_enable_disable (sw_if_index, ip4_on); vnet_api_error_t rv6 = ip6_full_reass_enable_disable (sw_if_index, ip6_on); if (rv4 && rv6) { return clib_error_return (0, "`ip4_full_reass_enable_disable' API call failed, rv=%d:%U, " "`ip6_full_reass_enable_disable' API call failed, rv=%d:%U", (int) rv4, format_vnet_api_errno, rv4, (int) rv6, format_vnet_api_errno, rv6); } else if (rv4) { return clib_error_return (0, "`ip4_full_reass_enable_disable' API call failed, rv=%d:%U", (int) rv4, format_vnet_api_errno, rv4); } else if (rv6) { return clib_error_return (0, "`ip6_full_reass_enable_disable' API call failed, rv=%d:%U", (int) rv6, format_vnet_api_errno, rv6); } return NULL; } /* *INDENT-OFF* */ VLIB_CLI_COMMAND (set_reassembly_command, static) = { .path = "set interface reassembly", .short_help = "set interface reassembly <interface-name> [on|off|ip4|ip6]", .function = set_reassembly_command_fn, }; /* *INDENT-ON* */ /* Dummy init function to get us linked in. */ static clib_error_t * ip4_cli_init (vlib_main_t * vm) { return 0; } VLIB_INIT_FUNCTION (ip4_cli_init); /* * fd.io coding-style-patch-verification: ON * * Local Variables: * eval: (c-set-style "gnu") * End: */


context:
space:
mode: