lib/fog/azurerm/models/dns/zone.rb in fog-azure-rm-0.0.8 vs lib/fog/azurerm/models/dns/zone.rb in fog-azure-rm-0.0.9

@@ -10,34 +10,48 @@
         attribute :location
         attribute :type
         attribute :tags
         attribute :etag
         attribute :number_of_record_sets
-        attribute :max_number_of_recordsets
+        attribute :max_number_of_record_sets
 
         def self.parse(zone)
           hash = {}
-          hash['id'] = zone['id']
-          hash['name'] = zone['name']
-          hash['resource_group'] = zone['id'].split('/')[4]
-          hash['location'] = zone['location']
-          hash['type'] = zone['type']
-          hash['tags'] = zone['tags']
-          hash['etag'] = zone['etag']
-          hash['number_of_record_sets'] = zone['properties']['numberOfRecordSets']
-          hash['max_number_of_recordsets'] = zone['properties']['maxNumberOfRecordSets']
+          hash['id'] = zone.id
+          hash['name'] = zone.name
+          hash['resource_group'] = get_resource_group_from_id(zone.id)
+          hash['location'] = zone.location
+          hash['type'] = zone.type
+          hash['tags'] = zone.tags
+          hash['etag'] = zone.etag
+          hash['number_of_record_sets'] = zone.number_of_record_sets
+          hash['max_number_of_record_sets'] = zone.max_number_of_record_sets
           hash
         end
 
         def save
-          requires :name
-          requires :resource_group
-          zone = service.create_or_update_zone(resource_group, name)
+          requires :name, :resource_group, :location
+          zone = service.create_or_update_zone(zone_params)
           merge_attributes(Fog::DNS::AzureRM::Zone.parse(zone))
         end
 
         def destroy
           service.delete_zone(resource_group, name)
+        end
+
+        private
+
+        def zone_params
+          {
+            name: name,
+            resource_group: resource_group,
+            location: location,
+            type: type,
+            tags: tags,
+            number_of_record_sets: number_of_record_sets,
+            max_number_of_record_sets: max_number_of_record_sets,
+            etag: etag
+          }
         end
       end
     end
   end
 end