Merge "Metadata6 with vhost fabric VRF routes to the IPv6 LL address of vhost0 interface"

Author: tf-gerrit

src/vnsw/agent/kstate/test/test_kstate.cc

@@ -11,12 +11,6 @@
 #include "xmpp/test/xmpp_test_util.h"
 #include "ksync/ksync_sock_user.h"
 
-// This is required to deactivate metadata proxy part, which installs it's
-// own routes
-#include "services/metadata_proxy.h"
-#include "services/metadata_server.h"
-#include "services/services_init.h"
-
 #define vm1_ip "1.1.1.1"
 #define vm2_ip "2.1.1.1"
 #define vm3_ip "3.1.1.1"
@@ -66,7 +60,6 @@ class KStateTest : public ::testing::Test {
 public:
 
     KStateTest() {
-        Agent::GetInstance()->services()->metadataproxy()->Shutdown();
     }
 
     ~KStateTest() {}

src/vnsw/agent/oper/metadata_ip.cc

@@ -188,7 +188,8 @@ void MetaDataIpAllocator::ReleaseIndex(MetaDataIp *ip) {
 }
 
 bool MetaDataIpAllocator::CanAddRoute(MetaDataIp* ip) {
-    if (ip->intf_->vn() == NULL || ip->intf_->vrf() == NULL) {
+    if (ip->intf_->vmi_type() == VmInterface::VHOST ||
+        ip->intf_->vn() == NULL || ip->intf_->vrf() == NULL) {
         return false;
     }
 

src/vnsw/agent/oper/test/test_tsn_elector.cc

@@ -22,12 +22,6 @@
 #include <oper/interface_common.h>
 #include <oper/tunnel_nh.h>
 
-// This is required to deactivate metadata proxy part, which installs it's
-// own routes
-#include "services/metadata_proxy.h"
-#include "services/metadata_server.h"
-#include "services/services_init.h"
-
 #include "testing/gunit.h"
 #include "test_cmn_util.h"
 #include "vr_types.h"
@@ -53,7 +47,6 @@ static void ValidateSandeshResponse(Sandesh *sandesh, vector<int> &result) {
 class TsnElectorTest : public ::testing::Test {
 public:
     TsnElectorTest() : agent_(Agent::GetInstance()) {
-        Agent::GetInstance()->services()->metadataproxy()->Shutdown();
     }
 
     ~TsnElectorTest() {

src/vnsw/agent/pkt/test/test_tsn_flow.cc

@@ -12,12 +12,6 @@
 #include <base/task.h>
 #include <base/test/task_test_util.h>
 
-// This is required to deactivate metadata proxy part, which installs it's
-// own routes
-#include "services/metadata_proxy.h"
-#include "services/metadata_server.h"
-#include "services/services_init.h"
-
 #define vm1_ip "11.1.1.1"
 #define vm2_ip "11.1.1.2"
 
@@ -32,7 +26,6 @@ VmInterface *flow1;
 class TestTsnFlow : public ::testing::Test {
 public:
     TestTsnFlow() : agent_(NULL), flow_proto_(NULL), util_() {
-        Agent::GetInstance()->services()->metadataproxy()->Shutdown();
     }
 
     ~TestTsnFlow(){};

src/vnsw/agent/services/metadata_proxy.h

@@ -68,18 +68,7 @@ class MetadataProxy {
     /// @param vhost_ll_ip is a new IP address for vhost0 interface
     /// @return true if address has been successfully bound to the
     /// interface and false otherwise
-    bool NetlinkAddVhostIp(const IpAddress& vhost_ll_ip);
-
-    /// @brief Deletes an IP address specified in vhost_ll_ip from vhost0
-    //// interface inet6 addresses
-    /// @param vhost_ll_ip is an IPv6 address to the vhost0 interface
-    void NetlinkDelVhostIp(const IpAddress& vhost_ll_ip);
-
-    /// @brief Adds a new neighbour (an arp entry) with given IP and MAC
-    /// addresses
-    /// @param nb_ip - the IP address of a neighbour
-    /// @param via_mac - the MAC address of a neighbour
-    void NetlinkAddVhostNb(const IpAddress& nb_ip, const MacAddress& via_mac);
+    bool NetlinkGetVhostIp(Ip6Address& vhost_ll_ip);
 
     /// @brief Advertises routes to a given vm-interface via a given IPv6
     /// address. Routes are announced in the fabric VRF entry and in a given
@@ -104,6 +93,15 @@ class MetadataProxy {
     /// @brief Initializes an HTTP server for IPv6 requests
     void InitializeHttp6Server(const VmInterface *vhost0);
 
+    /// @brief Advertises the LL route to vhost0 interface in the fabric VRF
+    /// instance
+    void AdvertiseVhostRoute();
+
+
+    /// @brief Deletes the LL route to vhost0 interface in the fabric VRF
+    /// instance
+    void DeleteVhostRoute();
+
     /// @brief A callback that is invoked each time when a VRF entry is
     /// modified: added, changed or deleted
     /// @param part is a pointer to a table partititon containing corresponding

src/vnsw/agent/services/metadata_proxy_ip6.cc

@@ -143,15 +143,12 @@ const Ip6Address& MetadataProxy::Ipv6ServiceAddress() const {
 
 void MetadataProxy::InitializeHttp6Server(const VmInterface *vhost0) {
     if (vhost0 == NULL ||
-        vhost0->mdata_ip6_addr().is_unspecified() ||
-        !vhost0->mdata_ip6_addr().is_link_local() ||
         !ipv6_service_address_.is_unspecified()) {
         return;
     }
-    ipv6_service_address_ = vhost0->mdata_ip6_addr();
-    if (!NetlinkAddVhostIp(ipv6_service_address_)) {
-        LOG(ERROR, "An error has occured during binding IPv6 ll"
-        " address to vhost0 in"
+    if (!NetlinkGetVhostIp(ipv6_service_address_)) {
+        LOG(ERROR, "An error has occured during retrieving IPv6 ll"
+        " address from vhost0 in"
         " MetadataProxy::InitializeHttp6Server");
         return;
     }
@@ -162,6 +159,41 @@ void MetadataProxy::InitializeHttp6Server(const VmInterface *vhost0) {
     http_server6_->Initialize(
         services_->agent()->metadata_server_port(),
         ipv6_service_address_, vhost_idx);
+    AdvertiseVhostRoute();
+}
+
+void MetadataProxy::AdvertiseVhostRoute() {
+    PathPreference path_preference;
+    EcmpLoadBalance ecmp_load_balance;
+
+    Agent *agent = services_->agent();
+
+    const VmInterface *vhost_intf =
+        dynamic_cast<const VmInterface*>(agent->vhost_interface());
+
+    VnListType vn_list;
+    vn_list.insert(agent->fabric_vn_name());
+
+    InetUnicastAgentRouteTable *table =
+        static_cast<InetUnicastAgentRouteTable*>
+        (agent->vrf_table()->GetInet6UnicastRouteTable(
+                                        agent->fabric_vrf_name()));
+
+    table->AddLocalVmRouteReq(
+        agent->link_local_peer(), agent->fabric_vrf_name(),
+        Ipv6ServiceAddress(), 128, vhost_intf->GetUuid(),
+        vn_list, vhost_intf->label(), SecurityGroupList(),
+        TagList(), CommunityList(), true, path_preference,
+        Ip6Address(), ecmp_load_balance, false, false, false,
+        vhost_intf->name());
+}
+
+void MetadataProxy::DeleteVhostRoute() {
+    Agent *agent = services_->agent();
+
+    InetUnicastAgentRouteTable::Delete(agent->link_local_peer(),
+        agent->fabric_vrf_name(),
+        Ipv6ServiceAddress(), 128);
 }
 
 void MetadataProxy::OnAVrfChange(DBTablePartBase *, DBEntryBase * entry) {
@@ -183,7 +215,6 @@ void MetadataProxy::OnAVrfChange(DBTablePartBase *, DBEntryBase * entry) {
                 }
             }
         }
-        // this->AdvertiseVhostRoute(vrf_entry);
     }
 }
 
@@ -213,15 +244,6 @@ void MetadataProxy::OnAFabricRouteChange
     if (interface == NULL) {
         return;
     }
-    const Ip6Address mip6 = interface->mdata_ip6_addr();
-
-    if (mip6 == route_entry->addr().to_v6()) {
-        if (entry->IsDeleted()) {
-        } else {
-            // Create neighbours records (ip neigh add ...)
-            this->NetlinkAddVhostNb(mip6, interface->vm_mac());
-        }
-    }
 }
 
 void MetadataProxy::OnAnInterfaceChange(DBTablePartBase *, DBEntryBase *entry) {
@@ -238,10 +260,8 @@ void MetadataProxy::OnAnInterfaceChange(DBTablePartBase *, DBEntryBase *entry) {
         InitializeHttp6Server(vmi);
     }
 
-    if (vmi->IsDeleted() &&
-        vmi->name() == services_->agent()->vhost_interface_name()) {
-        NetlinkDelVhostIp(vmi->mdata_ip6_addr());
-        return;
+    if (vmi->IsDeleted() && vmi == services_->agent()->vhost_interface()) {
+        this->DeleteVhostRoute();
     }
 }