load credentials from system if the system was already registered

src/lib/registration/registration.rb

@@ -40,36 +40,37 @@ def initialize(url = nil)
 
     def register(email, reg_code, distro_target)
       settings = default_connect_params.merge({
-        :token => reg_code,
-        :distro_target => distro_target,
-        :email => email
-      })
+          :token => reg_code,
+          :distro_target => distro_target,
+          :email => email
+        })
 
       login, password = SUSE::Connect::YaST.announce_system(settings)
-      @credentials = SUSE::Connect::Credentials.new(login, password, SCC_CREDENTIALS)
+      credentials = SUSE::Connect::Credentials.new(login, password, SCC_CREDENTIALS)
 
       log.info "Global SCC credentials: #{@credentials}"
 
       # ensure the zypp config directories are writable in inst-sys
       ::Registration::SwMgmt.zypp_config_writable!
 
       # write the global credentials
-      @credentials.write
+      credentials.write
     end
 
 
     def register_products(products)
       product_services = products.map do |product|
-        log.info("Registering product: #{product}")
+        log.info("Registering product: #{product["name"]}-#{product["version"]}" \
+            "-#{product["arch"]}-#{product["release_type"]}")
 
         params = default_connect_params.merge({
-          :product_ident => {
-            :arch         => product["arch"],
-            :name         => product["name"],
-            :version      => product["version"],
-            :release_type => product["release_type"]
-          }
-        })
+            :product_ident => {
+              :arch         => product["arch"],
+              :name         => product["name"],
+              :version      => product["version"],
+              :release_type => product["release_type"]
+            }
+          })
 
         # use product specific reg. key (e.g. for addons)
         params[:token] = product["reg_key"] if product["reg_key"]
@@ -80,7 +81,8 @@ def register_products(products)
       log.info "registered product_services: #{product_services.inspect}"
 
       if !product_services.empty?
-        ::Registration::SwMgmt.add_services(product_services, @credentials)
+        credentials = SUSE::Connect::Credentials.read(SCC_CREDENTIALS)
+        ::Registration::SwMgmt.add_services(product_services, credentials)
       end
 
       product_services
@@ -91,10 +93,10 @@ def get_addon_list
       base_product = ::Registration::Storage::BaseProduct.instance.product
 
       params = default_connect_params.merge({
-        :product_ident => {
-          :name => base_product["name"]
-        }
-      })
+          :product_ident => {
+            :name => base_product["name"]
+          }
+        })
 
       log.info "Reading available addons for product: #{base_product["name"]}"