Merge branch 'master' into fix/issue_506_505

kubernetes/services/api-gateway.yaml

@@ -5,22 +5,15 @@ metadata:
 data:
   application.properties: |
     spring.application.name=alcor-api-gateway
-    spring.sleuth.sampler.probability=1.0
-    spring.sleuth.web.skipPattern=(^health.*)
-    server.max-http-header-size=16384
-    server.max-initial-line-length=65536
-
-    management.endpoints.web.exposure.include=health,prometheus
     logging.level.org.springframework.web=DEBUG
     logging.level.org.springframework.cloud=DEBUG
     logging.level.com.github.tomakehurst.wiremock=TRACE
-    logging.level.root=DEBUG
-
-    ignite.thin.client.enable=true
     ignite.host=ignite-alcor-service.ignite-alcor.svc.cluster.local
     ignite.port=10800
+    ignite.thin.client.enable=true
     #ignite.key-store-path=keystore.jks
     #ignite.key-store-password=123456
+    
     #ignite.trust-store-path=truststore.jks
     #ignite.trust-store-password=123456
 
@@ -31,7 +24,6 @@ data:
     microservices.route.service.url=http://routemanager-service.default.svc.cluster.local:9003/
     microservices.quota.service.url = http://quotamanager-service.default.svc.cluster.local:9012/
     microservices.elasticip.service.url=http://eipmanager-service.default.svc.cluster.local:9011/
-    neutron.url_prefix=/v2.0
 
     keystone.enable=true
     keystone.project_domain_name=Default
@@ -43,6 +35,13 @@ data:
     keystone.password=alcor_pass
     keystone.auth_type=password
     keystone.auth_url=http://192.168.10.10:5000/v3
+    neutron.url_prefix=/v2.0
+    logging.level.root=TRACE
+    
+    Spring.mvc.async.request-timeout=30000
+    server.max-http-header-size=65536
+    server.max-initial-line-length=65536
+
 ---
 apiVersion: apps/v1
 kind: Deployment

kubernetes/services/deleteYaml.sh

@@ -60,6 +60,10 @@ if [[ "$OSTYPE" == "linux-gnu" ]]; then
   kubectl delete configmap port-configmap
   kubectl delete services portmanager-service
   kubectl delete deployment portmanager
+
+  kubectl delete configmap quota-configmap
+  kubectl delete services quotamanager-service
+  kubectl delete deployment quotamanager
 
   kubectl delete configmap node-configmap
   kubectl delete services nodemanager-service

kubernetes/services/dpm_manager.yaml

@@ -6,6 +6,34 @@ data:
   application.properties: |
     dataplane.grpc.port = 50001
     dataplane.isovs=true
+    # the zipkin host should be YOURS
+    spring.zipkin.base-url=http://10.213.43.187:9411
+    
+    grpc.min-threads = 100
+    grpc.max-threads = 200
+    grpc.threads-pool-name = grpc-thread-pool
+    #DPM v1 is statically using version 101
+    #DPM v2 will start with version 102
+    protobuf.goal-state-message.version = 102
+
+    #logging.file.path=./
+    #logging.file.name=data-plane-manager.log
+    #logging.level.root=INFO
+
+    ignite.host=ignite-alcor-service.ignite-alcor.svc.cluster.local
+    ignite.port=10800
+    ignite.thin.client.enable=true
+    #ignite.key-store-path=keystore.jks
+    #ignite.key-store-password=123456
+    #ignite.trust-store-path=truststore.jks
+    #ignite.trust-store-password=123456
+
+    mq.type=pulsar
+    pulsar.url=pulsar://127.0.0.1:6650
+    pulsar.unicast.topic=unicast-topic1
+    host.ip.to.group.topic.map=group-topic1:192.168.131.131,10.10.10.11 group-topic2:192.168.131.131,11.11.11.12
+    group.topic.to.multicast.topic.map=multicast-topic1:group-topic1,group-topic3 multicast-topic2:group-topic2,group-topic4
+
 ---
 apiVersion: apps/v1
 kind: Deployment

kubernetes/services/elastic_ip_manager.yaml

@@ -9,6 +9,9 @@ data:
     ignite.port=10800
     ignite.thin.client.enable=true
     management.health.redis.enabled=false
+
+    # the zipkin host should be YOURS
+    spring.zipkin.base-url=http://10.213.43.187:9411
 ---
 apiVersion: apps/v1
 kind: Deployment

kubernetes/services/ignite_alcor.yaml

@@ -98,19 +98,13 @@ spec:
             - name: JVM_OPTS
               value: "-Djava.net.preferIPv4Stack=true"
             #- name: JVM_OPTS
-              #value: "-Djava.net.preferIPv4Stack=true \
-                      #-XX:+PrintGCDetails \
-                      #-XX:+PrintGCTimeStamps \
-                      #-XX:+PrintGCDateStamps \
-                      #-XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 \
-                      #-XX:GCLogFileSize=100M \
-                      #-Xloggc:/opt/ignite/apache-ignite/work/log/ignite-gc.log \
-                      #-server \ 
-                      #-Xms50g \
-                      #-Xmx50g \
-                      #-XX:+AlwaysPreTouch \
-                      #-XX:+UseG1GC \
-                      #-XX:+ScavengeBeforeFullGC \
+              #value: "-Djava.net.preferIPv4Stack=true
+                      #-server 
+                      #-Xms20g
+                      #-Xmx20g
+                      #-XX:+AlwaysPreTouch
+                      #-XX:+UseG1GC
+                      #-XX:+ScavengeBeforeFullGC
                       #-XX:+DisableExplicitGC"
           ports:
             - name: port8080

kubernetes/services/ignite_alcor_ip.yaml

@@ -97,18 +97,14 @@ spec:
               value: "false"
             - name: JVM_OPTS
               value: "-Djava.net.preferIPv4Stack=true"
-                      #-XX:+PrintGCDetails \
-                      #-XX:+PrintGCTimeStamps \
-                      #-XX:+PrintGCDateStamps \
-                      #-XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 \
-                      #-XX:GCLogFileSize=100M \
-                      #-Xloggc:/opt/ignite/apache-ignite/work/log/ignite-gc.log \
-                      #-server \ 
-                      #-Xms50g \
-                      #-Xmx50g \
-                      #-XX:+AlwaysPreTouch \
-                      #-XX:+UseG1GC \
-                      #-XX:+ScavengeBeforeFullGC \
+            #- name: JVM_OPTS
+              #value: "-Djava.net.preferIPv4Stack=true
+                      #-server 
+                      #-Xms20g
+                      #-Xmx20g
+                      #-XX:+AlwaysPreTouch
+                      #-XX:+UseG1GC
+                      #-XX:+ScavengeBeforeFullGC
                       #-XX:+DisableExplicitGC"
           ports:
             - name: port8080

kubernetes/services/ignite_alcor_mac.yaml

@@ -97,18 +97,14 @@ spec:
               value: "false"
             - name: JVM_OPTS
               value: "-Djava.net.preferIPv4Stack=true"
-                      #-XX:+PrintGCDetails \
-                      #-XX:+PrintGCTimeStamps \
-                      #-XX:+PrintGCDateStamps \
-                      #-XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 \
-                      #-XX:GCLogFileSize=100M \
-                      #-Xloggc:/opt/ignite/apache-ignite/work/log/ignite-gc.log \
-                      #-server \ 
-                      #-Xms50g \
-                      #-Xmx50g \
-                      #-XX:+AlwaysPreTouch \
-                      #-XX:+UseG1GC \
-                      #-XX:+ScavengeBeforeFullGC \
+            #- name: JVM_OPTS
+              #value: "-Djava.net.preferIPv4Stack=true
+                      #-server 
+                      #-Xms20g
+                      #-Xmx20g
+                      #-XX:+AlwaysPreTouch
+                      #-XX:+UseG1GC
+                      #-XX:+ScavengeBeforeFullGC
                       #-XX:+DisableExplicitGC"
           ports:
             - name: port8080

kubernetes/services/ignite_alcor_port.yaml

@@ -85,9 +85,11 @@ spec:
         - name: ignite-alcor-port-node
           image: ignite_alcor:lib8
           imagePullPolicy: IfNotPresent
-          #resources:
-            #requests:
-              #cpu: "16"
+          resources:
+            requests:
+              cpu: "4"
+            limits:
+              cpu: "7"
           env:
             - name: OPTION_LIBS
               value: ignite-kubernetes,ignite-rest-http
@@ -97,18 +99,14 @@ spec:
               value: "false"
             - name: JVM_OPTS
               value: "-Djava.net.preferIPv4Stack=true"
-                      #-XX:+PrintGCDetails \
-                      #-XX:+PrintGCTimeStamps \
-                      #-XX:+PrintGCDateStamps \
-                      #-XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 \
-                      #-XX:GCLogFileSize=100M \
-                      #-Xloggc:/opt/ignite/apache-ignite/work/log/ignite-gc.log \
-                      #-server \ 
-                      #-Xms50g \
-                      #-Xmx50g \
-                      #-XX:+AlwaysPreTouch \
-                      #-XX:+UseG1GC \
-                      #-XX:+ScavengeBeforeFullGC \
+            #- name: JVM_OPTS
+              #value: "-Djava.net.preferIPv4Stack=true
+                      #-server 
+                      #-Xms20g
+                      #-Xmx20g
+                      #-XX:+AlwaysPreTouch
+                      #-XX:+UseG1GC
+                      #-XX:+ScavengeBeforeFullGC
                       #-XX:+DisableExplicitGC"
           ports:
             - name: port8080

kubernetes/services/ignite_config.xml

@@ -26,7 +26,7 @@
         http://www.springframework.org/schema/beans
         http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-   <bean class="org.apache.ignite.configuration.IgniteConfiguration">
+   <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration">
 
       <!-- Explicitly enable peer class loading. -->
       <property name="peerClassLoadingEnabled" value="true" />
@@ -39,6 +39,9 @@
                   <property name="persistenceEnabled" value="true"/>
                </bean>
             </property>
+            <property name="storagePath" value="/opt/storage"/>
+            <property name="walPath" value="/db/wal"/>
+            <property name="walArchivePath" value="/db/wal/archive"/>
          </bean>
       </property>
 

kubernetes/services/ignite_ip_config.xml

@@ -39,6 +39,7 @@
                   <property name="persistenceEnabled" value="true"/>
                </bean>
             </property>
+            <property name="storagePath" value="/opt/ip"/>
          </bean>
       </property>
 

kubernetes/services/ignite_mac_config.xml

@@ -39,6 +39,7 @@
                   <property name="persistenceEnabled" value="true"/>
                </bean>
             </property>
+            <property name="storagePath" value="/opt/mac"/>
          </bean>
       </property>
 

kubernetes/services/ignite_port_config.xml

@@ -39,6 +39,7 @@
                   <property name="persistenceEnabled" value="true"/>
                </bean>
             </property>
+            <property name="storagePath" value="/opt/port"/>
          </bean>
       </property>
 

kubernetes/services/mac_manager.yaml

@@ -4,19 +4,20 @@ metadata:
   name: mac-configmap
 data:
   application.properties: |
-    ignite.thin.client.enable=true
     spring.redis.host=localhost
     spring.redis.port=6380
     ignite.host=ignite-alcor-mac-service.ignite-alcor-mac.svc.cluster.local
     ignite.port=10803
+    ignite.thin.client.enable=true
     #ignite.key-store-path=keystore.jks
     #ignite.key-store-password=123456
     #ignite.trust-store-path=truststore.jks
     #ignite.trust-store-password=123456
     logging.level.root=DEBUG
-    macmanager.oui = AA-BB-CC
+    macmanager.oui = aa:bb:cc
     macmanager.pool.size = 100
     macmanager.retrylimit = 10
+
 ---
 apiVersion: apps/v1
 kind: Deployment

kubernetes/services/node_manager.yaml

@@ -4,11 +4,11 @@ metadata:
   name: node-configmap
 data:
   application.properties: |
-    ignite.thin.client.enable=true
     spring.redis.host=localhost
     spring.redis.port=6380
     ignite.host=ignite-alcor-service.ignite-alcor.svc.cluster.local
     ignite.port=10800
+    ignite.thin.client.enable=true
     #ignite.key-store-path=keystore.jks
     #ignite.key-store-password=123456
     #ignite.trust-store-path=truststore.jks
@@ -18,6 +18,7 @@ data:
     spring.servlet.multipart.file-size-threshold=2KB
     spring.servlet.multipart.max-file-size=200MB
     spring.servlet.multipart.max-request-size=215MB
+
 ---
 apiVersion: apps/v1
 kind: Deployment

kubernetes/services/port_manager.yaml

@@ -7,23 +7,22 @@ data:
     ignite.thin.client.enable=true
     ignite.host=ignite-alcor-port-service.ignite-alcor-port.svc.cluster.local
     ignite.port=10802
-
     server.max-http-header-size=16384
     server.max-initial-line-length=65536
-
     logging.level.root=DEBUG
-
     microservices.vpc.service.url=http://vpcmanager-service.default.svc.cluster.local:9001
     microservices.subnet.service.url=http://subnetmanager-service.default.svc.cluster.local:9002
     microservices.ip.service.url=http://ipmanager-service.default.svc.cluster.local:9004/ips
     microservices.mac.service.url=http://macmanager-service.default.svc.cluster.local:9005/macs
     microservices.sg.service.url=http://sgmanager-service.default.svc.cluster.local:9008
     microservices.route.service.url=http://routemanager-service.default.svc.cluster.local:9003/routes
+    microservices.router.service.url=http://routemanager-service.default.svc.cluster.local:9003
     microservices.node.service.url=http://nodemanager-service.default.svc.cluster.local:9007/nodes
     microservices.dataplane.service.url=http://dataplanemanager-service.default.svc.cluster.local:9010/network-configuration
     microservices.elasticip.service.url=http://eipmanager-service.default.svc.cluster.local:9011
-
     alcor.vif_type=ovs
+    Spring.mvc.async.request-timeout=30000
+
 ---
 apiVersion: apps/v1
 kind: Deployment

kubernetes/services/private_ip_manager.yaml

@@ -8,6 +8,7 @@ data:
     ignite.host=ignite-alcor-ip-service.ignite-alcor-ip.svc.cluster.local
     ignite.port=10801
     logging.level.root=DEBUG
+
 ---
 apiVersion: apps/v1
 kind: Deployment

kubernetes/services/quota_manager.yaml

@@ -20,6 +20,7 @@ data:
     quota.defaults.security_group_rule=-1
     quota.defaults.subnet=-1
     quota.defaults.subnetpool=-1
+
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -46,7 +47,7 @@ spec:
                 path: application.properties
       containers:
         - image: quota_manager:v1.0
-          #- image: fwnetworking/controller:vpc_manager-v0.3.0
+        #- image: fwnetworking/controller:vpc_manager-v0.3.0
           name: quotamanager-web
           imagePullPolicy: IfNotPresent
           command: ["java", "-jar", "/app/AlcorQuotaManager-0.1.0.jar", "--spring.config.location=/opt/jboss/application.properties"]
@@ -73,3 +74,4 @@ spec:
       nodePort: 30012
   selector:
     app: quotamanager
+

kubernetes/services/route_manager.yaml

@@ -4,13 +4,19 @@ metadata:
   name: route-configmap
 data:
   application.properties: |
+    microservices.vpc.service.url=http://vpcmanager-service.default.svc.cluster.local:9001
+    microservices.subnet.service.url=http://subnetmanager-service.default.svc.cluster.local:9002
+    microservices.dpm.service.url=http://dataplanemanager-service.default.svc.cluster.local:9010
+    microservices.port.service.url=http://portmanager-service.default.svc.cluster.local:9006
     ignite.thin.client.enable=true
     ignite.host=ignite-alcor-service.ignite-alcor.svc.cluster.local
     ignite.port=10800
     logging.level.root=DEBUG
     logging.level.org.springframework.web=info
     logging.file.path=.
     logging.type=file
+    management.health.redis.enabled=false
+    
 ---
 apiVersion: apps/v1
 kind: Deployment

kubernetes/services/sg_manager.yaml

@@ -8,6 +8,7 @@ data:
     ignite.host=ignite-alcor-service.ignite-alcor.svc.cluster.local
     ignite.port=10800
     logging.level.root=DEBUG
+
 ---
 apiVersion: apps/v1
 kind: Deployment