[1/10] git commit: CIMI: fix the order of toplevel entities in the cloud entry point

[lu...@apache.org]

Updated Branches:
  refs/heads/master eeaf1c699 -> 54a51e8bc


CIMI: fix the order of toplevel entities in the cloud entry point


Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/54a51e8b
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/54a51e8b
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/54a51e8b

Branch: refs/heads/master
Commit: 54a51e8bc920e68084d080e5c8802233fa27c530
Parents: dc7053a
Author: David Lutterkort <lu...@redhat.com>
Authored: Wed Sep 19 14:52:49 2012 -0700
Committer: David Lutterkort <lu...@redhat.com>
Committed: Mon Sep 24 16:52:15 2012 -0700

----------------------------------------------------------------------
 server/lib/cimi/models.rb |   27 +++++++++++++++------------
 1 files changed, 15 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltacloud/blob/54a51e8b/server/lib/cimi/models.rb
----------------------------------------------------------------------
diff --git a/server/lib/cimi/models.rb b/server/lib/cimi/models.rb
index e0a9544..fc9a291 100644
--- a/server/lib/cimi/models.rb
+++ b/server/lib/cimi/models.rb
@@ -23,29 +23,32 @@ require_relative './models/schema'
 require_relative './models/base'
 require_relative './models/collection'
 require_relative './models/errors'
+require_relative './models/action'
+require_relative './models/disk'
+require_relative './models/disk_collection'
+require_relative './models/machine_volume'
+require_relative './models/machine_volume_collection'
+
+# Toplevel entities; order matters as it determines the order
+# in which the entities appear in the CEP
 require_relative './models/cloud_entry_point'
 require_relative './models/resource_metadata'
+require_relative './models/machine'
 require_relative './models/machine_template'
-require_relative './models/machine_image'
 require_relative './models/machine_configuration'
-require_relative './models/action'
-require_relative './models/machine'
-require_relative './models/volume'
+require_relative './models/machine_image'
 require_relative './models/credential'
+require_relative './models/volume'
+require_relative './models/volume_template'
 require_relative './models/volume_configuration'
 require_relative './models/volume_image'
-require_relative './models/volume_template'
 require_relative './models/network'
-require_relative './models/network_configuration'
 require_relative './models/network_template'
-require_relative './models/routing_group'
-require_relative './models/routing_group_template'
+require_relative './models/network_configuration'
 require_relative './models/network_port'
 require_relative './models/network_port_template'
 require_relative './models/network_port_configuration'
 require_relative './models/address'
 require_relative './models/address_template'
-require_relative './models/disk'
-require_relative './models/disk_collection'
-require_relative './models/machine_volume'
-require_relative './models/machine_volume_collection'
+require_relative './models/routing_group'
+require_relative './models/routing_group_template'