foreman_docker 2.0.1 → 2.1.0

data/locale/zh_TW/foreman_docker.po

@@ -3,7 +3,6 @@ msgid ""
 msgstr ""
 "Project-Id-Version: version 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-22 12:12-0400\n"
 "PO-Revision-Date: 2015-04-27 05:20+0000\n"
 "Last-Translator: tchuang <tchuang@redhat.com>\n"
 "Language-Team: Chinese (Taiwan)\n"
@@ -14,20 +13,28 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: Zanata 3.6.0\n"
 
-msgid "\"#{resource.name}\""
-msgstr "\"#{resource.name}\""
-
 msgid "%{container} commit was successful"
-msgstr "%{container} 交付成功"
+msgstr ""
 
-# translation auto-copied from project Satellite6 Foreman, version 6.1, document foreman
-msgid "%{cores} Cores and %{memory} memory"
-msgstr "%{cores} 核心 ， %{memory} 記憶體"
+msgid "%{cores} cores and %{memory} memory"
+msgstr ""
 
 # translation auto-copied from project Satellite6 Foreman, version 6.1, document foreman
 msgid "%{vm} is now %{vm_state}"
 msgstr "%{vm} 目前狀態為 %{vm_state}"
 
+msgid "Action"
+msgstr ""
+
+msgid "Actions"
+msgstr ""
+
+msgid "Add DNS"
+msgstr ""
+
+msgid "Add Exposed Port"
+msgstr ""
+
 msgid "Add environment variable"
 msgstr "新增環境變數"
 
@@ -64,6 +71,9 @@ msgstr "上一步"
 msgid "Basic options"
 msgstr "基本選項"
 
+msgid "CPU set"
+msgstr ""
+
 msgid "CPU sets"
 msgstr "CPU 集"
 
@@ -99,21 +109,39 @@ msgstr "運算選項"
 msgid "Compute resource"
 msgstr "運算資源"
 
+msgid "Configuration"
+msgstr ""
+
 msgid "Container %s is being deleted."
 msgstr "Container %s 正被刪除中。"
 
 msgid "Containers"
 msgstr "Container"
 
+msgid "Content View"
+msgstr ""
+
 # translation auto-copied from project Satellite6 Foreman, version 6.1, document foreman
 msgid "Cores"
 msgstr "核心"
 
+msgid "Could not start container"
+msgstr ""
+
 msgid "Create a container"
 msgstr "建立 container"
 
-msgid "Create container in a compute resource"
-msgstr "在運算資源中建立 container"
+msgid "Create a docker registry"
+msgstr ""
+
+msgid "Create container on a compute resource"
+msgstr ""
+
+msgid "DNS"
+msgstr ""
+
+msgid "DNS e.g. 8.8.8.8"
+msgstr ""
 
 # translation auto-copied from project Satellite6 Foreman Discovery, version 6.1, document foreman_discovery
 msgid "Delete %s?"
@@ -122,16 +150,16 @@ msgstr "刪除 %s？"
 msgid "Delete a container"
 msgstr "刪除 container"
 
-msgid "Delete container in a compute resource"
-msgstr "刪除運算資源中的 container"
+msgid "Delete a docker registry"
+msgstr ""
+
+msgid "Delete container on a compute resource"
+msgstr ""
 
 # translation auto-copied from project Satellite6 Foreman, version 6.1, document foreman
 msgid "Deploy on"
 msgstr "建置於"
 
-msgid "Describing of the registry"
-msgstr "登錄檔詳述"
-
 # translation auto-copied from project Satellite6 Hammer CLI Foreman, version 6.1, document hammer-cli-foreman
 msgid "Description"
 msgstr "描述"
@@ -139,6 +167,9 @@ msgstr "描述"
 msgid "Description of the commit"
 msgstr "交付詳述"
 
+msgid "Description of the registry"
+msgstr ""
+
 msgid "Docker hub"
 msgstr "Docker hub"
 
@@ -154,6 +185,9 @@ msgstr "此映像檔是否支援使用者資料輸入？"
 msgid "Edit Registry"
 msgstr "編輯登錄檔"
 
+msgid "Environment"
+msgstr ""
+
 msgid "Environment Variables"
 msgstr "環境變數"
 
@@ -170,6 +204,9 @@ msgstr "連上運算資源時發生了錯誤：<strong> %s </strong>"
 msgid "Error creating communicating with Docker. Check the Foreman logs: %s"
 msgstr "與 Docker 建立通訊時發生了錯誤。請檢查 Foreman 的日誌：%s"
 
+msgid "Exposed Ports"
+msgstr ""
+
 msgid "Exposed ports"
 msgstr "公開的連接埠"
 
@@ -179,16 +216,19 @@ msgstr "外部登錄檔"
 msgid "Failed to commit %{container}: %{e}"
 msgstr "%{container} 交付失敗：%{e}"
 
-msgid "Find your favorite container, e.g: centos"
-msgstr "尋找您偏好使用的 container，例如 centos"
+msgid "Find your favorite container, e.g. centos"
+msgstr ""
 
-msgid "Foreman user <foremaner@theforeman.org>"
-msgstr "Foreman 使用者 <foremaner@theforeman.org>"
+msgid "Foreman user <foremaner@example.org>"
+msgstr ""
 
 # translation auto-copied from project Satellite6 Foreman Discovery, version 6.1, document foreman_discovery
 msgid "IP Address"
 msgstr "IP 位址"
 
+msgid "If selected, the container will start after it is created"
+msgstr ""
+
 # translation auto-copied from project Satellite6 Hammer CLI Foreman, version 6.1, document hammer-cli-foreman
 msgid "Image"
 msgstr "映像檔"
@@ -199,22 +239,14 @@ msgstr "映像檔軟體庫"
 msgid "Image Tag"
 msgstr "映像檔標籤"
 
-msgid ""
-"Image to use to create the container.\\n                                     "
-"       Format should be repository:tag, e.g: centos:7"
-msgstr ""
-"使用來建立 container 的映像檔。\\n                                            格式應該是 "
-"repository:tag，例如：centos:7"
-
-# translation auto-copied from project Red Hat Satellite User Guide, version 6.0, document chap-Introduction_to_Red_Hat_Satellite
-msgid "Katello"
-msgstr "Katello"
-
 msgid "List all containers"
 msgstr "列出所有 container"
 
-msgid "List all containers in a compute resource"
-msgstr "列出運算資源中的所有  container"
+msgid "List all containers on a compute resource"
+msgstr ""
+
+msgid "List all docker registries"
+msgstr ""
 
 # translation auto-copied from project Satellite6 Hammer CLI Foreman, version 6.1, document hammer-cli-foreman
 msgid "Locations"
@@ -236,8 +268,11 @@ msgstr "記憶體"
 msgid "Name"
 msgstr "名稱"
 
-msgid "Name, e.g: PING_HOST"
-msgstr "名稱，例如 PING_HOST"
+msgid "Name of the repository to use to create the container. e.g. centos"
+msgstr ""
+
+msgid "Name, e.g. PING_HOST"
+msgstr ""
 
 msgid "New Registry"
 msgstr "新增登錄檔"
@@ -245,6 +280,9 @@ msgstr "新增登錄檔"
 msgid "New container"
 msgstr "新增 container"
 
+msgid "New registry"
+msgstr ""
+
 # translation auto-copied from project subscription-manager, version 1.10.10, document keys
 msgid "Next"
 msgstr "下一步"
@@ -271,10 +309,12 @@ msgstr "用來進行認證的密碼 - 用於 SSH 完成步驟。"
 msgid "Password used for authentication to the registry"
 msgstr "用來認證登錄檔的密碼"
 
-msgid ""
-"Please turn on your container to see processes running, logs, and more."
+msgid "Please turn on your container to see processes running, logs, and more."
 msgstr "請開啟您的 container 以查看執行中的程序、日誌等等。"
 
+msgid "Port number e.g. 22"
+msgstr ""
+
 # translation auto-copied from project Satellite6 Hammer CLI Foreman, version 6.1, document hammer-cli-foreman
 msgid "Power"
 msgstr "電源"
@@ -283,6 +323,9 @@ msgstr "電源"
 msgid "Power ON this machine"
 msgstr "開啟這部機器的電源"
 
+msgid "Preliminary"
+msgstr ""
+
 # translation auto-copied from project gnome-system-monitor, version 3.8.2.1, document gnome-system-monitor
 msgid "Processes"
 msgstr "程序"
@@ -297,18 +340,8 @@ msgstr "登錄檔"
 msgid "Registry"
 msgstr "登錄檔"
 
-msgid "Registry name"
-msgstr "登錄檔名稱"
-
-msgid ""
-"Registry this container will have to use\\n                                  "
-"                      to get the image"
+msgid "Registry this container will have to use to get the image"
 msgstr ""
-"這個 container 取得映像檔所必須\\n                                                     "
-"   使用的登錄檔"
-
-msgid "Registry url"
-msgstr "登錄檔網址"
 
 msgid "Repo"
 msgstr "軟體庫"
@@ -319,8 +352,11 @@ msgstr "資源選擇"
 msgid "Run power operation on a container"
 msgstr "在一個 container 上執行電源作業"
 
-msgid "Run power operation on a container in a compute resource"
-msgstr "在運算資源中的 container 上執行電源作業"
+msgid "Run power operation on a container on a compute resource"
+msgstr ""
+
+msgid "Run?"
+msgstr ""
 
 # translation auto-copied from project Satellite6 Foreman, version 6.1, document foreman
 msgid "Running on"
@@ -339,14 +375,17 @@ msgstr "Shell"
 msgid "Show a container"
 msgstr "顯示 container"
 
-msgid "Show container in a compute resource"
-msgstr "顯示運算資源中的 container"
+msgid "Show a docker registry"
+msgstr ""
 
 msgid "Show container logs"
 msgstr "顯示 container 的日誌"
 
-msgid "Show logs from a container in a compute resource"
-msgstr "顯示運算資源中的 container 日誌"
+msgid "Show container on a compute resource"
+msgstr ""
+
+msgid "Show logs from a container on a compute resource"
+msgstr ""
 
 # translation auto-copied from project Satellite6 Foreman, version 6.1, document foreman
 msgid "Start"
@@ -368,13 +407,17 @@ msgstr "TTY"
 msgid "Tag"
 msgstr "標籤"
 
+msgid "Tag to use to create the container. e.g. latest"
+msgstr ""
+
 # translation auto-copied from project Satellite6 Foreman, version 6.1, document foreman
 msgid "Test Connection"
 msgstr "測試連線"
 
-msgid ""
-"The user that is used to ssh into the instance, normally docker-user, "
-"ubuntu, root etc"
+msgid "The capsule this container will have to use to get the image. Relevant for images retrieved from katello registry."
+msgstr ""
+
+msgid "The user that is used to ssh into the instance, normally docker-user, ubuntu, root etc"
 msgstr "使用來 ssh 入 instance 的使用者，一般會是 docker-user、ubuntu、root 等等"
 
 # translation auto-copied from project Satellite6 Hammer CLI Foreman, version 6.1, document hammer-cli-foreman
@@ -385,21 +428,23 @@ msgstr "網址"
 msgid "UUID"
 msgstr "UUID"
 
+msgid "Unable to log in to this Docker Registry - %s"
+msgstr ""
+
 msgid "Unknown method: available power operations are %s"
 msgstr "不明的 method：有效的電源作業包含了 %s"
 
+msgid "Update a docker registry"
+msgstr ""
+
 msgid "Uptime"
 msgstr "上線時間"
 
-# translation auto-copied from project Satellite6 Hammer CLI Foreman, version 6.1, document hammer-cli-foreman
-msgid "Url"
-msgstr "網址"
-
 msgid "Username used to access the registry"
 msgstr "用來存取登錄檔的使用者名稱"
 
-msgid "Value, e.g: theforeman.org"
-msgstr "值，例如 theforeman.org"
+msgid "Value, e.g. example.org"
+msgstr ""
 
 msgid "Where do you want to deploy your container?:"
 msgstr "您希望在哪建置您的 container？"
@@ -411,9 +456,7 @@ msgstr "錯誤的屬性：%s"
 msgid "Yes"
 msgstr "是"
 
-msgid ""
-"You need a Docker compute resource in order to create containers. Please %s "
-"and try again."
+msgid "You need a Docker compute resource in order to create containers. Please %s and try again."
 msgstr "您需要一個 Docker 運算資源以建立 container。請 %s 並重新嘗試。"
 
 msgid "Your container is stopped."

data/test/factories/docker_registry.rb

@@ -6,6 +6,10 @@ FactoryGirl.define do
     sequence(:password) { |n| "password#{n}" }
   end
 
+  after(:build) do |registry|
+    registry.stubs(:attempt_login)
+  end
+
   trait :with_location do
     locations { [FactoryGirl.build(:location)] }
   end

data/test/functionals/api/v2/containers_controller_test.rb

@@ -40,10 +40,24 @@ module Api
           assert_equal ActiveSupport::JSON.decode(response.body)['name'], 'foo'
         end
 
-        test 'delete removes a container in foreman and in Docker host' do
-          delete :destroy, :id => @container.id
-          assert_response :success
-          assert_equal ActiveSupport::JSON.decode(response.body)['name'], 'foo'
+        context 'deletion' do
+          setup do
+            Container.any_instance.stubs(:uuid).returns('randomuuid')
+          end
+
+          test 'delete removes a container in foreman and in Docker host' do
+            delete :destroy, :id => @container.id
+            assert_response :success
+            assert_equal ActiveSupport::JSON.decode(response.body)['name'], 'foo'
+          end
+
+          test 'if deletion on Docker host fails, Foreman deletion fails' do
+            ComputeResource.any_instance.expects(:destroy_vm).
+              with('randomuuid').
+              raises(::Foreman::Exception.new('Problem removing container'))
+            delete :destroy, :id => @container.id
+            assert_response :precondition_failed
+          end
         end
 
         test 'power call turns on/off container in Docker host' do

data/test/functionals/api/v2/registries_controller_test.rb

@@ -24,6 +24,7 @@ module Api
 
       test 'creates a new registry with valid params' do
         docker_attrs = FactoryGirl.attributes_for(:docker_registry)
+        DockerRegistry.any_instance.stubs(:attempt_login)
         post :create, :registry => docker_attrs
         assert_response :success
       end
@@ -41,6 +42,7 @@ module Api
       end
 
       test 'update a docker registry' do
+        DockerRegistry.any_instance.stubs(:attempt_login)
         put :update, :id => @registry.id, :registry => { :name => 'hello_world' }
         assert_response :success
         assert DockerRegistry.exists?(:name => 'hello_world')

data/test/functionals/containers_controller_test.rb

@@ -15,14 +15,62 @@ class ContainersControllerTest < ActionController::TestCase
     assert_template 'index'
   end
 
-  test 'deleting a container in compute resource redirects to containers index' do
-    Fog.mock!
-    container_resource = FactoryGirl.create(:docker_cr)
-    container          = container_resource.vms.first
-    container.class.any_instance.expects(:destroy).returns(true)
-    delete :destroy, { :compute_resource_id => container_resource,
-                       :id                  => container.id }, set_session_user
-    assert_redirected_to containers_path
+  context 'delete container' do
+    setup do
+      Fog.mock!
+      @container_resource = FactoryGirl.create(:docker_cr)
+      @container          = @container_resource.vms.first
+    end
+
+    teardown { Fog.unmock! }
+
+    test 'deleting an unmanaged container redirects to containers index' do
+      ComputeResource.any_instance.expects(:destroy_vm).with(@container.id)
+      delete :destroy, { :compute_resource_id => @container_resource,
+                         :id                  => @container.id }, set_session_user
+      assert_redirected_to containers_path
+      assert_equal "Container #{@container.id} is being deleted.",
+        flash[:notice]
+    end
+
+    test 'failed deletion of unmanaged container in Docker' do
+      ComputeResource.any_instance.stubs(:destroy_vm).
+        raises(::Foreman::Exception.new('Could not destroy Docker container'))
+      @request.env['HTTP_REFERER'] = "http://test.host/#{containers_path}"
+      delete :destroy, { :compute_resource_id => @container_resource,
+                         :id                  => @container.id }, set_session_user
+      assert @container.present?
+      assert_redirected_to :back
+      assert_equal 'Your container could not be deleted in Docker',
+        flash[:error]
+    end
+
+    test 'deleting a managed container deletes container in Docker' do
+      managed_container = FactoryGirl.create(
+        :container,
+        :compute_resource => @container_resource)
+      ComputeResource.any_instance.expects(:destroy_vm).
+        with('randomuuid')
+      Container.any_instance.expects(:uuid).returns('randomuuid').at_least_once
+      Container.any_instance.expects(:destroy)
+      delete :destroy, { :id => managed_container.id }, set_session_user
+      assert_redirected_to containers_path
+      assert_equal "Container #{managed_container.uuid} is being deleted.",
+        flash[:notice]
+    end
+
+    test 'failed deletion of managed container keeps container in Foreman' do
+      ComputeResource.any_instance.stubs(:destroy_vm).
+        raises(::Foreman::Exception.new('Could not destroy Docker container'))
+      managed_container = FactoryGirl.create(
+        :container,
+        :compute_resource => @container_resource)
+      delete :destroy, { :id => managed_container.id }, set_session_user
+      assert managed_container.present? # Foreman container would not be deleted
+      assert_redirected_to containers_path
+      assert_equal 'Your container could not be deleted in Docker',
+        flash[:error]
+    end
   end
 
   test 'committing a managed container' do