From 572921972ce687527d6d60849eed8a55211b72ef Mon Sep 17 00:00:00 2001
From: Carsten Lund <lund@research.att.com>
Date: Sun, 16 Apr 2017 14:12:28 +0000
Subject: [DCAE-15] Changes related to version 1.1

See Jira for details

Change-Id: Ic346dd5d5faf9816faa84eddb89f14654ea20156
Signed-off-by: Carsten Lund <lund@research.att.com>
---
 .../servers/docker/DockerDockerHostProvider.java   | 27 +++++++++++-----------
 1 file changed, 13 insertions(+), 14 deletions(-)

(limited to 'ncomp-docker-adaptor/src/main/java/org/openecomp/ncomp/servers/docker/DockerDockerHostProvider.java')

diff --git a/ncomp-docker-adaptor/src/main/java/org/openecomp/ncomp/servers/docker/DockerDockerHostProvider.java b/ncomp-docker-adaptor/src/main/java/org/openecomp/ncomp/servers/docker/DockerDockerHostProvider.java
index d3888dc..8ea1ba9 100644
--- a/ncomp-docker-adaptor/src/main/java/org/openecomp/ncomp/servers/docker/DockerDockerHostProvider.java
+++ b/ncomp-docker-adaptor/src/main/java/org/openecomp/ncomp/servers/docker/DockerDockerHostProvider.java
@@ -40,7 +40,6 @@ import org.openecomp.ncomp.sirius.manager.ISiriusServer;
 import org.openecomp.ncomp.sirius.manager.ManagementServer;
 import org.openecomp.ncomp.sirius.manager.ManagementServerUtils;
 
-import org.apache.commons.codec.binary.Base64;
 import org.apache.log4j.Logger;
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -63,6 +62,7 @@ import org.openecomp.ncomp.docker.DockerImage;
 import org.openecomp.ncomp.docker.DockerNetwork;
 import org.openecomp.ncomp.docker.DockerPackage;
 
+
 import org.eclipse.emf.common.util.EList;
 
 class DockerDockerHostProvider extends BasicAdaptorProvider {
@@ -102,11 +102,6 @@ class DockerDockerHostProvider extends BasicAdaptorProvider {
     	CREATE, START, STOP, RESTART, PAUSE, UNPAUSE, KILL, DESTORY
     }
     
-    private JSONObject encodeAuth(String json) {
-    	String auth = Base64.encodeBase64String(json.getBytes());	
-    	return new JSONObject(auth);
-    }
-    
     public DockerDockerHostProvider(ISiriusServer controller, DockerHost o) {
         super(controller, o);
         this.o = o;
@@ -405,9 +400,9 @@ class DockerDockerHostProvider extends BasicAdaptorProvider {
              // EList<DockerProcess> cp = container.getProcesses();
              // cp = (EList<DockerProcess>)Arrays.asList(dp);
              
-            System.err.println("XXXX "
-                    + ManagementServer.ecore2json(container, 100, null, true)
-                            .toString(2));
+//            System.err.println("XXXX "
+//                    + ManagementServer.ecore2json(container, 100, null, true)
+//                            .toString(2));
             o.getContainers().add(container);
         }
     }
@@ -423,7 +418,7 @@ class DockerDockerHostProvider extends BasicAdaptorProvider {
             fixNull(j);
             rename(j, "created", "dockerCreated");
             if (j.has("labels")) j.remove("labels");
-            System.err.println("XXXX " + j.toString());
+//            System.err.println("XXXX " + j.toString());
             DockerImage image = (DockerImage) controller.getServer()
                     .json2ecore(DockerPackage.eINSTANCE.getDockerImage(), j);
             // System.err.println("XXXX " + ManagementServer.ecore2json(image,
@@ -460,7 +455,7 @@ class DockerDockerHostProvider extends BasicAdaptorProvider {
     		JSONObject netwks = j.getJSONObject("networks");
     		for(String net : JSONObject.getNames(netwks)) {
     			JSONObject intf = netwks.getJSONObject(net);
-    			System.err.println(net + " <- " + intf.toString(4));
+//    			System.err.println(net + " <- " + intf.toString(4));
     			ContainerNetworkStats cnet = DockerFactory.eINSTANCE.createContainerNetworkStats();
     			cnet.setIntf(net);
     			cnet.setRx_bytes(intf.getInt("rx_bytes"));
@@ -484,7 +479,10 @@ class DockerDockerHostProvider extends BasicAdaptorProvider {
     		memusg.setUsage(mem.getInt("usage"));
     		memusg.setMax_usage(mem.getInt("max_usage"));
     		memusg.setLimit(mem.getInt("limit"));
-    		memusg.setFailcnt(mem.getInt("failcnt"));
+			try {
+				memusg.setFailcnt(mem.getInt("failcnt"));
+			} catch (Exception e) {
+			}
     		
     		/*
     		 * memory stats
@@ -551,6 +549,7 @@ class DockerDockerHostProvider extends BasicAdaptorProvider {
     		cstats.setCpu(ccpustats);
     		
     		c.setStats(cstats);
+    		controller.getServer().save();
     	}
     	
     }
@@ -616,7 +615,7 @@ class DockerDockerHostProvider extends BasicAdaptorProvider {
             // System.err.println("XXXX " + v.getClass().getName());
             if (v.getClass().getName().equals("org.json.JSONObject$Null")) {
                 j.put(k, new JSONArray());
-                System.err.println("XXXX change null to empty array " + k);
+//                System.err.println("XXXX change null to empty array " + k);
             }
         }
     }
@@ -906,7 +905,7 @@ class DockerDockerHostProvider extends BasicAdaptorProvider {
         //    404 - no such container
         //    500 - server err
     }
-   
+
     private List<String> getImageNameElements(String image) {
     	
     	 List<String> a = new ArrayList<>();
-- 
cgit 1.2.3-korg