Commit e2db03f0 authored by Pablo Armingol's avatar Pablo Armingol
Browse files

nodes and .jar fixed

parent a9cb70a4

src/bgpls_speaker/Dockerfile

+12 −46
Original line number Diff line number Diff line
@@ -16,56 +16,22 @@ 
# Maven install stage

#

# ----------------------------------------------

FROM alpine/git:latest AS repo

# FROM alpine/git:latest AS repo



WORKDIR /usr/src/app

RUN git clone https://github.com/telefonicaid/netphony-network-protocols.git .

# WORKDIR /usr/src/app

# RUN git clone https://github.com/telefonicaid/netphony-network-protocols.git .



FROM maven:3.8.8-eclipse-temurin-17 AS build



# RUN mkdir -p /var/teraflow/java_speaker/

# WORKDIR /var/teraflow/java_speaker

# RUN mkdir -p protocols/

# COPY ../netphony-network-protocols/src protocols/src

# COPY ../netphony-network-protocols/pom.xml protocols/pom.xml



# RUN mvn dependency:resolve

# RUN mvn clean verify



# WORKDIR /var/teraflow/java_speaker/protocols

# RUN mvn clean install

COPY --from=repo /usr/src/app/* /protocols/



WORKDIR /protocols/



# RUN mvn package -X 



# RUN mvn org.apache.maven.plugins:maven-install-plugin:2.5.2:install-file  \

#     -Dfile=/protocols/target/network-protocols-1.1-SNAPSHOT.jar \

#     -DgroupId=es.tid.netphony \

#     -DartifactId=network-protocols \

#     -Dversion=1.1-SNAPSHOT \

#     -Dpackaging=jar \

#     -DlocalRepositoryPath=/



RUN mvn clean install -X 



WORKDIR /

RUN mkdir -p /var/teraflow/bgpls

WORKDIR /var/teraflow/bgpls





# COPY . /var/teraflow/bgpls/



COPY src/bgpls_speaker/service/java/netphony-topology/ /var/teraflow/bgpls/service/java/netphony-topology/

COPY src/bgpls_speaker/service/java/netphony-topology/pom.xml pom.xml



WORKDIR /var/teraflow/bgpls/service/java/netphony-topology/



# RUN mvn clean compile -DskipTests -Dmaven.repo.local=$HOME/.m2/es/tid/netphony/network-protocols

# RUN mvn package -P bgp-ls-speaker assembly:single -DskipTests



# ENTRYPOINT [ "ls","-R" ]

COPY src/bgpls_speaker/service/java/netphony-topology/ netphony-topology/

COPY src/bgpls_speaker/service/java/netphony-topology/pom.xml netphony-topology/pom.xml



WORKDIR /netphony-topology/

RUN mvn clean compile -DskipTests -X

RUN mvn package assembly:single -P bgp-ls-speaker -DskipTests

WORKDIR /netphony-topology/target/

# ENTRYPOINT [ "ls" ,"-a"]

# -------------------------------------------

# jar created in  /netphony-topology/target/bgp-ls-speaker-jar-with-dependencies.jar
@@ -131,7 +97,7 @@ RUN python3 -m pip install -r requirements.txt 
WORKDIR /var/teraflow/bgpls_speaker

RUN mkdir -p /java

COPY src/bgpls_speaker/service/java/* /java/ 

COPY --from=build /var/teraflow/bgpls/service/java/netphony-topology/target/bgp-ls-speaker-jar-with-dependencies.jar /var/teraflow/bgpls_speaker/bgp_ls.jar

COPY --from=build /netphony-topology/target/bgp-ls-speaker-jar-with-dependencies.jar /var/teraflow/bgpls_speaker/service/java/bgp_ls.jar



# Add component files into working directory

WORKDIR /var/teraflow

src/bgpls_speaker/quick_deploy.sh

0 → 100644
+438 −0

File added.

Preview size limit exceeded, changes collapsed.

src/bgpls_speaker/service/BgplsServiceServicerImpl.py

+2 −2
Original line number Diff line number Diff line
@@ -61,8 +61,8 @@ class BgplsServiceServicerImpl(BgplsServiceServicer): 
        links = self.discoveredDB.GetLinksFromDiscoveredDB()

        links_info=[]

        for link in links:

            local=NodeDescriptors(bgplsID=link.local.bgpls_id,nodeName=link.local.node_name)

            remote=NodeDescriptors(bgplsID=link.remote.bgpls_id,nodeName=link.remote.node_name)

            local=NodeDescriptors(igp_id=link.local_id,nodeName=link.local_id)

            remote=NodeDescriptors(igp_id=link.remote_id,nodeName=link.remote_id)

            links_info.append(DiscoveredLink(local=local,remote=remote,learntFrom=link.learnt_from))

        return DiscoveredLinkList(discoveredlinks=links_info)

src/bgpls_speaker/service/java/netphony-topology/pom.xml

+14 −15

File changed.

Preview size limit exceeded, changes collapsed.

src/bgpls_speaker/service/java/netphony-topology/src/main/java/eu/teraflow/tid/bgp4Peer/grpc/grpcClient.java

+2 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ public class grpcClient { 
					setAsPathSegment(Integer.toString(update.getAsPathSegment())).

					addAllLink(l).build();

		}else if(nodes.size()>0&& l.size()==0) {

			logger.debug("ADDING NODE");

			request=updateRequest.newBuilder().

					setNextHop(update.getNextHop().toString()).

					setAddressFamilyID(Integer.toString(update.getAFI())).
@@ -145,6 +146,7 @@ public class grpcClient { 
		}else {

			//Error if node name is null 

			// TODO: handle seng grpc error?

			logger.debug("ADDING NODE AND LINK");

			request=updateRequest.newBuilder().

					setNextHop("-"+update.getNextHop().toString()).

					setAddressFamilyID(Integer.toString(update.getAFI())).