Merge pull request #2774 from subutai-io/dev

Dev -> Master
subutai-io · Jan 3, 2019 · 0930d21 · 0930d21
2 parents 1166fb0 + 11a2268
commit 0930d21
Show file tree

Hide file tree

Showing 30 changed files with 830 additions and 161 deletions.
diff --git a/management/pom.xml b/management/pom.xml
@@ -281,6 +281,25 @@
         <version>${project.version}</version>
       </dependency>
 
+      <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+
+      <!-- environment-metadata-manager -->
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>environment-metadata-manager-api</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>environment-metadata-manager-impl</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>environment-metadata-manager-rest</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+
       <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
       <!-- host registry -->
       <dependency>

diff --git a/...ger-impl/src/main/java/io/subutai/core/bazaarmanager/impl/adapter/BazaaarAdapterImpl.java b/...ger-impl/src/main/java/io/subutai/core/bazaarmanager/impl/adapter/BazaaarAdapterImpl.java
@@ -8,6 +8,8 @@
 
 import org.apache.commons.lang3.StringUtils;
 
+import io.subutai.bazaar.share.common.BazaaarAdapter;
+import io.subutai.bazaar.share.event.payload.Payload;
 import io.subutai.common.dao.DaoManager;
 import io.subutai.common.environment.Environment;
 import io.subutai.common.host.ContainerHostInfo;
@@ -17,17 +19,16 @@
 import io.subutai.common.peer.HostNotFoundException;
 import io.subutai.common.peer.LocalPeer;
 import io.subutai.common.util.ServiceLocator;
-import io.subutai.core.environment.api.EnvironmentEventListener;
-import io.subutai.core.hostregistry.api.HostListener;
 import io.subutai.core.bazaarmanager.api.BazaarManager;
 import io.subutai.core.bazaarmanager.api.RestClient;
 import io.subutai.core.bazaarmanager.api.RestResult;
 import io.subutai.core.bazaarmanager.api.dao.ConfigDataService;
 import io.subutai.core.bazaarmanager.impl.dao.ConfigDataServiceImpl;
+import io.subutai.core.environment.api.EnvironmentEventListener;
+import io.subutai.core.hostregistry.api.HostListener;
 import io.subutai.core.identity.api.IdentityManager;
 import io.subutai.core.identity.api.model.User;
 import io.subutai.core.peer.api.PeerManager;
-import io.subutai.bazaar.share.common.BazaaarAdapter;
 
 import static java.lang.String.format;
 
@@ -258,6 +259,35 @@ public void notifyContainerDiskUsageExcess( String peerId, String envId, String
     }
 
 
+    @Override
+    public void pushEvent( final Payload message )
+    {
+        RestResult result =
+                getRestClient().post( String.format( "/rest/v1/peers/%s/event", peerId ), message, message.getClass() );
+
+        if ( !result.isSuccess() )
+        {
+            log.error( "Error pushing event to Bazaar: HTTP {} - {}", result.getStatus(), result.getReasonPhrase() );
+        }
+    }
+
+
+    @Override
+    public Payload getMetaData( final String environmentId, final String type )
+    {
+        RestResult result = getRestClient()
+                .get( String.format( "/rest/v1/peers/%s/meta/%s/%s", peerId, environmentId, type ), Payload.class );
+
+        if ( !result.isSuccess() )
+        {
+            log.error( "Error retrieving meta data from Bazaar: HTTP {} - {}", result.getStatus(),
+                    result.getReasonPhrase() );
+        }
+
+        return ( Payload ) result.getEntity();
+    }
+
+
     private void onContainerStateChange( String envId, String contId, String state )
     {
         if ( !isRegistered() )

diff --git a/...t-manager-impl/src/main/java/io/subutai/core/environment/impl/EnvironmentManagerImpl.java b/...t-manager-impl/src/main/java/io/subutai/core/environment/impl/EnvironmentManagerImpl.java
@@ -1640,6 +1640,21 @@ public void run()
     }
 
 
+    @Override
+    public void onContainerDestroyed( final ContainerHostInfo containerInfo )
+    {
+        try
+        {
+            ContainerHost containerHost = peerManager.getLocalPeer().getContainerHostById( containerInfo.getId() );
+            onContainerDestroyed( containerHost );
+        }
+        catch ( HostNotFoundException ignore )
+        {
+            //no-op
+        }
+    }
+
+
     protected Long getUserId()
     {
         return identityManager.getActiveUser().getId();

diff --git a/...er-impl/src/main/java/io/subutai/core/environment/impl/EnvironmentManagerSecureProxy.java b/...er-impl/src/main/java/io/subutai/core/environment/impl/EnvironmentManagerSecureProxy.java
@@ -30,7 +30,6 @@
 import io.subutai.common.environment.Topology;
 import io.subutai.common.host.ContainerHostInfo;
 import io.subutai.common.host.ContainerHostState;
-import io.subutai.common.host.HostInterfaceModel;
 import io.subutai.common.host.ResourceHostInfo;
 import io.subutai.common.metric.QuotaAlertValue;
 import io.subutai.common.network.SshTunnel;
@@ -802,27 +801,9 @@ public void onContainerCreated( final ContainerHostInfo containerInfo )
 
 
     @Override
-    public void onContainerNetInterfaceChanged( final ContainerHostInfo containerInfo,
-                                                final HostInterfaceModel oldNetInterface,
-                                                final HostInterfaceModel newNetInterface )
+    public void onContainerDestroyed( final ContainerHostInfo containerInfo )
     {
-        environmentManager.onContainerNetInterfaceChanged( containerInfo, oldNetInterface, newNetInterface );
-    }
-
-
-    @Override
-    public void onContainerNetInterfaceAdded( final ContainerHostInfo containerInfo,
-                                              final HostInterfaceModel netInterface )
-    {
-        environmentManager.onContainerNetInterfaceAdded( containerInfo, netInterface );
-    }
-
-
-    @Override
-    public void onContainerNetInterfaceRemoved( final ContainerHostInfo containerInfo,
-                                                final HostInterfaceModel netInterface )
-    {
-        environmentManager.onContainerNetInterfaceRemoved( containerInfo, netInterface );
+        environmentManager.onContainerDestroyed( containerInfo );
     }
 
 

diff --git a/management/server/core/environment-metadata-manager/environment-metadata-manager-api/pom.xml b/management/server/core/environment-metadata-manager/environment-metadata-manager-api/pom.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <artifactId>environment-metadata-manager</artifactId>
+    <groupId>io.subutai</groupId>
+    <version>8.2.1-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>environment-metadata-manager-api</artifactId>
+  <name>Subutai Environment Metadata Manager Api</name>
+  <description>Subutai Environment Metadata Manager Api</description>
+  <packaging>bundle</packaging>
+
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>subutai-common</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>io.subutai</groupId>
+      <artifactId>identity-manager-api</artifactId>
+    </dependency>
+
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <configuration>
+          <instructions>
+            <Bundle-SymbolicName>${project.groupId}.core.environment.metadata.api</Bundle-SymbolicName>
+            <Export-Package>
+              {local-packages};version=${project.version};-noimport:=true
+            </Export-Package>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/...pi/src/main/java/io/subutai/core/environment/metadata/api/EnvironmentMetadataManager.java b/...pi/src/main/java/io/subutai/core/environment/metadata/api/EnvironmentMetadataManager.java
@@ -0,0 +1,23 @@
+package io.subutai.core.environment.metadata.api;
+
+
+import io.subutai.bazaar.share.event.payload.Payload;
+import io.subutai.core.identity.api.exception.TokenCreateException;
+
+
+public interface EnvironmentMetadataManager
+{
+    void init();
+
+    void dispose();
+
+    /**
+     * Issues JWT token for specified container
+     */
+
+    void issueToken( String containerIp ) throws TokenCreateException;
+
+    Payload getEnvironmentInfoDto( String environmentId, String type );
+
+    void pushEvent( Payload eventMessage );
+}
diff --git a/...gement/server/core/environment-metadata-manager/environment-metadata-manager-impl/pom.xml b/...gement/server/core/environment-metadata-manager/environment-metadata-manager-impl/pom.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <artifactId>environment-metadata-manager</artifactId>
+    <groupId>io.subutai</groupId>
+    <version>8.2.1-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>environment-metadata-manager-impl</artifactId>
+  <packaging>bundle</packaging>
+  <name>Subutai Environment Metadata Manager Impl</name>
+  <description>Subutai Environment Metadata Manager Impl</description>
+  <dependencies>
+
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>environment-metadata-manager-api</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>peer-manager-api</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>environment-manager-api</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>identity-manager-api</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>bazaar-manager-api</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>com.nimbusds</groupId>
+      <artifactId>nimbus-jose-jwt</artifactId>
+    </dependency>
+
+    <!-- Testing -->
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-all</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <configuration>
+          <instructions>
+            <Bundle-SymbolicName>${project.groupId}.core.environment.metadata.impl</Bundle-SymbolicName>
+            <Export-Package>
+              {local-packages};version=${project.version};-noimport:=true
+            </Export-Package>
+            <Import-Package>*</Import-Package>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>