lib/yao/resources/port.rb in yao-0.7.0 vs lib/yao/resources/port.rb in yao-0.8.0

@@ -1,21 +1,21 @@
 module Yao::Resources
   class Port < Base
+
+    include NetworkAssociationable
+    include TenantAssociationable
+
     friendly_attributes :name, :mac_address, :status, :allowed_address_pairs,
                         :device_owner, :fixed_ips, :security_groups, :device_id,
-                        :network_id, :tenant_id, :admin_state_up
+                        :admin_state_up
     map_attribute_to_attribute "binding:host_id" => :host_id
 
     def primary_ip
       fixed_ips.first["ip_address"]
     end
 
     def primary_subnet
-      Yao::Subnet.find fixed_ips.first["subnet_id"]
-    end
-
-    def network
-      Yao::Network.find network_id
+      @subnet ||= Yao::Subnet.find fixed_ips.first["subnet_id"]
     end
 
     self.service        = "network"
     self.resource_name  = "port"
     self.resources_name = "ports"