[2.1-Build 40] ToR Agent sets VLAN 0 even though the logical interfaces set VLAN tag

[Daisuke Nakajima]

ToR Agent sets VLAN 0 even though the logical interfaces set VLAN 1688.

According to Snh_OvsdbPhysicalPortReq?session_remote_ip=&session_remote_port=, there is vlan0 with UUID 35fb066b-0bd4-41c5-8766-1c2d93357bae.
However, there is vlan 1688 on Logical-interface.
Also, actual vlan ID on QFX is vlan0 by ovsdb dump.

OVSDB dump:
d385207d-d11a-44a3-ab48-996cdb89d937 "" "Contrail-35fb066b-0bd4-41c5-8766-1c2d93357bae" 1696
"ge-0/0/0" {0=d385207d-d11a-44a3-ab48-996cdb89d93

{
    "logical-interface": {
        "display_name": "ge-0/0/0.1688",
        "fq_name": [
            "default-global-system-config",
            "shinjuku",
            "ge-0/0/0",
            "ge-0/0/0.1688"
        ],
        "href": "http://172.27.113.85:8082/logical-interface/789e3cf7-b7d6-49e0-a52e-db342744607e",
        "id_perms": {
            "created": "2015-03-26T16:02:09.001503",
            "creator": null,
            "description": null,
            "enable": true,
            "last_modified": "2015-03-26T16:02:09.001503",
            "permissions": {
                "group": "admin",
                "group_access": 7,
                "other_access": 7,
                "owner": "admin",
                "owner_access": 7
            },
            "user_visible": true,
            "uuid": {
                "uuid_lslong": 11902691882230374526,
                "uuid_mslong": 8691451365510498784
            }
        },
        "logical_interface_type": "l2",
        "logical_interface_vlan_tag": 1688,
        "name": "ge-0/0/0.1688",
        "parent_href": "http://172.27.113.85:8082/physical-interface/2b87f79d-2ed9-4443-9b39-34215ae3b203",
        "parent_type": "physical-interface",
        "parent_uuid": "2b87f79d-2ed9-4443-9b39-34215ae3b203",
        "uuid": "789e3cf7-b7d6-49e0-a52e-db342744607e",
        "virtual_machine_interface_refs": [
            {
                "attr": null,
                "href": "http://172.27.113.85:8082/virtual-machine-interface/d6e7c82a-66f3-428e-b09e-ec99d0e5e720",
                "to": [
                    "default-domain",
                    "demo",
                    "port_2_1688"
                ],
                "uuid": "d6e7c82a-66f3-428e-b09e-ec99d0e5e720"
            }
        ]
    }
}

{
    "virtual-network": {
        "display_name": "net1688",
        "fq_name": [
            "default-domain",
            "demo",
            "net1688"
        ],
        "href": "http://172.27.113.85:8082/virtual-network/35fb066b-0bd4-41c5-8766-1c2d93357bae",
        "id_perms": {
            "created": "2015-03-26T10:11:26.753661",
            "creator": null,
            "description": null,
            "enable": true,
            "last_modified": "2015-03-26T10:11:27.034485",
            "permissions": {
                "group": "admin",
                "group_access": 7,
                "other_access": 7,
                "owner": "admin",
                "owner_access": 7
            },
            "user_visible": true,
            "uuid": {
                "uuid_lslong": 9756516624813620142,
                "uuid_mslong": 3889709759994282437
            }
        },
        "instance_ip_back_refs": [
            {
                "attr": null,
                "href": "http://172.27.113.85:8082/instance-ip/27a64db9-bae7-4e32-a935-4b7c487d9f58",
                "to": [
                    "port_2_1688"
                ],
                "uuid": "27a64db9-bae7-4e32-a935-4b7c487d9f58"
            },
            {
                "attr": null,
                "href": "http://172.27.113.85:8082/instance-ip/8b3f1a93-db92-49a8-b4e3-d0bb5fb7b7ef",
                "to": [
                    "port_1_1688"
                ],
                "uuid": "8b3f1a93-db92-49a8-b4e3-d0bb5fb7b7ef"
            }
        ],
        "name": "net1688",
        "network_ipam_refs": [
            {
                "attr": {
                    "ipam_subnets": [
                        {
                            "default_gateway": "100.0.0.254",
                            "dns_server_address": "100.0.0.253",
                            "subnet": {
                                "ip_prefix": "100.0.0.0",
                                "ip_prefix_len": 24
                            },
                            "subnet_uuid": "ed69c9f0-c395-40e7-ab82-49adeaf0eec3"
                        }
                    ]
                },
                "href": "http://172.27.113.85:8082/network-ipam/1723c3b6-6be2-4c90-ac5f-27e784bf444c",
                "to": [
                    "default-domain",
                    "default-project",
                    "default-network-ipam"
                ],
                "uuid": "1723c3b6-6be2-4c90-ac5f-27e784bf444c"
            }
        ],
        "parent_href": "http://172.27.113.85:8082/project/87096c40-210e-4502-a0f3-d077fb9364d1",
        "parent_type": "project",
        "parent_uuid": "87096c40-210e-4502-a0f3-d077fb9364d1",
        "routing_instances": [
            {
                "href": "http://172.27.113.85:8082/routing-instance/f438a46c-b33a-4ee5-8c08-c99027430f6a",
                "to": [
                    "default-domain",
                    "demo",
                    "net1688",
                    "net1688"
                ],
                "uuid": "f438a46c-b33a-4ee5-8c08-c99027430f6a"
            }
        ],
        "uuid": "35fb066b-0bd4-41c5-8766-1c2d93357bae",
        "virtual_machine_interface_back_refs": [
            {
                "attr": null,
                "href": "http://172.27.113.85:8082/virtual-machine-interface/a19ae75f-d04f-4f4d-a074-7271464a3385",
                "to": [
                    "default-domain",
                    "demo",
                    "port_1_1688"
                ],
                "uuid": "a19ae75f-d04f-4f4d-a074-7271464a3385"
            },
            {
                "attr": null,
                "href": "http://172.27.113.85:8082/virtual-machine-interface/d6e7c82a-66f3-428e-b09e-ec99d0e5e720",
                "to": [
                    "default-domain",
                    "demo",
                    "port_2_1688"
                ],
                "uuid": "d6e7c82a-66f3-428e-b09e-ec99d0e5e720"
            }
        ],
        "virtual_network_properties": {
            "allow_transit": null,
            "forwarding_mode": null,
            "network_id": 1696,
            "rpf": null,
            "vxlan_network_identifier": null
        }
    }
}

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/8837
Submitter: Praveen K V (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/8837
Committed: http://github.org/Juniper/contrail-controller/commit/c6b3730099345a4870ac5a06a3c1bb448d224b7a
Submitter: Zuul
Branch: R2.1

commit c6b3730099345a4870ac5a06a3c1bb448d224b7a
Author: Praveen K V <email address hidden>
Date: Thu Apr 2 14:59:43 2015 +0530

Handle VLAN property not set in logical-interface

We do not allow modificaiton of vlan-tag in logical-interface. But, in
IFMap messages its possible that VLAN-Tag property is not set. In
such case, we were setting vlan-tag to 0 and then change the value later
when property is received.

Modified agent code to ignore IFMap messages when vlan-tag property is
not set.

Change-Id: I7447a757c7a15367ffb75e881e266379b26c1abc
Fixes-bug: #1437105

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/8902
Submitter: Praveen K V (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/8902
Committed: http://github.org/Juniper/contrail-controller/commit/5963bca9a8d02c99a04995cb0a499d4c0f44dcc7
Submitter: Zuul
Branch: master

commit 5963bca9a8d02c99a04995cb0a499d4c0f44dcc7
Author: Praveen K V <email address hidden>
Date: Thu Apr 2 14:59:43 2015 +0530

Handle VLAN property not set in logical-interface

We do not allow modificaiton of vlan-tag in logical-interface. But, in
IFMap messages its possible that VLAN-Tag property is not set. In
such case, we were setting vlan-tag to 0 and then change the value later
when property is received.

Modified agent code to ignore IFMap messages when vlan-tag property is
not set.

Change-Id: I7447a757c7a15367ffb75e881e266379b26c1abc
Fixes-bug: #1437105