[ovs-dev] [PATCH v2] datapath: Deprecate CAPWAP support.

Jesse Gross jesse at nicira.com
Tue Oct 30 02:14:46 UTC 2012


On Mon, Oct 29, 2012 at 2:32 PM, Pravin B Shelar <pshelar at nicira.com> wrote:
> diff --git a/NEWS b/NEWS
> index fa0a249..99f7c4b 100644
> --- a/NEWS
> +++ b/NEWS
> @@ -43,6 +43,7 @@ v1.9.0 - xx xxx xxxx
>          - The autopath action.
>          - Interface type "null".
>          - Numeric values for reserved ports (see "ovs-ofctl" note above).
> +        - CAPWAP tunnel support.

Since this is going into the 1.9 branch, we should add it to the
Debian changelog as well (which has already been copied over).

>  v1.8.0 - xx xxx xxxx
> diff --git a/datapath/vport-capwap.c b/datapath/vport-capwap.c
> index 39aec42..518d5cc 100644
> --- a/datapath/vport-capwap.c
> +++ b/datapath/vport-capwap.c
> @@ -473,6 +473,7 @@ static struct vport *capwap_create(const struct vport_parms *parms)
>         struct vport *vport;
>         int err;
>
> +       pr_warn("%s: CAPWAP support is deprecated\n", __func__);

I think we probably can skip the kernel warning altogether.

> diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c
> index 4168959..be6dd91 100644
> --- a/lib/netdev-vport.c
> +++ b/lib/netdev-vport.c
> @@ -590,6 +590,10 @@ parse_tunnel_config(const char *name, const char *type,
>      ovs_be32 saddr = htonl(0);
>      uint32_t flags;
>
> +    if (!strcmp(type, "capwap")) {
> +        VLOG_WARN("CAPWAP tunnel support is deprecated.");
> +    }

I think WARN_ONCE is probably a little nicer to avoid filling up the logs.

> diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
> index 0bc4ccd..9510db8 100644
> --- a/vswitchd/vswitch.xml
> +++ b/vswitchd/vswitch.xml
> @@ -1216,6 +1216,9 @@
>
>            <dt><code>capwap</code></dt>
>            <dd>
> +            As of oct 2012, CAPWAP support is deprecated. will be removed no
> +            earlier than February 2013.

Can we clean up this sentence a little bit and move it to the end of
the CAPWAP description?  Something like:

CAPWAP support is deprecated and will be removed no earlier than February 2013.



More information about the dev mailing list