From: Jan Provaznik <jprovazn(a)redhat.com>
---
src/app/util/image_descriptor_xml.rb | 10 ++++++--
.../image_descriptor_package_repositories.yml | 21 ++++++++++++++++---
.../image_descriptor_platform_repositories.yml | 12 ++++++++++-
src/features/api.feature | 1 +
src/features/instance.feature | 1 +
src/features/provider.feature | 1 +
6 files changed, 38 insertions(+), 8 deletions(-)
diff --git a/src/app/util/image_descriptor_xml.rb b/src/app/util/image_descriptor_xml.rb
index 3a4bbae..2375abb 100644
--- a/src/app/util/image_descriptor_xml.rb
+++ b/src/app/util/image_descriptor_xml.rb
@@ -73,9 +73,13 @@ class ImageDescriptorXML
install_node.set_attribute('type', 'url')
platform_node << install_node
url_node = Nokogiri::XML::Node.new('url', @doc)
- # TODO: change when more than one os is supported by conductor
- # url_node.content =
"http://download.fedoraproject.org/pub/fedora/linux/releases/13/Fedora/x86_64/os/"
- url_node.content =
YAML.load_file("#{RAILS_ROOT}/config/image_descriptor_package_repositories.yml")['baseurl']
+ # TODO - currently we have platform repositories and package repositories,
+ # mainly because it was possible to have multiple package repositories for
+ # a platform before. Also platform url wasn't needed for old imagefactory.
+ # Should be reworked when we switch to pulp
+ platform_id = platform_hash['name'].downcase
+ rep = repository_manager.repositories.find {|r| r.id == platform_id}
+ url_node.content = rep.yumurl if rep
install_node << url_node
end
diff --git a/src/config/image_descriptor_package_repositories.yml
b/src/config/image_descriptor_package_repositories.yml
index c600ccc..fa8cac4 100644
--- a/src/config/image_descriptor_package_repositories.yml
+++ b/src/config/image_descriptor_package_repositories.yml
@@ -1,7 +1,20 @@
-id: fedora
-name: Fedora
-baseurl:
http://download.fedoraproject.org/pub/fedora/linux/releases/13/Everything...
-type: xml
+-
+ id: fedora
+ name: Fedora
+ baseurl:
http://download.fedoraproject.org/pub/fedora/linux/releases/13/Everything...
+ type: xml
+
+-
+ id: fedora14
+ name: Fedora 14
+ baseurl:
http://download.fedoraproject.org/pub/fedora/linux/releases/14/Everything...
+ type: xml
+
+-
+ id: fedora_rawhide
+ name: Fedora Rawhide
+ baseurl:
http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/x8...
+ type: xml
# you can define multiple repositories, as array, for example:
#
diff --git a/src/config/image_descriptor_platform_repositories.yml
b/src/config/image_descriptor_platform_repositories.yml
index d16d0c0..baa3063 100644
--- a/src/config/image_descriptor_platform_repositories.yml
+++ b/src/config/image_descriptor_platform_repositories.yml
@@ -1,4 +1,14 @@
fedora:
- name: Fedora
+ name: Fedora 13
version: 13
architecture: x86_64
+
+fedora14:
+ name: Fedora 14
+ version: 14
+ architecture: x86_64
+
+fedora_rawhide:
+ name: Fedora Rawhide
+ version: rawhide
+ architecture: x86_64
diff --git a/src/features/api.feature b/src/features/api.feature
index 4ff624a..4651b8f 100644
--- a/src/features/api.feature
+++ b/src/features/api.feature
@@ -6,6 +6,7 @@ Feature: User authentication
Background:
Given I am an authorised user
And I am logged in
+ And There is a mock pulp repository
Scenario: Check can start instance
Given there is a user "testuser"
diff --git a/src/features/instance.feature b/src/features/instance.feature
index ed08fb4..19b80bd 100644
--- a/src/features/instance.feature
+++ b/src/features/instance.feature
@@ -7,6 +7,7 @@ Feature: Mange Instances
Background:
Given I am an authorised user
And I am logged in
+ And There is a mock pulp repository
Scenario: Download an Instance Key
Given a mock running instance exists
diff --git a/src/features/provider.feature b/src/features/provider.feature
index 4b6c50c..7dac8b0 100644
--- a/src/features/provider.feature
+++ b/src/features/provider.feature
@@ -6,6 +6,7 @@ Feature: Manage Providers
Background:
Given I am an authorised user
And I am logged in
+ And There is a mock pulp repository
Scenario: List providers
Given I am on the homepage
--
1.7.4