remove CE from libnetvirt

.gitignore

@@ -26,3 +26,11 @@ example/shell
 libtool
 stamp-h1
 test_lib
+example/shelltest
+src/eab_dcp/
+python/libnetvirt.py
+src/NetworkManager.py
+src/libnetvirt.py
+src/libnetvirt_wrap.c
+testing/test_create
+

example/fns-l3vpn.xml

@@ -4,13 +4,13 @@
 		<endpoint uuid="1">
 			<swId>1</swId>
 			<port>10</port>
-			<addressPE>10.66.25.1/30</addressPE>
+			<address>10.66.25.1/30</address>
 			<vlan>10</vlan>
 		</endpoint>
 		<endpoint uuid="4">
 			<swId>2</swId>
 			<port>10</port>
-			<addressPE>10.66.25.5/30</addressPE>
+			<address>10.66.25.5/30</address>
 			<vlan>10</vlan>
 		</endpoint>
 		<forwarding>L3VPN</forwarding>

libnetvirt/libnetvirt.h

@@ -46,8 +46,6 @@ typedef struct EndPoint {
 	uint32_t mpls;
 	uint16_t vlan;
 	char address[MAX_NAME_SIZE];
-	char addressEx[MAX_NAME_SIZE];
-	uint8_t mask;
 //	uint8_t pad[2];
 } endpoint;
 
@@ -127,10 +125,7 @@ uint64_t getSwIdFromEp(endpoint* ep);
 uint16_t getPortFromEp(endpoint* ep);
 uint32_t getMplsFromEp(endpoint* ep);
 uint16_t getVlanFromEp(endpoint* ep);
-char* getNetFromEp(endpoint* ep);
-uint8_t getMaskFromEp(endpoint* ep);
-char* getAddressPEFromEp(endpoint* ep);
-char* getAddressCEFromEp(endpoint* ep);
+char* getAddressFromEp(endpoint* ep);
 
 extern void printFNS(fnsDesc *cur);
 /*Substrate functions*/

src/driver_mpls.py

@@ -40,8 +40,8 @@ def mpls_create_fns(desc):
         #r_interface = "eth3"
         r_d_net = '192.66.23.0'
 
-        pe_address = libnetvirt.getAddressPEFromEp(ep)
-        ce_address = libnetvirt.getAddressCEFromEp(ep)
+        pe_address = libnetvirt.getAddressFromEp(ep)
+        #ce_address = libnetvirt.getAddressCEFromEp(ep)
 
         #we need net address for CE
         tmp = commands.getoutput('ipcalc -n ' + str(pe_address))

src/fns.c

@@ -80,38 +80,9 @@ parseEndpoint(xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur1) {
 			ret->vlan = atoi((const char*) xmlNodeListGetString(doc,
 					cur->xmlChildrenNode, 1));
 		}
-		if ((!xmlStrcmp(cur->name, (const xmlChar *) "network")) && (cur->ns
-				== ns)) {
-//			const char *network = (const char*) xmlNodeListGetString(doc,	cur->xmlChildrenNode, 1);
-//			char address[15];
-//			char *mask;
-//
-//			for(i=0;i<strlen(network) && i < 15;i++){
-//				if(network[i]=='/'){
-//					address[i]=0;
-//					break;
-//				}
-//				address[i]=network[i];
-//			}
-//			if(i==strlen(network) && i == 15)
-//				break;
-//
-//			mask = strndup(&network[i+1],strlen(network)-strlen(address)-1);
-//			printf("network %s mask %s\n",address, mask);
-//			ip.s_addr = ret->address;
-//			inet_aton(address, (struct in_addr*) &ret->address);
-//			printf("net %d\n",ret->address);
-//
-//
-//
-//			ret->mask=atoi(mask);
-//			free(mask);
-//			free(network);
-
-		}
 
 		/*PE and CE addresses for L3 VPN*/
-		if ((!xmlStrcmp(cur->name, (const xmlChar *) "addressPE")) && (cur->ns
+		if ((!xmlStrcmp(cur->name, (const xmlChar *) "address")) && (cur->ns
 				== ns)) {
 			const char *network = (const char*) xmlNodeListGetString(doc,	cur->xmlChildrenNode, 1);
 			int len = strlen(network);
@@ -120,16 +91,7 @@ parseEndpoint(xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur1) {
 			//inet_aton(network, (struct in_addr*) &ret->address);
 			//free(network);
 		}
-		if ((!xmlStrcmp(cur->name, (const xmlChar *) "addressCE")) && (cur->ns
-				== ns)) {
-			const char *network = (const char*) xmlNodeListGetString(doc,	cur->xmlChildrenNode, 1);
-			int len = strlen(network);
-			if (len > 20) len = 20;
-			memcpy(ret->addressEx, network, len);
-			//inet_aton(network, (struct in_addr*) &ret->address);
-			//free(network);
 
-		}
 		/*TODO add extra optional fields*/
 
 		cur = cur->next;

src/libnetvirt.c

@@ -168,17 +168,7 @@ uint16_t getVlanFromEp(endpoint* ep) {
 	return ep->vlan;
 }
 
-char* getNetFromEp(endpoint* ep) {
+char* getAddressFromEp(endpoint* ep) {
 	return ep->address;
 }
-uint8_t getMaskFromEp(endpoint* ep) {
-	return ep->mask;
-}
 
-char* getAddressPEFromEp(endpoint* ep) {
-	return ep->address;
-}
-
-char* getAddressCEFromEp(endpoint* ep) {
-	return ep->addressEx;
-}