From 62009227bef4a219273677853a44301cbcfa7559 Mon Sep 17 00:00:00 2001
From: Dan Bode <dan@puppetlabs.com>
Date: Thu, 24 May 2012 16:58:50 -0700
Subject: [PATCH] Project should be set

Previously, a project parameter was specific in the nova::manage::network
define, but it was not forwarded to the nova_network declaration.

This commit fixes it, ensuring that users can associate projects to networks.
---
 manifests/manage/network.pp          |  2 +-
 spec/defines/nova_manage_networks.pp | 56 ++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 spec/defines/nova_manage_networks.pp

diff --git a/manifests/manage/network.pp b/manifests/manage/network.pp
index 7c04f873..4e210269 100644
--- a/manifests/manage/network.pp
+++ b/manifests/manage/network.pp
@@ -18,7 +18,7 @@
     ensure       => present,
     network      => $network,
     num_networks => $num_networks,
-    project      => undef,
+    project      => $project,
     notify       => Exec['nova-db-sync'],
   }
 
diff --git a/spec/defines/nova_manage_networks.pp b/spec/defines/nova_manage_networks.pp
new file mode 100644
index 00000000..5606bf88
--- /dev/null
+++ b/spec/defines/nova_manage_networks.pp
@@ -0,0 +1,56 @@
+require 'spec_helper'
+
+describe 'nova::manage::network' do
+
+  let :facts do
+    {:osfamily => 'RedHat'}
+  end
+
+  let :pre_condition do
+    'include nova'
+  end
+
+  let :title do
+    'foo'
+  end
+
+  describe 'with only required parameters' do
+    let :params do
+      {
+        :network => '10.0.0.0/24'
+      }
+    end
+    it { should contain_nova_network('foo').with(
+      :ensure       => 'present',
+      :network      => '10.0.0.0/24',
+      :num_networks => 1,
+      :project      => nil,
+      :notify       => 'Exec[nova-db-sync]'
+    ) }
+  end
+  describe 'when overriding num networks' do
+    let :params do
+      {
+        :network      => '10.0.0.0/20',
+        :num_networks => 2
+      }
+    end
+    it { should contain_nova_network('foo').with(
+      :network      => '10.0.0.0/20',
+      :num_networks => 2
+    ) }
+  end
+
+  describe 'when overriding projects' do
+    let :params do
+      {
+        :network => '10.0.0.0/20',
+        :project => 'foo'
+      }
+    end
+    it { should contain_nova_network('foo').with(
+      :network => '10.0.0.0/20',
+      :project => 'foo'
+    ) }
+  end
+end